Skip to content

T
traffic-front
Commit 3e1eb7ba authored by Ken you's avatar Ken you
Browse files
Options

update EBS api and resovle ---Ken

parent aaebc8df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 498 additions and 219 deletions
atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/BalanceSheetPrcQueryDto.java
View file @ 3e1eb7ba
package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
public class BalanceSheetPrcQueryDto {
......@@ -16,8 +13,7 @@ public class BalanceSheetPrcQueryDto {
*
* @mbg.generated
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8")
private Date date;
private String date;
/**
* Database Column Remarks:
......@@ -173,12 +169,12 @@ public class BalanceSheetPrcQueryDto {
*/
private String taskId;
public String getTaskId() {
return taskId;
public String getDate() {
return date;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
public void setDate(String date) {
this.date = date;
}
public String getSource() {
......@@ -189,14 +185,6 @@ public class BalanceSheetPrcQueryDto {
this.source = source;
}
public Date getDate() {
return date;
}
public void setDate(Date date) {
this.date = date;
}
public String getPeriod() {
return period;
}
......@@ -292,4 +280,33 @@ public class BalanceSheetPrcQueryDto {
public void setBegBal(BigDecimal begBal) {
this.begBal = begBal;
}
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "BalanceSheetPrcQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", period='" + period + '\'' +
", status='" + status + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", ledgerCurrencyCode='" + ledgerCurrencyCode + '\'' +
", entityCode='" + entityCode + '\'' +
", entityName='" + entityName + '\'' +
", category='" + category + '\'' +
", frequency='" + frequency + '\'' +
", itemName='" + itemName + '\'' +
", endBal=" + endBal +
", begBal=" + begBal +
", taskId='" + taskId + '\'' +
'}';
}
}
\ No newline at end of file
atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/BalanceSheetQueryDto.java
View file @ 3e1eb7ba
package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
public class BalanceSheetQueryDto {
/**
......@@ -15,8 +12,7 @@ public class BalanceSheetQueryDto {
*
* @mbg.generated
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8")
private Date date;
private String date;
/**
* Database Column Remarks:
......@@ -172,12 +168,12 @@ public class BalanceSheetQueryDto {
*/
private String taskId;
public String getTaskId() {
return taskId;
public String getDate() {
return date;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
public void setDate(String date) {
this.date = date;
}
public String getSource() {
......@@ -188,14 +184,6 @@ public class BalanceSheetQueryDto {
this.source = source;
}
public Date getDate() {
return date;
}
public void setDate(Date date) {
this.date = date;
}
public String getPeriod() {
return period;
}
......@@ -291,4 +279,33 @@ public class BalanceSheetQueryDto {
public void setBegBal(BigDecimal begBal) {
this.begBal = begBal;
}
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "BalanceSheetQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", period='" + period + '\'' +
", status='" + status + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", ledgerCurrencyCode='" + ledgerCurrencyCode + '\'' +
", entityCode='" + entityCode + '\'' +
", entityName='" + entityName + '\'' +
", category='" + category + '\'' +
", frequency='" + frequency + '\'' +
", itemName='" + itemName + '\'' +
", endBal=" + endBal +
", begBal=" + begBal +
", taskId='" + taskId + '\'' +
'}';
}
}
\ No newline at end of file
atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/CashFlowQueryDto.java
View file @ 3e1eb7ba
package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
public class CashFlowQueryDto {
/**
......@@ -15,8 +12,7 @@ public class CashFlowQueryDto {
*
* @mbg.generated
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8")
private Date date;
private String date;
/**
* Database Column Remarks:
......@@ -184,19 +180,11 @@ public class CashFlowQueryDto {
*/
private String taskId;
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
public Date getDate() {
public String getDate() {
return date;
}
public void setDate(Date date) {
public void setDate(String date) {
this.date = date;
}
......@@ -311,4 +299,34 @@ public class CashFlowQueryDto {
public void setYtdAmt(BigDecimal ytdAmt) {
this.ytdAmt = ytdAmt;
}
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "CashFlowQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", period='" + period + '\'' +
", status='" + status + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", ledgerCurrencyCode='" + ledgerCurrencyCode + '\'' +
", entityCode='" + entityCode + '\'' +
", entityName='" + entityName + '\'' +
", category='" + category + '\'' +
", frequency='" + frequency + '\'' +
", itemName='" + itemName + '\'' +
", itemName2='" + itemName2 + '\'' +
", periodAmt=" + periodAmt +
", ytdAmt=" + ytdAmt +
", taskId='" + taskId + '\'' +
'}';
}
}
atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/JournalEntryQueryDto.java
View file @ 3e1eb7ba
package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
public class JournalEntryQueryDto {
......@@ -16,8 +13,7 @@ public class JournalEntryQueryDto {
*
* @mbg.generated
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8")
private Date date;
private String date;
/**
* Database Column Remarks:
......@@ -138,8 +134,7 @@ public class JournalEntryQueryDto {
*
* @mbg.generated
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8")
private Date accountingDate;
private String accountingDate;
/**
* Database Column Remarks:
......@@ -513,8 +508,7 @@ public class JournalEntryQueryDto {
*
* @mbg.generated
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8")
private Date attribute2;
private String attribute2;
/**
* Database Column Remarks:
......@@ -690,8 +684,7 @@ public class JournalEntryQueryDto {
*
* @mbg.generated
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8")
private Date createdDate;
private String createdDate;
/**
* Database Column Remarks:
......@@ -713,8 +706,7 @@ public class JournalEntryQueryDto {
*
* @mbg.generated
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8")
private Date lateUpdatedDate;
private String lateUpdatedDate;
/**
* Database Column Remarks:
......@@ -727,19 +719,11 @@ public class JournalEntryQueryDto {
*/
private String taskId;
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
public Date getDate() {
public String getDate() {
return date;
}
public void setDate(Date date) {
public void setDate(String date) {
this.date = date;
}
......@@ -823,11 +807,11 @@ public class JournalEntryQueryDto {
this.period = period;
}
public Date getAccountingDate() {
public String getAccountingDate() {
return accountingDate;
}
public void setAccountingDate(Date accountingDate) {
public void setAccountingDate(String accountingDate) {
this.accountingDate = accountingDate;
}
......@@ -1095,11 +1079,11 @@ public class JournalEntryQueryDto {
this.attribute1 = attribute1;
}
public Date getAttribute2() {
public String getAttribute2() {
return attribute2;
}
public void setAttribute2(Date attribute2) {
public void setAttribute2(String attribute2) {
this.attribute2 = attribute2;
}
......@@ -1223,11 +1207,11 @@ public class JournalEntryQueryDto {
this.createdBy = createdBy;
}
public Date getCreatedDate() {
public String getCreatedDate() {
return createdDate;
}
public void setCreatedDate(Date createdDate) {
public void setCreatedDate(String createdDate) {
this.createdDate = createdDate;
}
......@@ -1239,11 +1223,90 @@ public class JournalEntryQueryDto {
this.lateUpdatedBy = lateUpdatedBy;
}
public Date getLateUpdatedDate() {
public String getLateUpdatedDate() {
return lateUpdatedDate;
}
public void setLateUpdatedDate(Date lateUpdatedDate) {
public void setLateUpdatedDate(String lateUpdatedDate) {
this.lateUpdatedDate = lateUpdatedDate;
}
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "JournalEntryQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", currencyCode='" + currencyCode + '\'' +
", status='" + status + '\'' +
", headerId='" + headerId + '\'' +
", lineNum='" + lineNum + '\'' +
", approvalStatus='" + approvalStatus + '\'' +
", postedStatus='" + postedStatus + '\'' +
", period='" + period + '\'' +
", accountingDate='" + accountingDate + '\'' +
", journalSource='" + journalSource + '\'' +
", category='" + category + '\'' +
", name='" + name + '\'' +
", voucherNum='" + voucherNum + '\'' +
", description='" + description + '\'' +
", segment1='" + segment1 + '\'' +
", segment2='" + segment2 + '\'' +
", segment3='" + segment3 + '\'' +
", segment4='" + segment4 + '\'' +
", segment5='" + segment5 + '\'' +
", segment6='" + segment6 + '\'' +
", segment7='" + segment7 + '\'' +
", segment8='" + segment8 + '\'' +
", segment9='" + segment9 + '\'' +
", segment10='" + segment10 + '\'' +
", segment1Name='" + segment1Name + '\'' +
", segment2Name='" + segment2Name + '\'' +
", segment3Name='" + segment3Name + '\'' +
", segment4Name='" + segment4Name + '\'' +
", segment5Name='" + segment5Name + '\'' +
", segment6Name='" + segment6Name + '\'' +
", segment7Name='" + segment7Name + '\'' +
", segment8Name='" + segment8Name + '\'' +
", segment9Name='" + segment9Name + '\'' +
", segment10Name='" + segment10Name + '\'' +
", journalCurrencyCode='" + journalCurrencyCode + '\'' +
", sobCurrencyCode='" + sobCurrencyCode + '\'' +
", accountedDr=" + accountedDr +
", accountedCr=" + accountedCr +
", enteredDr=" + enteredDr +
", enteredCr=" + enteredCr +
", cfItem='" + cfItem + '\'' +
", attribute1='" + attribute1 + '\'' +
", attribute2='" + attribute2 + '\'' +
", attribute3='" + attribute3 + '\'' +
", attribute4='" + attribute4 + '\'' +
", attribute5='" + attribute5 + '\'' +
", attribute6='" + attribute6 + '\'' +
", attribute7='" + attribute7 + '\'' +
", attribute8='" + attribute8 + '\'' +
", attribute9='" + attribute9 + '\'' +
", attribute10='" + attribute10 + '\'' +
", attribute11='" + attribute11 + '\'' +
", attribute12='" + attribute12 + '\'' +
", attribute13='" + attribute13 + '\'' +
", attribute14='" + attribute14 + '\'' +
", attribute15='" + attribute15 + '\'' +
", attribute16='" + attribute16 + '\'' +
", createdBy='" + createdBy + '\'' +
", createdDate='" + createdDate + '\'' +
", lateUpdatedBy='" + lateUpdatedBy + '\'' +
", lateUpdatedDate='" + lateUpdatedDate + '\'' +
", taskId='" + taskId + '\'' +
'}';
}
}
atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/OrganizationAccountingRateQueryDto.java
View file @ 3e1eb7ba
package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
public class OrganizationAccountingRateQueryDto {
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8")
private Date date;
private String date;
/**
* Database Column Remarks:
* 期间
* 期间yyyy-MM-dd
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization_accounting_rate.period
......@@ -78,19 +74,11 @@ public class OrganizationAccountingRateQueryDto {
*/
private String taskId;
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
public Date getDate() {
public String getDate() {
return date;
}
public void setDate(Date date) {
public void setDate(String date) {
this.date = date;
}
......@@ -149,4 +137,27 @@ public class OrganizationAccountingRateQueryDto {
public void setInvalidDate(String invalidDate) {
this.invalidDate = invalidDate;
}
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "OrganizationAccountingRateQueryDto{" +
"date='" + date + '\'' +
", period='" + period + '\'' +
", source='" + source + '\'' +
", convertionType='" + convertionType + '\'' +
", currencyFrom='" + currencyFrom + '\'' +
", currencyTo='" + currencyTo + '\'' +
", rate=" + rate +
", invalidDate='" + invalidDate + '\'' +
", taskId='" + taskId + '\'' +
'}';
}
}
\ No newline at end of file
atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/ProfitLossStatementPrcQueryDto.java
View file @ 3e1eb7ba
package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
public class ProfitLossStatementPrcQueryDto {
/**
......@@ -15,8 +12,7 @@ public class ProfitLossStatementPrcQueryDto {
*
* @mbg.generated
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8")
private Date date;
private String date;
/**
* Database Column Remarks:
......@@ -172,12 +168,12 @@ public class ProfitLossStatementPrcQueryDto {
*/
private String taskId;
public String getTaskId() {
return taskId;
public String getDate() {
return date;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
public void setDate(String date) {
this.date = date;
}
public String getSource() {
......@@ -188,14 +184,6 @@ public class ProfitLossStatementPrcQueryDto {
this.source = source;
}
public Date getDate() {
return date;
}
public void setDate(Date date) {
this.date = date;
}
public String getPeriod() {
return period;
}
......@@ -291,4 +279,33 @@ public class ProfitLossStatementPrcQueryDto {
public void setYtdAmt(BigDecimal ytdAmt) {
this.ytdAmt = ytdAmt;
}
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "ProfitLossStatementPrcQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", period='" + period + '\'' +
", status='" + status + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", ledgerCurrencyCode='" + ledgerCurrencyCode + '\'' +
", entityCode='" + entityCode + '\'' +
", entityName='" + entityName + '\'' +
", category='" + category + '\'' +
", frequency='" + frequency + '\'' +
", itemName='" + itemName + '\'' +
", periodAmt=" + periodAmt +
", ytdAmt=" + ytdAmt +
", taskId='" + taskId + '\'' +
'}';
}
}
\ No newline at end of file
atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/ProfitLossStatementQueryDto.java
View file @ 3e1eb7ba
package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
public class ProfitLossStatementQueryDto {
/**
......@@ -15,8 +12,7 @@ public class ProfitLossStatementQueryDto {
*
* @mbg.generated
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8")
private Date date;
private String date;
/**
* Database Column Remarks:
......@@ -172,12 +168,12 @@ public class ProfitLossStatementQueryDto {
*/
private String taskId;
public String getTaskId() {
return taskId;
public String getDate() {
return date;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
public void setDate(String date) {
this.date = date;
}
public String getSource() {
......@@ -188,14 +184,6 @@ public class ProfitLossStatementQueryDto {
this.source = source;
}
public Date getDate() {
return date;
}
public void setDate(Date date) {
this.date = date;
}
public String getPeriod() {
return period;
}
......@@ -291,4 +279,33 @@ public class ProfitLossStatementQueryDto {
public void setYtdAmt(BigDecimal ytdAmt) {
this.ytdAmt = ytdAmt;
}
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "ProfitLossStatementQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", period='" + period + '\'' +
", status='" + status + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", ledgerCurrencyCode='" + ledgerCurrencyCode + '\'' +
", entityCode='" + entityCode + '\'' +
", entityName='" + entityName + '\'' +
", category='" + category + '\'' +
", frequency='" + frequency + '\'' +
", itemName='" + itemName + '\'' +
", periodAmt=" + periodAmt +
", ytdAmt=" + ytdAmt +
", taskId='" + taskId + '\'' +
'}';
}
}
\ No newline at end of file
atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/TrialBalanceQueryDto.java
View file @ 3e1eb7ba
package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
public class TrialBalanceQueryDto {
/**
......@@ -15,8 +12,7 @@ public class TrialBalanceQueryDto {
*
* @mbg.generated
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8")
private Date date;
private String date;
/**
* Database Column Remarks:
......@@ -557,19 +553,11 @@ public class TrialBalanceQueryDto {
*/
private String taskId;
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
public Date getDate() {
public String getDate() {
return date;
}
public void setDate(Date date) {
public void setDate(String date) {
this.date = date;
}
......@@ -956,4 +944,68 @@ public class TrialBalanceQueryDto {
public void setYtdCrBeq(BigDecimal ytdCrBeq) {
this.ytdCrBeq = ytdCrBeq;
}
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "TrialBalanceQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", period='" + period + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", currencyCode='" + currencyCode + '\'' +
", status='" + status + '\'' +
", category='" + category + '\'' +
", accountCategory='" + accountCategory + '\'' +
", acctCode1='" + acctCode1 + '\'' +
", acctName1='" + acctName1 + '\'' +
", acctName2='" + acctName2 + '\'' +
", acctName3='" + acctName3 + '\'' +
", segment1='" + segment1 + '\'' +
", segment2='" + segment2 + '\'' +
", segment3='" + segment3 + '\'' +
", segment4='" + segment4 + '\'' +
", segment5='" + segment5 + '\'' +
", segment6='" + segment6 + '\'' +
", segment7='" + segment7 + '\'' +
", segment8='" + segment8 + '\'' +
", segment9='" + segment9 + '\'' +
", segment10='" + segment10 + '\'' +
", segment1Name='" + segment1Name + '\'' +
", segment2Name='" + segment2Name + '\'' +
", segment3Name='" + segment3Name + '\'' +
", segment4Name='" + segment4Name + '\'' +
", segment5Name='" + segment5Name + '\'' +
", segment6Name='" + segment6Name + '\'' +
", segment7Name='" + segment7Name + '\'' +
", segment8Name='" + segment8Name + '\'' +
", segment9Name='" + segment9Name + '\'' +
", segment10Name='" + segment10Name + '\'' +
", begBal=" + begBal +
", periodDr=" + periodDr +
", periodCr=" + periodCr +
", endBal=" + endBal +
", qtdDr=" + qtdDr +
", qtdCr=" + qtdCr +
", ytdDr=" + ytdDr +
", ytdCr=" + ytdCr +
", begBalBeq=" + begBalBeq +
", periodDrBeq=" + periodDrBeq +
", periodCrBeq=" + periodCrBeq +
", endBalBeq=" + endBalBeq +
", qtdDrBeq=" + qtdDrBeq +
", qtdCrBeq=" + qtdCrBeq +
", ytdDrBeq=" + ytdDrBeq +
", ytdCrBeq=" + ytdCrBeq +
", taskId='" + taskId + '\'' +
'}';
}
}
\ No newline at end of file
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java
View file @ 3e1eb7ba
......@@ -400,7 +400,6 @@ public class TemplateGroupServiceImpl extends AbstractService {
List<PeriodDataSource> periodDataSourceList = Lists.newArrayList();
for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) {
Row row = sheet.getRow(r);
Assert.notNull(row,"Excel 文档为空");
for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
Cell cell = row.getCell(c);
if (cell == null) {
......
atms-api/src/test/java/pwc/taxtech/atms/service/impl/EbsApiServiceImplTest.java
View file @ 3e1eb7ba
......@@ -282,66 +282,66 @@ public class EbsApiServiceImplTest extends CommonIT {
public void queryRemoteServerThenUpdateJE(){
List<JournalEntryQueryDto> items=new ArrayList<>();
for(int i=0;i<10;i++){
JournalEntryQueryDto journalEntryQueryDto =new JournalEntryQueryDto();
journalEntryQueryDto.setSource("来源");
journalEntryQueryDto.setLedgerId("账套ID");
journalEntryQueryDto.setLedgerName("账套名称");
journalEntryQueryDto.setCurrencyCode("账套币种");
journalEntryQueryDto.setHeaderId("日记账头ID");
journalEntryQueryDto.setLineNum("日记账行号");
journalEntryQueryDto.setApprovalStatus("审批状态");
journalEntryQueryDto.setPostedStatus("过账");
// journalEntryQueryDto.setPeriod(20180102+i);
journalEntryQueryDto.setJournalSource("日记账来源");
journalEntryQueryDto.setCategory("日记账类别");
journalEntryQueryDto.setName("日记账名称");
journalEntryQueryDto.setVoucherNum("凭证编号");
journalEntryQueryDto.setDescription("摘要");
journalEntryQueryDto.setSegment1("主体代码");
journalEntryQueryDto.setSegment2("成本中心");
journalEntryQueryDto.setSegment3("科目代码");
journalEntryQueryDto.setSegment4("辅助科目");
journalEntryQueryDto.setSegment5("利润中心");
journalEntryQueryDto.setSegment6("产品");
journalEntryQueryDto.setSegment7("项目");
journalEntryQueryDto.setSegment8("公司间");
journalEntryQueryDto.setSegment9("备用1");
journalEntryQueryDto.setSegment10("备用2");
journalEntryQueryDto.setSegment1Name("主体说明");
journalEntryQueryDto.setSegment2Name("成本中心说明");
journalEntryQueryDto.setSegment3Name("科目说明");
journalEntryQueryDto.setSegment4Name("辅助科目说明");
journalEntryQueryDto.setSegment5Name("利润中心说明");
journalEntryQueryDto.setSegment6Name("产品说明");
journalEntryQueryDto.setSegment7Name("项目说明");
journalEntryQueryDto.setSegment8Name("公司间说明");
journalEntryQueryDto.setSegment9Name("备用1说明");
journalEntryQueryDto.setSegment10Name("备用2说明");
journalEntryQueryDto.setJournalCurrencyCode("币种");
journalEntryQueryDto.setSobCurrencyCode("本位币币种");
journalEntryQueryDto.setAccountedDr(new BigDecimal("123"));
journalEntryQueryDto.setAccountedCr(new BigDecimal("120.2"));
journalEntryQueryDto.setEnteredDr(new BigDecimal("1231.0231"));
journalEntryQueryDto.setEnteredCr(new BigDecimal("120.122"));
journalEntryQueryDto.setCfItem("现金流量表项");
journalEntryQueryDto.setAttribute1("城市");
journalEntryQueryDto.setAttribute3("对方银行账号");
journalEntryQueryDto.setAttribute4("银行流水号");
journalEntryQueryDto.setAttribute5("供应商编号");
journalEntryQueryDto.setAttribute6("交易单号");
journalEntryQueryDto.setAttribute7("供应商名称");
journalEntryQueryDto.setAttribute8("接收编码");
journalEntryQueryDto.setAttribute9("制单人");
journalEntryQueryDto.setAttribute10("审核人");
journalEntryQueryDto.setAttribute11("成本中心部门描述1");
journalEntryQueryDto.setAttribute12("成本中心部门描述2");
journalEntryQueryDto.setAttribute13("成本中心部门描述3");
journalEntryQueryDto.setAttribute14("成本中心部门描述4");
journalEntryQueryDto.setAttribute15("成本中心部门描述5");
journalEntryQueryDto.setAttribute16("成本中心部门描述6");
journalEntryQueryDto.setCreatedBy("pwcCreat");
journalEntryQueryDto.setLateUpdatedBy("pwcUpate");
items.add(journalEntryQueryDto);
JournalEntryQueryDto result =new JournalEntryQueryDto();
result.setSource("来源");
result.setLedgerId("账套ID");
result.setLedgerName("账套名称");
result.setCurrencyCode("账套币种");
result.setHeaderId("日记账头ID");
result.setLineNum("日记账行号");
result.setApprovalStatus("审批状态");
result.setPostedStatus("过账");
result.setPeriod("2018-11");
result.setJournalSource("日记账来源");
result.setCategory("日记账类别");
result.setName("日记账名称");
result.setVoucherNum("凭证编号");
result.setDescription("摘要");
result.setSegment1("主体代码");
result.setSegment2("成本中心");
result.setSegment3("科目代码");
result.setSegment4("辅助科目");
result.setSegment5("利润中心");
result.setSegment6("产品");
result.setSegment7("项目");
result.setSegment8("公司间");
result.setSegment9("备用1");
result.setSegment10("备用2");
result.setSegment1Name("主体说明");
result.setSegment2Name("成本中心说明");
result.setSegment3Name("科目说明");
result.setSegment4Name("辅助科目说明");
result.setSegment5Name("利润中心说明");
result.setSegment6Name("产品说明");
result.setSegment7Name("项目说明");
result.setSegment8Name("公司间说明");
result.setSegment9Name("备用1说明");
result.setSegment10Name("备用2说明");
result.setJournalCurrencyCode("币种");
result.setSobCurrencyCode("本位币币种");
result.setAccountedDr(new BigDecimal("123"));
result.setAccountedCr(new BigDecimal("120.2"));
result.setEnteredDr(new BigDecimal("1231.0231"));
result.setEnteredCr(new BigDecimal("120.122"));
result.setCfItem("现金流量表项");
result.setAttribute1("城市");
result.setAttribute3("对方银行账号");
result.setAttribute4("银行流水号");
result.setAttribute5("供应商编号");
result.setAttribute6("交易单号");
result.setAttribute7("供应商名称");
result.setAttribute8("接收编码");
result.setAttribute9("制单人");
result.setAttribute10("审核人");
result.setAttribute11("成本中心部门描述1");
result.setAttribute12("成本中心部门描述2");
result.setAttribute13("成本中心部门描述3");
result.setAttribute14("成本中心部门描述4");
result.setAttribute15("成本中心部门描述5");
result.setAttribute16("成本中心部门描述6");
result.setCreatedBy("pwcCreat");
result.setLateUpdatedBy("pwcUpate");
items.add(result);
}
String a=JSON.toJSONString(items);
System.out.println(a);
......
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @ 3e1eb7ba
......@@ -33,6 +33,7 @@
"AddTemplate": "Add Template",
"AddWidget": "Add Widget",
"AdjustmentItems": "Adjustment Item",
"TotalNumberUnit": "Sheet",
"AdjustmentSummaryInCurrentPeriod": "Current Period CIT Adjustment Summary",
"AdvancedSearch": "More Search Options",
"AdvertisingExpense": "Advertisement Expense",
......@@ -106,6 +107,8 @@
"CertificationResult": "Certification Result",
"Change": "Change",
"Alter": "Alter",
"MenuRecordManage": "Record Manage",
"MenuAnalysis": "Analysis",
"ChangePassword": "Change Password",
"ChangePasswordFailInfo": "Failed Password Modification Operation:",
"ChangePasswordSuccessInfo": "The Password Modification Operation was Successful! Automatic Shutdown After 3 Seconds...",
......
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @ 3e1eb7ba
......@@ -1503,7 +1503,8 @@
"Alternate1Description": "Alternate 1 Description",
"Alternate2Description": "Alternate 2 Description",
"YYYY-MM": "YYYY-MM",
"profitLoss": "Profit&Loss",
"profitLoss": "Profit Statement&Loss",
"ProfitLossTitle": "Profit Statement",
"CurrentPeriodAmount": "Current Period Amount",
"ThisYearAccumulatedAmount": "This Year Accumulated Amount",
"quarterlyOwnersEquityChangeTable": "Quarterly Owners Equity Change Table",
......@@ -1799,7 +1800,6 @@
"CoupaInvoiceNum": "Invoice number",
"CoupaTotalTaxAmount": "Total tax amount",
"AdjustmentTableTitle": "Adjustment table",
"ProfitLossTitle": "Profit&Loss",
"QuarterlyOwnersEquityChangeTableTitle": "Quarterly owners equity change Table",
"DirectMethodCashFlowStatementTitle": "Direct method cash flow statement",
"JournalTitle": "Journal entry",
......@@ -1873,6 +1873,65 @@
"ValidateContent": "Validate Content",
"ValidateResult": "Validate Result",
"ResultMsg": "Result Message",
"revenueDetail": "Revenue Detail",
"RevSearchAccountCode": "Revenue Account Code",
"RevSearchAccountName": "Revenue Account Name",
"RevSearchProfitCenterCode": "Revenue Profit Center Code",
"RevSearchProfitCenterName": "Revenue Profit Center Name",
"RevSearchProductCode": "Revenue Product Code",
"RevSearchProductName": "Revenue Product Name",
"RevSearchType": "Revenue Type",
"RevSearchCategory": "Revenue Category",
"RevSearchTaxOn": "Revenue TaxOn",
"RevDetailSearch": "Revenue Search",
"RevDetailReset": "Revenue Reset",
"RevDetailColSerialNo": "SerialNo",
"RevDetailColSubject": "Subject",
"RevDetailColAccount": "Account",
"RevDetailColProfitCenter": "Profit Center",
"RevDetailProduct": "Product",
"RevDetailColSubjectExp": "Subject Exp",
"RevDetailColAccountExp": "Account Exp",
"RevDetailColProfitCenterExp": "Profit Center Exp",
"RevDetailProductExp": "Product Exp",
"RevDetailAmount": "Amount",
"RevDetailType": "Type",
"RevDetailCategory": "Category",
"RevDetailTaxOn": "TaxOn",
"RevCMTitle": "开票记录与收入类型映射配置",
"RevCMApplyBU": "申请部门",
"RevCMInvoiceCTX": "开票内容",
"BillDetail": "Bill Detail",
"BillEditRevenueType": "Bill Edit Revenue Type",
"BillDtlHandle": "Bill Handle",
"BillSearchType": "Bill Type",
"BillSearchCustomer": "Bill Customer",
"BillSearchProfitCenter": "Bill ProfitCenter",
"BillSearchContent": "Bill Content",
"BillSearchDate": "Bill Date",
"BillSearchRevenueType": "Bill Revenue Type",
"BillSearchDepartment": "Bill Department",
"BillSearchTaxRate": "Bill Tax Rate",
"BillSearchNumber": "Bill Number",
"BillDtlSearch": "Bill Search",
"BillDtlReset": "Bill Reset",
"BillDtlMoreSearch": "Bill More Search",
"BillDtlShrink": "Bill Shrink",
"BillDtlColSerialNo": "Bill SerialNo",
"BillDtlColSubject": "Bill Subject",
"BillDtlColCustCompany": "Bill Cust Company",
"BillDtlColType": "Bill Type",
"BillDtlColContent": "Bill Content",
"BillDtlColAmount": "Bill Amount",
"BillDtlColTaxRate": "Bill Tax Rate",
"BillDtlColTaxAmount": "Bill Tax Amount",
"BillDtlColOANo": "Bill OA No",
"BillDtlColDepartment": "Bill Department",
"BillDtlColDate": "Bill Date",
"BillDtlColCode": "Bill Code",
"BillDtlColNumber": "Bill Number",
"BillDtlColRevenueType": "Bill RevenueType",
"BillDtlUpdateSuccess": "Bill Update Success",
"Operater": "Operater",
"OperateTime": "Operate Time",
"SelectedImportType": "Selected Import Type",
......
atms-web/src/main/webapp/app/vat/invoice/invoice-manage-main/invoice-manage-main.html
View file @ 3e1eb7ba
......@@ -29,7 +29,7 @@
<td>
<span class="lbl-name">
<!--<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">收起查询</span></span></a>-->
<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="!hasShowMoreSearchBox"><span><i class="fa fa-chevron-down" aria-hidden="true"></i><span style="margin-left:3px;">更多查询</span></span></a>
<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="!hasShowMoreSearchBox"><span><i class="fa fa-chevron-down" aria-hidden="true"></i><span style="margin-left:3px;">{{'MoreQuery' | translate }}</span></span></a>
</span>
</td>
</tr>
......@@ -98,11 +98,11 @@
</td>
<td>
<button type="button" class="btn btn-primary invoice-btn" ng-click="searchboxService.searchInvoice()">查询</button>
<button type="button" class="btn btn-primary invoice-btn" ng-click="searchboxService.searchInvoice()">{{'Query' | translate }}</button>
</td>
<td>
<a href="javascript:void(0);" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">收起</span></span></a>
<a href="javascript:void(0);" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">{{'Collapse' | translate }}</span></span></a>
</td>
</tr>
......
atms-web/src/main/webapp/app/vat/invoice/invoice-manage-refund/invoice-manage-refund.html
View file @ 3e1eb7ba
......@@ -25,7 +25,7 @@
<td>
<span class="lbl-name">
<!--<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">收起查询</span></span></a>-->
<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="!hasShowMoreSearchBox"><span><i class="fa fa-chevron-down" aria-hidden="true"></i><span style="margin-left:3px;">更多查询</span></span></a>
<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="!hasShowMoreSearchBox"><span><i class="fa fa-chevron-down" aria-hidden="true"></i><span style="margin-left:3px;">{{'MoreQuery' | translate }}</span></span></a>
</span>
</td>
</tr>
......@@ -95,7 +95,7 @@
</td>
<td>
<a href="javascript:void(0);" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">收起</span></span></a>
<a href="javascript:void(0);" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">{{'Collapse' | translate }}</span></span></a>
</td>
</tr>
......
atms-web/src/main/webapp/app/vat/reduction/vat-revenue-detail/vat-revenue-detail.html
View file @ 3e1eb7ba
......@@ -21,19 +21,19 @@
</td>
<td ng-show="!hasShowMoreSearchBox">
<button type="button" class="btn btn-primary invoice-btn"
ng-click="searchboxService.search()">查询
ng-click="searchboxService.search()">{{'Query' | translate }}
</button>
</td>
<td ng-show="!hasShowMoreSearchBox">
<button type="button" class="btn btn-primary invoice-btn"
ng-click="searchboxService.resetBox()">重置
ng-click="searchboxService.resetBox()">{{'Reset' | translate }}
</button>
</td>
<td ng-show="!hasShowMoreSearchBox">
<span class="lbl-name">
<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()"><span><i
class="fa fa-chevron-down" aria-hidden="true"></i><span
style="margin-left:3px;">更多查询</span></span></a>
style="margin-left:3px;">更{{'MoreQuery' | translate }}多查询</span></span></a>
</span>
</td>
</tr>
......@@ -69,18 +69,18 @@
<td>
<button type="button" class="btn btn-primary invoice-btn"
ng-click="searchboxService.search()">查询
ng-click="searchboxService.search()">{{'Query' | translate }}
</button>
</td>
<td>
<button type="button" class="btn btn-primary invoice-btn"
ng-click="searchboxService.resetBox()">重置
ng-click="searchboxService.resetBox()">{{'Reset' | translate }}
</button>
</td>
<td>
<a href="javascript:void(0);" ng-click="searchboxService.showOrHideSearchBox()">
<span><i class="fa fa-chevron-up" aria-hidden="true"></i><span
style="margin-left:3px;">收起</span></span></a>
style="margin-left:3px;">{{'Collapse' | translate }}</span></span></a>
</td>
</tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment