Skip to content

T
traffic-front
Commit ca4c21c3 authored by chase's avatar chase
Browse files
Options

Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

parents 44d6c531 24e5ad60
Hide whitespace changes
Inline Side-by-side
Showing with 2373 additions and 829 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitImportExcelServiceImpl.java
View file @ ca4c21c3
......@@ -234,7 +234,7 @@ public class CitImportExcelServiceImpl extends BaseService {
citDataImportLogList.add(citDataImportLogError);
continue;
}
citJournal.setOrgCode(cellValue.toString());
citJournal.setOrgCode(cellValue.toString().replace(".0",""));
citJournal.setSegment2(CitCommonUtil.getValue(rowData.getCell(10)).toString());
cellValue = CitCommonUtil.getValue(rowData.getCell(11));
if("".equals(cellValue)){
......@@ -401,7 +401,7 @@ public class CitImportExcelServiceImpl extends BaseService {
}
DecimalFormat df=new DecimalFormat("0");
String companyCode = df.format(cellValue);
String companyCode = cellValue.toString().replace(".0","");
//根据code（主体）获取机构相关信息
List<Organization> organizations = getOrganizationByCode(companyCode);
String companyName = "";
......@@ -428,7 +428,7 @@ public class CitImportExcelServiceImpl extends BaseService {
continue;
}
if(StringUtils.isBlank(projectId)){
noProjectMap.put(sb.toString(),companyFailMap.containsKey(sb.toString())?companyFailMap.get(sb.toString())+1:1);
noProjectMap.put(sb.toString(),noProjectMap.containsKey(sb.toString())?noProjectMap.get(sb.toString())+1:1);
continue;
}
projectIdList.add(projectId);
......@@ -448,7 +448,7 @@ public class CitImportExcelServiceImpl extends BaseService {
continue;
}
trialBalance.setAccountCode(df.format(cellValue));
trialBalance.setAccountCode(cellValue.toString().substring(0,cellValue.toString().indexOf(".")));
trialBalance.setAccountDescription(CitCommonUtil.getValue(rowData.getCell(17)).toString());
//此期间默认为12
trialBalance.setAccountPeriod(12);
......@@ -656,19 +656,29 @@ public class CitImportExcelServiceImpl extends BaseService {
List<CitBalanceSheetPrcAdjust> citBSPrcAdjustList = new ArrayList<>();
List<CitDataImportLog> citDataImportLogList = new ArrayList<>();
// Integer period = CitCommonUtil.getPeriod();
String companyName = CitCommonUtil.getValue(sheet.getRow(5).getCell(1)).toString();
if("".equals(companyName)){
// String companyName = CitCommonUtil.getValue(sheet.getRow(5).getCell(1)).toString();
// String companyCode = CitCommonUtil.getValue(sheet.getRow(5).getCell(1)).toString();
// if("".equals(companyCode)){
// saveResult.setResult(false);
// saveResult.setResultMsg(ErrorMessageCN.NoCompanyError);
// return saveResult;
// }
// List<Organization> organizations = getOrganizationByCode(companyCode).stream().filter(r->r.getCode()!=null&&!("".equals(r.getCode()))).collect(Collectors.toList());
String companyCode = CitCommonUtil.getValue(sheet.getRow(5).getCell(1)).toString();
if("".equals(companyCode)){
saveResult.setResult(false);
saveResult.setResultMsg(ErrorMessageCN.NoCompanyError);
return saveResult;
}
List<Organization> organizations = getOrganizationByName(companyName).stream().filter(r->r.getCode()!=null&&!("".equals(r.getCode()))).collect(Collectors.toList());
String companyCode = "";
companyCode = companyCode.contains(".")?companyCode.substring(0,companyCode.indexOf(".")):companyCode;
List<Organization> organizations = getOrganizationByCode(companyCode);
String companyName = "";
String orgId = "";
String projectId = "";
String taxPayerId = "";
if (organizations != null && organizations.size() > 0) {
companyCode = organizations.get(0).getCode();
companyName = organizations.get(0).getName();
orgId = organizations.get(0).getId();
projectId = getProjectId(orgId, period);
......@@ -797,7 +807,7 @@ public class CitImportExcelServiceImpl extends BaseService {
List<CitProfitPrcAdjust> citProfitPrcAdjustList = new ArrayList<>();
List<CitDataImportLog> citDataImportLogList = new ArrayList<>();
// Integer period = CitCommonUtil.getPeriod();
String companyName = CitCommonUtil.getValue(sheet.getRow(4).getCell(1)).toString();
// String companyName = CitCommonUtil.getValue(sheet.getRow(4).getCell(1)).toString();
String companyCode = CitCommonUtil.getValue(sheet.getRow(5).getCell(1)).toString();
if("".equals(companyCode)){
saveResult.setResult(false);
......@@ -806,11 +816,13 @@ public class CitImportExcelServiceImpl extends BaseService {
}
companyCode = companyCode.contains(".")?companyCode.substring(0,companyCode.indexOf(".")):companyCode;
List<Organization> organizations = getOrganizationByCode(companyCode);
String companyName = "";
String orgId = "";
String projectId = "";
String taxPayerId = "";
if (organizations != null && organizations.size() > 0) {
orgId = organizations.get(0).getId();
companyName = organizations.get(0).getName();
if(!orgList.contains(orgId)){
saveResult.setResult(false);
......@@ -1067,8 +1079,7 @@ public class CitImportExcelServiceImpl extends BaseService {
citDataImportLogList.add(citDataImportLogError);
continue;
}
// String companyCode = cellValueCode.toString().replace(".0","");
String companyCode = df.format(cellValueCode);
String companyCode = cellValueCode.toString().replace(".0","");
//根据code（主体）获取机构相关信息
List<Organization> organizations = getOrganizationByCode(companyCode);
String companyName = "";
......@@ -1099,7 +1110,7 @@ public class CitImportExcelServiceImpl extends BaseService {
//因预提传过来的时间带着月份，所以要算出年份来查询卡片
projectId = getProjectId(orgId, period/100);
if(StringUtils.isBlank(projectId)){
noProjectMap.put(sb.toString(),companyFailMap.containsKey(sb.toString())?companyFailMap.get(sb.toString())+1:1);
noProjectMap.put(sb.toString(),noProjectMap.containsKey(sb.toString())?noProjectMap.get(sb.toString())+1:1);
continue;
}
companySuccessMap.put(sb.toString(),companySuccessMap.containsKey(sb.toString())?companySuccessMap.get(sb.toString())+1:1);
......@@ -1125,16 +1136,17 @@ public class CitImportExcelServiceImpl extends BaseService {
continue;
}
//当单元格是常规格式时会有小数点，需去掉小数点
citSalaryAdvance.setPoNo(df.format(cellValue));
citSalaryAdvance.setPoRow(df.format(CitCommonUtil.getValue(rowData.getCell(1))));
citSalaryAdvance.setPoNo(cellValue.toString().replace(".0",""));
cellValue = CitCommonUtil.getValue(rowData.getCell(1));
citSalaryAdvance.setPoRow(cellValue.toString().replace(".0",""));
cellValue = CitCommonUtil.getValue(rowData.getCell(2));
if(cellValue != null){
if(!"".equals(cellValue)){
citSalaryAdvance.setPoCreateTime(sdf.parse(cellValue.toString()));
}
citSalaryAdvance.setLadingBillPerson(CitCommonUtil.getValue(rowData.getCell(3)).toString());
citSalaryAdvance.setPurchasePerson(CitCommonUtil.getValue(rowData.getCell(4)).toString());
citSalaryAdvance.setPoSubjectCode(df.format(cellValueCode));
citSalaryAdvance.setPoSubjectCode(companyCode);
cellValue = CitCommonUtil.getValue(rowData.getCell(6));
if("".equals(cellValue)){
......@@ -1142,15 +1154,19 @@ public class CitImportExcelServiceImpl extends BaseService {
citDataImportLogList.add(citDataImportLogError);
continue;
}
citSalaryAdvance.setPoSubjectName(CitCommonUtil.getValue(rowData.getCell(6)).toString());
citSalaryAdvance.setPoSubjectName(cellValue.toString());
citSalaryAdvance.setCostCenterCode(df.format(CitCommonUtil.getValue(rowData.getCell(7))));
cellValue = CitCommonUtil.getValue(rowData.getCell(7));
citSalaryAdvance.setCostCenterCode(cellValue.toString().replace(".0",""));
citSalaryAdvance.setCostCenter(CitCommonUtil.getValue(rowData.getCell(8)).toString());
citSalaryAdvance.setSupplier(CitCommonUtil.getValue(rowData.getCell(9)).toString());
citSalaryAdvance.setItem(CitCommonUtil.getValue(rowData.getCell(10)).toString());
citSalaryAdvance.setStandardMoney(CitCommonUtil.getValue(rowData.getCell(11)).toString());
citSalaryAdvance.setCurrency(CitCommonUtil.getValue(rowData.getCell(12)).toString());
citSalaryAdvance.setOrderAmount(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(13)).toString()));
cellValue = CitCommonUtil.getValue(rowData.getCell(13));
if(!"".equals(cellValue)){
citSalaryAdvance.setOrderAmount(new BigDecimal(cellValue.toString()));
}
citSalaryAdvance.setExecutedServiceSchedule(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(14)).toString()));
citSalaryAdvance.setCoupaTotalAccept(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(15)).toString()));
......@@ -1167,15 +1183,25 @@ public class CitImportExcelServiceImpl extends BaseService {
citSalaryAdvance.setUsableInvoiceAmount(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(20)).toString()));
citSalaryAdvance.setUsableBalance(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(21)).toString()));
citSalaryAdvance.setAdvanceWriteOff(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(22)).toString()));
citSalaryAdvance.setCheckOne(CitCommonUtil.getValue(rowData.getCell(23)).toString());
citSalaryAdvance.setReclassifyAmount(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(24)).toString()));
citSalaryAdvance.setExchangeRate(CitCommonUtil.getValue(rowData.getCell(25)).toString());
citSalaryAdvance.setLedgerId(CitCommonUtil.getValue(rowData.getCell(26)).toString());
citSalaryAdvance.setDebitAdvanceGene(CitCommonUtil.getValue(rowData.getCell(27)).toString());
citSalaryAdvance.setCreditPrepaidAccounts(CitCommonUtil.getValue(rowData.getCell(28)).toString());
citSalaryAdvance.setRemark(CitCommonUtil.getValue(rowData.getCell(29)).toString());
citSalaryAdvance.setSegment1(CitCommonUtil.getValue(rowData.getCell(30)).toString());
citSalaryAdvance.setSegment2(CitCommonUtil.getValue(rowData.getCell(31)).toString());
citSalaryAdvance.setSubjectCode(CitCommonUtil.getValue(rowData.getCell(27)).toString());
citSalaryAdvance.setSubjectDescription(CitCommonUtil.getValue(rowData.getCell(28)).toString());
citSalaryAdvance.setAuxiliarySubject(CitCommonUtil.getValue(rowData.getCell(29)).toString());
citSalaryAdvance.setAuxiliarySubjectDescription(CitCommonUtil.getValue(rowData.getCell(30)).toString());
citSalaryAdvance.setProfitCenter(CitCommonUtil.getValue(rowData.getCell(31)).toString());
citSalaryAdvance.setProfitCenterDescription(CitCommonUtil.getValue(rowData.getCell(32)).toString());
citSalaryAdvance.setProduct(CitCommonUtil.getValue(rowData.getCell(33)).toString());
citSalaryAdvance.setProductDescription(CitCommonUtil.getValue(rowData.getCell(34)).toString());
//项目，不是卡片
citSalaryAdvance.setProject(CitCommonUtil.getValue(rowData.getCell(35)).toString());
citSalaryAdvance.setProjectDescription(CitCommonUtil.getValue(rowData.getCell(36)).toString());
citSalaryAdvance.setCompany(CitCommonUtil.getValue(rowData.getCell(37)).toString());
citSalaryAdvance.setCompanyDescription(CitCommonUtil.getValue(rowData.getCell(38)).toString());
citSalaryAdvance.setSegment1(CitCommonUtil.getValue(rowData.getCell(39)).toString());
citSalaryAdvance.setSegment1Description(CitCommonUtil.getValue(rowData.getCell(40)).toString());
citSalaryAdvance.setSegment2(CitCommonUtil.getValue(rowData.getCell(41)).toString());
citSalaryAdvance.setSegment2Description(CitCommonUtil.getValue(rowData.getCell(42)).toString());
citSalaryAdvanceList.add(citSalaryAdvance);
}
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/CitJournalEntryAdjust.java
View file @ ca4c21c3
......@@ -787,6 +787,26 @@ public class CitJournalEntryAdjust extends BaseEntity implements Serializable {
*/
private Date updateTime;
private Integer periodStart;
private Integer periodEnd;
public Integer getPeriodStart() {
return periodStart;
}
public void setPeriodStart(Integer periodStart) {
this.periodStart = periodStart;
}
public Integer getPeriodEnd() {
return periodEnd;
}
public void setPeriodEnd(Integer periodEnd) {
this.periodEnd = periodEnd;
}
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table cit_journal_entry_adjust
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/CitSalaryAdvance.java
View file @ ca4c21c3
......@@ -322,84 +322,139 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
/**
* Database Column Remarks:
* 校验1
* 科目
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.check_one
* This field corresponds to the database column cit_salary_advance.subject_code
*
* @mbg.generated
*/
private String checkOne;
private String subjectCode;
/**
* Database Column Remarks:
* 重分类金额
* 科目描述
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.reclassify_amount
* This field corresponds to the database column cit_salary_advance.subject_description
*
* @mbg.generated
*/
private BigDecimal reclassifyAmount;
private String subjectDescription;
/**
* Database Column Remarks:
* 汇率
* 辅助科目
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.exchange_rate
* This field corresponds to the database column cit_salary_advance.auxiliary_subject
*
* @mbg.generated
*/
private String exchangeRate;
private String auxiliarySubject;
/**
* Database Column Remarks:
* 账套ID
* 辅助科目描述
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.ledger_id
* This field corresponds to the database column cit_salary_advance.auxiliary_subject_description
*
* @mbg.generated
*/
private String ledgerId;
private String auxiliarySubjectDescription;
/**
* Database Column Remarks:
* 借：预提费用-系统生成
* 利润中心
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.debit_advance_gene
* This field corresponds to the database column cit_salary_advance.profit_center
*
* @mbg.generated
*/
private String debitAdvanceGene;
private String profitCenter;
/**
* Database Column Remarks:
* 贷： 预付账款
* 利润中心描述
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.credit_prepaid_accounts
* This field corresponds to the database column cit_salary_advance.profit_center_description
*
* @mbg.generated
*/
private String creditPrepaidAccounts;
private String profitCenterDescription;
/**
* Database Column Remarks:
* 摘要
* 产品
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.remark
* This field corresponds to the database column cit_salary_advance.product
*
* @mbg.generated
*/
private String remark;
private String product;
/**
* Database Column Remarks:
* 未知列1
* 产品描述
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.product_description
*
* @mbg.generated
*/
private String productDescription;
/**
* Database Column Remarks:
* 项目
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.project
*
* @mbg.generated
*/
private String project;
/**
* Database Column Remarks:
* 项目描述
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.project_description
*
* @mbg.generated
*/
private String projectDescription;
/**
* Database Column Remarks:
* 公司间
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.company
*
* @mbg.generated
*/
private String company;
/**
* Database Column Remarks:
* 项目描述
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.company_description
*
* @mbg.generated
*/
private String companyDescription;
/**
* Database Column Remarks:
* 备用段1
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.segment1
......@@ -410,7 +465,18 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
/**
* Database Column Remarks:
* 未知列2
* 备用段1描述
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.segment1_description
*
* @mbg.generated
*/
private String segment1Description;
/**
* Database Column Remarks:
* 备用段2
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.segment2
......@@ -419,6 +485,17 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
*/
private String segment2;
/**
* Database Column Remarks:
* 备用段2描述
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.segment2_description
*
* @mbg.generated
*/
private String segment2Description;
/**
* Database Column Remarks:
* 创建人
......@@ -1145,170 +1222,290 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.check_one
* This method returns the value of the database column cit_salary_advance.subject_code
*
* @return the value of cit_salary_advance.subject_code
*
* @mbg.generated
*/
public String getSubjectCode() {
return subjectCode;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.subject_code
*
* @param subjectCode the value for cit_salary_advance.subject_code
*
* @mbg.generated
*/
public void setSubjectCode(String subjectCode) {
this.subjectCode = subjectCode == null ? null : subjectCode.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.subject_description
*
* @return the value of cit_salary_advance.subject_description
*
* @mbg.generated
*/
public String getSubjectDescription() {
return subjectDescription;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.subject_description
*
* @param subjectDescription the value for cit_salary_advance.subject_description
*
* @mbg.generated
*/
public void setSubjectDescription(String subjectDescription) {
this.subjectDescription = subjectDescription == null ? null : subjectDescription.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.auxiliary_subject
*
* @return the value of cit_salary_advance.auxiliary_subject
*
* @mbg.generated
*/
public String getAuxiliarySubject() {
return auxiliarySubject;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.auxiliary_subject
*
* @param auxiliarySubject the value for cit_salary_advance.auxiliary_subject
*
* @mbg.generated
*/
public void setAuxiliarySubject(String auxiliarySubject) {
this.auxiliarySubject = auxiliarySubject == null ? null : auxiliarySubject.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.auxiliary_subject_description
*
* @return the value of cit_salary_advance.auxiliary_subject_description
*
* @mbg.generated
*/
public String getAuxiliarySubjectDescription() {
return auxiliarySubjectDescription;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.auxiliary_subject_description
*
* @param auxiliarySubjectDescription the value for cit_salary_advance.auxiliary_subject_description
*
* @mbg.generated
*/
public void setAuxiliarySubjectDescription(String auxiliarySubjectDescription) {
this.auxiliarySubjectDescription = auxiliarySubjectDescription == null ? null : auxiliarySubjectDescription.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.profit_center
*
* @return the value of cit_salary_advance.profit_center
*
* @mbg.generated
*/
public String getProfitCenter() {
return profitCenter;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.profit_center
*
* @return the value of cit_salary_advance.check_one
* @param profitCenter the value for cit_salary_advance.profit_center
*
* @mbg.generated
*/
public String getCheckOne() {
return checkOne;
public void setProfitCenter(String profitCenter) {
this.profitCenter = profitCenter == null ? null : profitCenter.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.check_one
* This method returns the value of the database column cit_salary_advance.profit_center_description
*
* @param checkOne the value for cit_salary_advance.check_one
* @return the value of cit_salary_advance.profit_center_description
*
* @mbg.generated
*/
public void setCheckOne(String checkOne) {
this.checkOne = checkOne == null ? null : checkOne.trim();
public String getProfitCenterDescription() {
return profitCenterDescription;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.reclassify_amount
* This method sets the value of the database column cit_salary_advance.profit_center_description
*
* @return the value of cit_salary_advance.reclassify_amount
* @param profitCenterDescription the value for cit_salary_advance.profit_center_description
*
* @mbg.generated
*/
public BigDecimal getReclassifyAmount() {
return reclassifyAmount;
public void setProfitCenterDescription(String profitCenterDescription) {
this.profitCenterDescription = profitCenterDescription == null ? null : profitCenterDescription.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.reclassify_amount
* This method returns the value of the database column cit_salary_advance.product
*
* @param reclassifyAmount the value for cit_salary_advance.reclassify_amount
* @return the value of cit_salary_advance.product
*
* @mbg.generated
*/
public void setReclassifyAmount(BigDecimal reclassifyAmount) {
this.reclassifyAmount = reclassifyAmount;
public String getProduct() {
return product;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.exchange_rate
* This method sets the value of the database column cit_salary_advance.product
*
* @return the value of cit_salary_advance.exchange_rate
* @param product the value for cit_salary_advance.product
*
* @mbg.generated
*/
public String getExchangeRate() {
return exchangeRate;
public void setProduct(String product) {
this.product = product == null ? null : product.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.exchange_rate
* This method returns the value of the database column cit_salary_advance.product_description
*
* @param exchangeRate the value for cit_salary_advance.exchange_rate
* @return the value of cit_salary_advance.product_description
*
* @mbg.generated
*/
public void setExchangeRate(String exchangeRate) {
this.exchangeRate = exchangeRate == null ? null : exchangeRate.trim();
public String getProductDescription() {
return productDescription;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.ledger_id
* This method sets the value of the database column cit_salary_advance.product_description
*
* @return the value of cit_salary_advance.ledger_id
* @param productDescription the value for cit_salary_advance.product_description
*
* @mbg.generated
*/
public String getLedgerId() {
return ledgerId;
public void setProductDescription(String productDescription) {
this.productDescription = productDescription == null ? null : productDescription.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.ledger_id
* This method returns the value of the database column cit_salary_advance.project
*
* @param ledgerId the value for cit_salary_advance.ledger_id
* @return the value of cit_salary_advance.project
*
* @mbg.generated
*/
public void setLedgerId(String ledgerId) {
this.ledgerId = ledgerId == null ? null : ledgerId.trim();
public String getProject() {
return project;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.debit_advance_gene
* This method sets the value of the database column cit_salary_advance.project
*
* @return the value of cit_salary_advance.debit_advance_gene
* @param project the value for cit_salary_advance.project
*
* @mbg.generated
*/
public String getDebitAdvanceGene() {
return debitAdvanceGene;
public void setProject(String project) {
this.project = project == null ? null : project.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.debit_advance_gene
* This method returns the value of the database column cit_salary_advance.project_description
*
* @param debitAdvanceGene the value for cit_salary_advance.debit_advance_gene
* @return the value of cit_salary_advance.project_description
*
* @mbg.generated
*/
public void setDebitAdvanceGene(String debitAdvanceGene) {
this.debitAdvanceGene = debitAdvanceGene == null ? null : debitAdvanceGene.trim();
public String getProjectDescription() {
return projectDescription;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.credit_prepaid_accounts
* This method sets the value of the database column cit_salary_advance.project_description
*
* @return the value of cit_salary_advance.credit_prepaid_accounts
* @param projectDescription the value for cit_salary_advance.project_description
*
* @mbg.generated
*/
public String getCreditPrepaidAccounts() {
return creditPrepaidAccounts;
public void setProjectDescription(String projectDescription) {
this.projectDescription = projectDescription == null ? null : projectDescription.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.credit_prepaid_accounts
* This method returns the value of the database column cit_salary_advance.company
*
* @param creditPrepaidAccounts the value for cit_salary_advance.credit_prepaid_accounts
* @return the value of cit_salary_advance.company
*
* @mbg.generated
*/
public void setCreditPrepaidAccounts(String creditPrepaidAccounts) {
this.creditPrepaidAccounts = creditPrepaidAccounts == null ? null : creditPrepaidAccounts.trim();
public String getCompany() {
return company;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.remark
* This method sets the value of the database column cit_salary_advance.company
*
* @return the value of cit_salary_advance.remark
* @param company the value for cit_salary_advance.company
*
* @mbg.generated
*/
public String getRemark() {
return remark;
public void setCompany(String company) {
this.company = company == null ? null : company.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.remark
* This method returns the value of the database column cit_salary_advance.company_description
*
* @param remark the value for cit_salary_advance.remark
* @return the value of cit_salary_advance.company_description
*
* @mbg.generated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
public String getCompanyDescription() {
return companyDescription;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.company_description
*
* @param companyDescription the value for cit_salary_advance.company_description
*
* @mbg.generated
*/
public void setCompanyDescription(String companyDescription) {
this.companyDescription = companyDescription == null ? null : companyDescription.trim();
}
/**
......@@ -1335,6 +1532,30 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
this.segment1 = segment1 == null ? null : segment1.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.segment1_description
*
* @return the value of cit_salary_advance.segment1_description
*
* @mbg.generated
*/
public String getSegment1Description() {
return segment1Description;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.segment1_description
*
* @param segment1Description the value for cit_salary_advance.segment1_description
*
* @mbg.generated
*/
public void setSegment1Description(String segment1Description) {
this.segment1Description = segment1Description == null ? null : segment1Description.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.segment2
......@@ -1359,6 +1580,30 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
this.segment2 = segment2 == null ? null : segment2.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.segment2_description
*
* @return the value of cit_salary_advance.segment2_description
*
* @mbg.generated
*/
public String getSegment2Description() {
return segment2Description;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.segment2_description
*
* @param segment2Description the value for cit_salary_advance.segment2_description
*
* @mbg.generated
*/
public void setSegment2Description(String segment2Description) {
this.segment2Description = segment2Description == null ? null : segment2Description.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.created_by
......@@ -1495,15 +1740,22 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
sb.append(", usableInvoiceAmount=").append(usableInvoiceAmount);
sb.append(", usableBalance=").append(usableBalance);
sb.append(", advanceWriteOff=").append(advanceWriteOff);
sb.append(", checkOne=").append(checkOne);
sb.append(", reclassifyAmount=").append(reclassifyAmount);
sb.append(", exchangeRate=").append(exchangeRate);
sb.append(", ledgerId=").append(ledgerId);
sb.append(", debitAdvanceGene=").append(debitAdvanceGene);
sb.append(", creditPrepaidAccounts=").append(creditPrepaidAccounts);
sb.append(", remark=").append(remark);
sb.append(", subjectCode=").append(subjectCode);
sb.append(", subjectDescription=").append(subjectDescription);
sb.append(", auxiliarySubject=").append(auxiliarySubject);
sb.append(", auxiliarySubjectDescription=").append(auxiliarySubjectDescription);
sb.append(", profitCenter=").append(profitCenter);
sb.append(", profitCenterDescription=").append(profitCenterDescription);
sb.append(", product=").append(product);
sb.append(", productDescription=").append(productDescription);
sb.append(", project=").append(project);
sb.append(", projectDescription=").append(projectDescription);
sb.append(", company=").append(company);
sb.append(", companyDescription=").append(companyDescription);
sb.append(", segment1=").append(segment1);
sb.append(", segment1Description=").append(segment1Description);
sb.append(", segment2=").append(segment2);
sb.append(", segment2Description=").append(segment2Description);
sb.append(", createdBy=").append(createdBy);
sb.append(", updatedBy=").append(updatedBy);
sb.append(", createTime=").append(createTime);
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/CitSalaryAdvanceExample.java
View file @ ca4c21c3
......@@ -2026,483 +2026,843 @@ public class CitSalaryAdvanceExample {
return (Criteria) this;
}
public Criteria andCheckOneIsNull() {
addCriterion("check_one is null");
public Criteria andSubjectCodeIsNull() {
addCriterion("subject_code is null");
return (Criteria) this;
}
public Criteria andCheckOneIsNotNull() {
addCriterion("check_one is not null");
public Criteria andSubjectCodeIsNotNull() {
addCriterion("subject_code is not null");
return (Criteria) this;
}
public Criteria andCheckOneEqualTo(String value) {
addCriterion("check_one =", value, "checkOne");
public Criteria andSubjectCodeEqualTo(String value) {
addCriterion("subject_code =", value, "subjectCode");
return (Criteria) this;
}
public Criteria andCheckOneNotEqualTo(String value) {
addCriterion("check_one <>", value, "checkOne");
public Criteria andSubjectCodeNotEqualTo(String value) {
addCriterion("subject_code <>", value, "subjectCode");
return (Criteria) this;
}
public Criteria andCheckOneGreaterThan(String value) {
addCriterion("check_one >", value, "checkOne");
public Criteria andSubjectCodeGreaterThan(String value) {
addCriterion("subject_code >", value, "subjectCode");
return (Criteria) this;
}
public Criteria andCheckOneGreaterThanOrEqualTo(String value) {
addCriterion("check_one >=", value, "checkOne");
public Criteria andSubjectCodeGreaterThanOrEqualTo(String value) {
addCriterion("subject_code >=", value, "subjectCode");
return (Criteria) this;
}
public Criteria andCheckOneLessThan(String value) {
addCriterion("check_one <", value, "checkOne");
public Criteria andSubjectCodeLessThan(String value) {
addCriterion("subject_code <", value, "subjectCode");
return (Criteria) this;
}
public Criteria andCheckOneLessThanOrEqualTo(String value) {
addCriterion("check_one <=", value, "checkOne");
public Criteria andSubjectCodeLessThanOrEqualTo(String value) {
addCriterion("subject_code <=", value, "subjectCode");
return (Criteria) this;
}
public Criteria andCheckOneLike(String value) {
addCriterion("check_one like", value, "checkOne");
public Criteria andSubjectCodeLike(String value) {
addCriterion("subject_code like", value, "subjectCode");
return (Criteria) this;
}
public Criteria andCheckOneNotLike(String value) {
addCriterion("check_one not like", value, "checkOne");
public Criteria andSubjectCodeNotLike(String value) {
addCriterion("subject_code not like", value, "subjectCode");
return (Criteria) this;
}
public Criteria andCheckOneIn(List<String> values) {
addCriterion("check_one in", values, "checkOne");
public Criteria andSubjectCodeIn(List<String> values) {
addCriterion("subject_code in", values, "subjectCode");
return (Criteria) this;
}
public Criteria andCheckOneNotIn(List<String> values) {
addCriterion("check_one not in", values, "checkOne");
public Criteria andSubjectCodeNotIn(List<String> values) {
addCriterion("subject_code not in", values, "subjectCode");
return (Criteria) this;
}
public Criteria andCheckOneBetween(String value1, String value2) {
addCriterion("check_one between", value1, value2, "checkOne");
public Criteria andSubjectCodeBetween(String value1, String value2) {
addCriterion("subject_code between", value1, value2, "subjectCode");
return (Criteria) this;
}
public Criteria andCheckOneNotBetween(String value1, String value2) {
addCriterion("check_one not between", value1, value2, "checkOne");
public Criteria andSubjectCodeNotBetween(String value1, String value2) {
addCriterion("subject_code not between", value1, value2, "subjectCode");
return (Criteria) this;
}
public Criteria andReclassifyAmountIsNull() {
addCriterion("reclassify_amount is null");
public Criteria andSubjectDescriptionIsNull() {
addCriterion("subject_description is null");
return (Criteria) this;
}
public Criteria andReclassifyAmountIsNotNull() {
addCriterion("reclassify_amount is not null");
public Criteria andSubjectDescriptionIsNotNull() {
addCriterion("subject_description is not null");
return (Criteria) this;
}
public Criteria andReclassifyAmountEqualTo(BigDecimal value) {
addCriterion("reclassify_amount =", value, "reclassifyAmount");
public Criteria andSubjectDescriptionEqualTo(String value) {
addCriterion("subject_description =", value, "subjectDescription");
return (Criteria) this;
}
public Criteria andReclassifyAmountNotEqualTo(BigDecimal value) {
addCriterion("reclassify_amount <>", value, "reclassifyAmount");
public Criteria andSubjectDescriptionNotEqualTo(String value) {
addCriterion("subject_description <>", value, "subjectDescription");
return (Criteria) this;
}
public Criteria andReclassifyAmountGreaterThan(BigDecimal value) {
addCriterion("reclassify_amount >", value, "reclassifyAmount");
public Criteria andSubjectDescriptionGreaterThan(String value) {
addCriterion("subject_description >", value, "subjectDescription");
return (Criteria) this;
}
public Criteria andReclassifyAmountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("reclassify_amount >=", value, "reclassifyAmount");
public Criteria andSubjectDescriptionGreaterThanOrEqualTo(String value) {
addCriterion("subject_description >=", value, "subjectDescription");
return (Criteria) this;
}
public Criteria andReclassifyAmountLessThan(BigDecimal value) {
addCriterion("reclassify_amount <", value, "reclassifyAmount");
public Criteria andSubjectDescriptionLessThan(String value) {
addCriterion("subject_description <", value, "subjectDescription");
return (Criteria) this;
}
public Criteria andReclassifyAmountLessThanOrEqualTo(BigDecimal value) {
addCriterion("reclassify_amount <=", value, "reclassifyAmount");
public Criteria andSubjectDescriptionLessThanOrEqualTo(String value) {
addCriterion("subject_description <=", value, "subjectDescription");
return (Criteria) this;
}
public Criteria andReclassifyAmountIn(List<BigDecimal> values) {
addCriterion("reclassify_amount in", values, "reclassifyAmount");
public Criteria andSubjectDescriptionLike(String value) {
addCriterion("subject_description like", value, "subjectDescription");
return (Criteria) this;
}
public Criteria andReclassifyAmountNotIn(List<BigDecimal> values) {
addCriterion("reclassify_amount not in", values, "reclassifyAmount");
public Criteria andSubjectDescriptionNotLike(String value) {
addCriterion("subject_description not like", value, "subjectDescription");
return (Criteria) this;
}
public Criteria andReclassifyAmountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("reclassify_amount between", value1, value2, "reclassifyAmount");
public Criteria andSubjectDescriptionIn(List<String> values) {
addCriterion("subject_description in", values, "subjectDescription");
return (Criteria) this;
}
public Criteria andReclassifyAmountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("reclassify_amount not between", value1, value2, "reclassifyAmount");
public Criteria andSubjectDescriptionNotIn(List<String> values) {
addCriterion("subject_description not in", values, "subjectDescription");
return (Criteria) this;
}
public Criteria andExchangeRateIsNull() {
addCriterion("exchange_rate is null");
public Criteria andSubjectDescriptionBetween(String value1, String value2) {
addCriterion("subject_description between", value1, value2, "subjectDescription");
return (Criteria) this;
}
public Criteria andExchangeRateIsNotNull() {
addCriterion("exchange_rate is not null");
public Criteria andSubjectDescriptionNotBetween(String value1, String value2) {
addCriterion("subject_description not between", value1, value2, "subjectDescription");
return (Criteria) this;
}
public Criteria andExchangeRateEqualTo(String value) {
addCriterion("exchange_rate =", value, "exchangeRate");
public Criteria andAuxiliarySubjectIsNull() {
addCriterion("auxiliary_subject is null");
return (Criteria) this;
}
public Criteria andExchangeRateNotEqualTo(String value) {
addCriterion("exchange_rate <>", value, "exchangeRate");
public Criteria andAuxiliarySubjectIsNotNull() {
addCriterion("auxiliary_subject is not null");
return (Criteria) this;
}
public Criteria andExchangeRateGreaterThan(String value) {
addCriterion("exchange_rate >", value, "exchangeRate");
public Criteria andAuxiliarySubjectEqualTo(String value) {
addCriterion("auxiliary_subject =", value, "auxiliarySubject");
return (Criteria) this;
}
public Criteria andExchangeRateGreaterThanOrEqualTo(String value) {
addCriterion("exchange_rate >=", value, "exchangeRate");
public Criteria andAuxiliarySubjectNotEqualTo(String value) {
addCriterion("auxiliary_subject <>", value, "auxiliarySubject");
return (Criteria) this;
}
public Criteria andExchangeRateLessThan(String value) {
addCriterion("exchange_rate <", value, "exchangeRate");
public Criteria andAuxiliarySubjectGreaterThan(String value) {
addCriterion("auxiliary_subject >", value, "auxiliarySubject");
return (Criteria) this;
}
public Criteria andExchangeRateLessThanOrEqualTo(String value) {
addCriterion("exchange_rate <=", value, "exchangeRate");
public Criteria andAuxiliarySubjectGreaterThanOrEqualTo(String value) {
addCriterion("auxiliary_subject >=", value, "auxiliarySubject");
return (Criteria) this;
}
public Criteria andExchangeRateLike(String value) {
addCriterion("exchange_rate like", value, "exchangeRate");
public Criteria andAuxiliarySubjectLessThan(String value) {
addCriterion("auxiliary_subject <", value, "auxiliarySubject");
return (Criteria) this;
}
public Criteria andExchangeRateNotLike(String value) {
addCriterion("exchange_rate not like", value, "exchangeRate");
public Criteria andAuxiliarySubjectLessThanOrEqualTo(String value) {
addCriterion("auxiliary_subject <=", value, "auxiliarySubject");
return (Criteria) this;
}
public Criteria andExchangeRateIn(List<String> values) {
addCriterion("exchange_rate in", values, "exchangeRate");
public Criteria andAuxiliarySubjectLike(String value) {
addCriterion("auxiliary_subject like", value, "auxiliarySubject");
return (Criteria) this;
}
public Criteria andExchangeRateNotIn(List<String> values) {
addCriterion("exchange_rate not in", values, "exchangeRate");
public Criteria andAuxiliarySubjectNotLike(String value) {
addCriterion("auxiliary_subject not like", value, "auxiliarySubject");
return (Criteria) this;
}
public Criteria andExchangeRateBetween(String value1, String value2) {
addCriterion("exchange_rate between", value1, value2, "exchangeRate");
public Criteria andAuxiliarySubjectIn(List<String> values) {
addCriterion("auxiliary_subject in", values, "auxiliarySubject");
return (Criteria) this;
}
public Criteria andExchangeRateNotBetween(String value1, String value2) {
addCriterion("exchange_rate not between", value1, value2, "exchangeRate");
public Criteria andAuxiliarySubjectNotIn(List<String> values) {
addCriterion("auxiliary_subject not in", values, "auxiliarySubject");
return (Criteria) this;
}
public Criteria andLedgerIdIsNull() {
addCriterion("ledger_id is null");
public Criteria andAuxiliarySubjectBetween(String value1, String value2) {
addCriterion("auxiliary_subject between", value1, value2, "auxiliarySubject");
return (Criteria) this;
}
public Criteria andLedgerIdIsNotNull() {
addCriterion("ledger_id is not null");
public Criteria andAuxiliarySubjectNotBetween(String value1, String value2) {
addCriterion("auxiliary_subject not between", value1, value2, "auxiliarySubject");
return (Criteria) this;
}
public Criteria andLedgerIdEqualTo(String value) {
addCriterion("ledger_id =", value, "ledgerId");
public Criteria andAuxiliarySubjectDescriptionIsNull() {
addCriterion("auxiliary_subject_description is null");
return (Criteria) this;
}
public Criteria andLedgerIdNotEqualTo(String value) {
addCriterion("ledger_id <>", value, "ledgerId");
public Criteria andAuxiliarySubjectDescriptionIsNotNull() {
addCriterion("auxiliary_subject_description is not null");
return (Criteria) this;
}
public Criteria andLedgerIdGreaterThan(String value) {
addCriterion("ledger_id >", value, "ledgerId");
public Criteria andAuxiliarySubjectDescriptionEqualTo(String value) {
addCriterion("auxiliary_subject_description =", value, "auxiliarySubjectDescription");
return (Criteria) this;
}
public Criteria andLedgerIdGreaterThanOrEqualTo(String value) {
addCriterion("ledger_id >=", value, "ledgerId");
public Criteria andAuxiliarySubjectDescriptionNotEqualTo(String value) {
addCriterion("auxiliary_subject_description <>", value, "auxiliarySubjectDescription");
return (Criteria) this;
}
public Criteria andLedgerIdLessThan(String value) {
addCriterion("ledger_id <", value, "ledgerId");
public Criteria andAuxiliarySubjectDescriptionGreaterThan(String value) {
addCriterion("auxiliary_subject_description >", value, "auxiliarySubjectDescription");
return (Criteria) this;
}
public Criteria andLedgerIdLessThanOrEqualTo(String value) {
addCriterion("ledger_id <=", value, "ledgerId");
public Criteria andAuxiliarySubjectDescriptionGreaterThanOrEqualTo(String value) {
addCriterion("auxiliary_subject_description >=", value, "auxiliarySubjectDescription");
return (Criteria) this;
}
public Criteria andLedgerIdLike(String value) {
addCriterion("ledger_id like", value, "ledgerId");
public Criteria andAuxiliarySubjectDescriptionLessThan(String value) {
addCriterion("auxiliary_subject_description <", value, "auxiliarySubjectDescription");
return (Criteria) this;
}
public Criteria andLedgerIdNotLike(String value) {
addCriterion("ledger_id not like", value, "ledgerId");
public Criteria andAuxiliarySubjectDescriptionLessThanOrEqualTo(String value) {
addCriterion("auxiliary_subject_description <=", value, "auxiliarySubjectDescription");
return (Criteria) this;
}
public Criteria andLedgerIdIn(List<String> values) {
addCriterion("ledger_id in", values, "ledgerId");
public Criteria andAuxiliarySubjectDescriptionLike(String value) {
addCriterion("auxiliary_subject_description like", value, "auxiliarySubjectDescription");
return (Criteria) this;
}
public Criteria andLedgerIdNotIn(List<String> values) {
addCriterion("ledger_id not in", values, "ledgerId");
public Criteria andAuxiliarySubjectDescriptionNotLike(String value) {
addCriterion("auxiliary_subject_description not like", value, "auxiliarySubjectDescription");
return (Criteria) this;
}
public Criteria andLedgerIdBetween(String value1, String value2) {
addCriterion("ledger_id between", value1, value2, "ledgerId");
public Criteria andAuxiliarySubjectDescriptionIn(List<String> values) {
addCriterion("auxiliary_subject_description in", values, "auxiliarySubjectDescription");
return (Criteria) this;
}
public Criteria andLedgerIdNotBetween(String value1, String value2) {
addCriterion("ledger_id not between", value1, value2, "ledgerId");
public Criteria andAuxiliarySubjectDescriptionNotIn(List<String> values) {
addCriterion("auxiliary_subject_description not in", values, "auxiliarySubjectDescription");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneIsNull() {
addCriterion("debit_advance_gene is null");
public Criteria andAuxiliarySubjectDescriptionBetween(String value1, String value2) {
addCriterion("auxiliary_subject_description between", value1, value2, "auxiliarySubjectDescription");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneIsNotNull() {
addCriterion("debit_advance_gene is not null");
public Criteria andAuxiliarySubjectDescriptionNotBetween(String value1, String value2) {
addCriterion("auxiliary_subject_description not between", value1, value2, "auxiliarySubjectDescription");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneEqualTo(String value) {
addCriterion("debit_advance_gene =", value, "debitAdvanceGene");
public Criteria andProfitCenterIsNull() {
addCriterion("profit_center is null");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneNotEqualTo(String value) {
addCriterion("debit_advance_gene <>", value, "debitAdvanceGene");
public Criteria andProfitCenterIsNotNull() {
addCriterion("profit_center is not null");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneGreaterThan(String value) {
addCriterion("debit_advance_gene >", value, "debitAdvanceGene");
public Criteria andProfitCenterEqualTo(String value) {
addCriterion("profit_center =", value, "profitCenter");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneGreaterThanOrEqualTo(String value) {
addCriterion("debit_advance_gene >=", value, "debitAdvanceGene");
public Criteria andProfitCenterNotEqualTo(String value) {
addCriterion("profit_center <>", value, "profitCenter");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneLessThan(String value) {
addCriterion("debit_advance_gene <", value, "debitAdvanceGene");
public Criteria andProfitCenterGreaterThan(String value) {
addCriterion("profit_center >", value, "profitCenter");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneLessThanOrEqualTo(String value) {
addCriterion("debit_advance_gene <=", value, "debitAdvanceGene");
public Criteria andProfitCenterGreaterThanOrEqualTo(String value) {
addCriterion("profit_center >=", value, "profitCenter");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneLike(String value) {
addCriterion("debit_advance_gene like", value, "debitAdvanceGene");
public Criteria andProfitCenterLessThan(String value) {
addCriterion("profit_center <", value, "profitCenter");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneNotLike(String value) {
addCriterion("debit_advance_gene not like", value, "debitAdvanceGene");
public Criteria andProfitCenterLessThanOrEqualTo(String value) {
addCriterion("profit_center <=", value, "profitCenter");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneIn(List<String> values) {
addCriterion("debit_advance_gene in", values, "debitAdvanceGene");
public Criteria andProfitCenterLike(String value) {
addCriterion("profit_center like", value, "profitCenter");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneNotIn(List<String> values) {
addCriterion("debit_advance_gene not in", values, "debitAdvanceGene");
public Criteria andProfitCenterNotLike(String value) {
addCriterion("profit_center not like", value, "profitCenter");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneBetween(String value1, String value2) {
addCriterion("debit_advance_gene between", value1, value2, "debitAdvanceGene");
public Criteria andProfitCenterIn(List<String> values) {
addCriterion("profit_center in", values, "profitCenter");
return (Criteria) this;
}
public Criteria andDebitAdvanceGeneNotBetween(String value1, String value2) {
addCriterion("debit_advance_gene not between", value1, value2, "debitAdvanceGene");
public Criteria andProfitCenterNotIn(List<String> values) {
addCriterion("profit_center not in", values, "profitCenter");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsIsNull() {
addCriterion("credit_prepaid_accounts is null");
public Criteria andProfitCenterBetween(String value1, String value2) {
addCriterion("profit_center between", value1, value2, "profitCenter");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsIsNotNull() {
addCriterion("credit_prepaid_accounts is not null");
public Criteria andProfitCenterNotBetween(String value1, String value2) {
addCriterion("profit_center not between", value1, value2, "profitCenter");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsEqualTo(String value) {
addCriterion("credit_prepaid_accounts =", value, "creditPrepaidAccounts");
public Criteria andProfitCenterDescriptionIsNull() {
addCriterion("profit_center_description is null");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsNotEqualTo(String value) {
addCriterion("credit_prepaid_accounts <>", value, "creditPrepaidAccounts");
public Criteria andProfitCenterDescriptionIsNotNull() {
addCriterion("profit_center_description is not null");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsGreaterThan(String value) {
addCriterion("credit_prepaid_accounts >", value, "creditPrepaidAccounts");
public Criteria andProfitCenterDescriptionEqualTo(String value) {
addCriterion("profit_center_description =", value, "profitCenterDescription");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsGreaterThanOrEqualTo(String value) {
addCriterion("credit_prepaid_accounts >=", value, "creditPrepaidAccounts");
public Criteria andProfitCenterDescriptionNotEqualTo(String value) {
addCriterion("profit_center_description <>", value, "profitCenterDescription");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsLessThan(String value) {
addCriterion("credit_prepaid_accounts <", value, "creditPrepaidAccounts");
public Criteria andProfitCenterDescriptionGreaterThan(String value) {
addCriterion("profit_center_description >", value, "profitCenterDescription");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsLessThanOrEqualTo(String value) {
addCriterion("credit_prepaid_accounts <=", value, "creditPrepaidAccounts");
public Criteria andProfitCenterDescriptionGreaterThanOrEqualTo(String value) {
addCriterion("profit_center_description >=", value, "profitCenterDescription");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsLike(String value) {
addCriterion("credit_prepaid_accounts like", value, "creditPrepaidAccounts");
public Criteria andProfitCenterDescriptionLessThan(String value) {
addCriterion("profit_center_description <", value, "profitCenterDescription");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsNotLike(String value) {
addCriterion("credit_prepaid_accounts not like", value, "creditPrepaidAccounts");
public Criteria andProfitCenterDescriptionLessThanOrEqualTo(String value) {
addCriterion("profit_center_description <=", value, "profitCenterDescription");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsIn(List<String> values) {
addCriterion("credit_prepaid_accounts in", values, "creditPrepaidAccounts");
public Criteria andProfitCenterDescriptionLike(String value) {
addCriterion("profit_center_description like", value, "profitCenterDescription");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsNotIn(List<String> values) {
addCriterion("credit_prepaid_accounts not in", values, "creditPrepaidAccounts");
public Criteria andProfitCenterDescriptionNotLike(String value) {
addCriterion("profit_center_description not like", value, "profitCenterDescription");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsBetween(String value1, String value2) {
addCriterion("credit_prepaid_accounts between", value1, value2, "creditPrepaidAccounts");
public Criteria andProfitCenterDescriptionIn(List<String> values) {
addCriterion("profit_center_description in", values, "profitCenterDescription");
return (Criteria) this;
}
public Criteria andCreditPrepaidAccountsNotBetween(String value1, String value2) {
addCriterion("credit_prepaid_accounts not between", value1, value2, "creditPrepaidAccounts");
public Criteria andProfitCenterDescriptionNotIn(List<String> values) {
addCriterion("profit_center_description not in", values, "profitCenterDescription");
return (Criteria) this;
}
public Criteria andRemarkIsNull() {
addCriterion("remark is null");
public Criteria andProfitCenterDescriptionBetween(String value1, String value2) {
addCriterion("profit_center_description between", value1, value2, "profitCenterDescription");
return (Criteria) this;
}
public Criteria andRemarkIsNotNull() {
addCriterion("remark is not null");
public Criteria andProfitCenterDescriptionNotBetween(String value1, String value2) {
addCriterion("profit_center_description not between", value1, value2, "profitCenterDescription");
return (Criteria) this;
}
public Criteria andRemarkEqualTo(String value) {
addCriterion("remark =", value, "remark");
public Criteria andProductIsNull() {
addCriterion("product is null");
return (Criteria) this;
}
public Criteria andRemarkNotEqualTo(String value) {
addCriterion("remark <>", value, "remark");
public Criteria andProductIsNotNull() {
addCriterion("product is not null");
return (Criteria) this;
}
public Criteria andRemarkGreaterThan(String value) {
addCriterion("remark >", value, "remark");
public Criteria andProductEqualTo(String value) {
addCriterion("product =", value, "product");
return (Criteria) this;
}
public Criteria andRemarkGreaterThanOrEqualTo(String value) {
addCriterion("remark >=", value, "remark");
public Criteria andProductNotEqualTo(String value) {
addCriterion("product <>", value, "product");
return (Criteria) this;
}
public Criteria andRemarkLessThan(String value) {
addCriterion("remark <", value, "remark");
public Criteria andProductGreaterThan(String value) {
addCriterion("product >", value, "product");
return (Criteria) this;
}
public Criteria andRemarkLessThanOrEqualTo(String value) {
addCriterion("remark <=", value, "remark");
public Criteria andProductGreaterThanOrEqualTo(String value) {
addCriterion("product >=", value, "product");
return (Criteria) this;
}
public Criteria andRemarkLike(String value) {
addCriterion("remark like", value, "remark");
public Criteria andProductLessThan(String value) {
addCriterion("product <", value, "product");
return (Criteria) this;
}
public Criteria andRemarkNotLike(String value) {
addCriterion("remark not like", value, "remark");
public Criteria andProductLessThanOrEqualTo(String value) {
addCriterion("product <=", value, "product");
return (Criteria) this;
}
public Criteria andRemarkIn(List<String> values) {
addCriterion("remark in", values, "remark");
public Criteria andProductLike(String value) {
addCriterion("product like", value, "product");
return (Criteria) this;
}
public Criteria andRemarkNotIn(List<String> values) {
addCriterion("remark not in", values, "remark");
public Criteria andProductNotLike(String value) {
addCriterion("product not like", value, "product");
return (Criteria) this;
}
public Criteria andRemarkBetween(String value1, String value2) {
addCriterion("remark between", value1, value2, "remark");
public Criteria andProductIn(List<String> values) {
addCriterion("product in", values, "product");
return (Criteria) this;
}
public Criteria andRemarkNotBetween(String value1, String value2) {
addCriterion("remark not between", value1, value2, "remark");
public Criteria andProductNotIn(List<String> values) {
addCriterion("product not in", values, "product");
return (Criteria) this;
}
public Criteria andProductBetween(String value1, String value2) {
addCriterion("product between", value1, value2, "product");
return (Criteria) this;
}
public Criteria andProductNotBetween(String value1, String value2) {
addCriterion("product not between", value1, value2, "product");
return (Criteria) this;
}
public Criteria andProductDescriptionIsNull() {
addCriterion("product_description is null");
return (Criteria) this;
}
public Criteria andProductDescriptionIsNotNull() {
addCriterion("product_description is not null");
return (Criteria) this;
}
public Criteria andProductDescriptionEqualTo(String value) {
addCriterion("product_description =", value, "productDescription");
return (Criteria) this;
}
public Criteria andProductDescriptionNotEqualTo(String value) {
addCriterion("product_description <>", value, "productDescription");
return (Criteria) this;
}
public Criteria andProductDescriptionGreaterThan(String value) {
addCriterion("product_description >", value, "productDescription");
return (Criteria) this;
}
public Criteria andProductDescriptionGreaterThanOrEqualTo(String value) {
addCriterion("product_description >=", value, "productDescription");
return (Criteria) this;
}
public Criteria andProductDescriptionLessThan(String value) {
addCriterion("product_description <", value, "productDescription");
return (Criteria) this;
}
public Criteria andProductDescriptionLessThanOrEqualTo(String value) {
addCriterion("product_description <=", value, "productDescription");
return (Criteria) this;
}
public Criteria andProductDescriptionLike(String value) {
addCriterion("product_description like", value, "productDescription");
return (Criteria) this;
}
public Criteria andProductDescriptionNotLike(String value) {
addCriterion("product_description not like", value, "productDescription");
return (Criteria) this;
}
public Criteria andProductDescriptionIn(List<String> values) {
addCriterion("product_description in", values, "productDescription");
return (Criteria) this;
}
public Criteria andProductDescriptionNotIn(List<String> values) {
addCriterion("product_description not in", values, "productDescription");
return (Criteria) this;
}
public Criteria andProductDescriptionBetween(String value1, String value2) {
addCriterion("product_description between", value1, value2, "productDescription");
return (Criteria) this;
}
public Criteria andProductDescriptionNotBetween(String value1, String value2) {
addCriterion("product_description not between", value1, value2, "productDescription");
return (Criteria) this;
}
public Criteria andProjectIsNull() {
addCriterion("project is null");
return (Criteria) this;
}
public Criteria andProjectIsNotNull() {
addCriterion("project is not null");
return (Criteria) this;
}
public Criteria andProjectEqualTo(String value) {
addCriterion("project =", value, "project");
return (Criteria) this;
}
public Criteria andProjectNotEqualTo(String value) {
addCriterion("project <>", value, "project");
return (Criteria) this;
}
public Criteria andProjectGreaterThan(String value) {
addCriterion("project >", value, "project");
return (Criteria) this;
}
public Criteria andProjectGreaterThanOrEqualTo(String value) {
addCriterion("project >=", value, "project");
return (Criteria) this;
}
public Criteria andProjectLessThan(String value) {
addCriterion("project <", value, "project");
return (Criteria) this;
}
public Criteria andProjectLessThanOrEqualTo(String value) {
addCriterion("project <=", value, "project");
return (Criteria) this;
}
public Criteria andProjectLike(String value) {
addCriterion("project like", value, "project");
return (Criteria) this;
}
public Criteria andProjectNotLike(String value) {
addCriterion("project not like", value, "project");
return (Criteria) this;
}
public Criteria andProjectIn(List<String> values) {
addCriterion("project in", values, "project");
return (Criteria) this;
}
public Criteria andProjectNotIn(List<String> values) {
addCriterion("project not in", values, "project");
return (Criteria) this;
}
public Criteria andProjectBetween(String value1, String value2) {
addCriterion("project between", value1, value2, "project");
return (Criteria) this;
}
public Criteria andProjectNotBetween(String value1, String value2) {
addCriterion("project not between", value1, value2, "project");
return (Criteria) this;
}
public Criteria andProjectDescriptionIsNull() {
addCriterion("project_description is null");
return (Criteria) this;
}
public Criteria andProjectDescriptionIsNotNull() {
addCriterion("project_description is not null");
return (Criteria) this;
}
public Criteria andProjectDescriptionEqualTo(String value) {
addCriterion("project_description =", value, "projectDescription");
return (Criteria) this;
}
public Criteria andProjectDescriptionNotEqualTo(String value) {
addCriterion("project_description <>", value, "projectDescription");
return (Criteria) this;
}
public Criteria andProjectDescriptionGreaterThan(String value) {
addCriterion("project_description >", value, "projectDescription");
return (Criteria) this;
}
public Criteria andProjectDescriptionGreaterThanOrEqualTo(String value) {
addCriterion("project_description >=", value, "projectDescription");
return (Criteria) this;
}
public Criteria andProjectDescriptionLessThan(String value) {
addCriterion("project_description <", value, "projectDescription");
return (Criteria) this;
}
public Criteria andProjectDescriptionLessThanOrEqualTo(String value) {
addCriterion("project_description <=", value, "projectDescription");
return (Criteria) this;
}
public Criteria andProjectDescriptionLike(String value) {
addCriterion("project_description like", value, "projectDescription");
return (Criteria) this;
}
public Criteria andProjectDescriptionNotLike(String value) {
addCriterion("project_description not like", value, "projectDescription");
return (Criteria) this;
}
public Criteria andProjectDescriptionIn(List<String> values) {
addCriterion("project_description in", values, "projectDescription");
return (Criteria) this;
}
public Criteria andProjectDescriptionNotIn(List<String> values) {
addCriterion("project_description not in", values, "projectDescription");
return (Criteria) this;
}
public Criteria andProjectDescriptionBetween(String value1, String value2) {
addCriterion("project_description between", value1, value2, "projectDescription");
return (Criteria) this;
}
public Criteria andProjectDescriptionNotBetween(String value1, String value2) {
addCriterion("project_description not between", value1, value2, "projectDescription");
return (Criteria) this;
}
public Criteria andCompanyIsNull() {
addCriterion("company is null");
return (Criteria) this;
}
public Criteria andCompanyIsNotNull() {
addCriterion("company is not null");
return (Criteria) this;
}
public Criteria andCompanyEqualTo(String value) {
addCriterion("company =", value, "company");
return (Criteria) this;
}
public Criteria andCompanyNotEqualTo(String value) {
addCriterion("company <>", value, "company");
return (Criteria) this;
}
public Criteria andCompanyGreaterThan(String value) {
addCriterion("company >", value, "company");
return (Criteria) this;
}
public Criteria andCompanyGreaterThanOrEqualTo(String value) {
addCriterion("company >=", value, "company");
return (Criteria) this;
}
public Criteria andCompanyLessThan(String value) {
addCriterion("company <", value, "company");
return (Criteria) this;
}
public Criteria andCompanyLessThanOrEqualTo(String value) {
addCriterion("company <=", value, "company");
return (Criteria) this;
}
public Criteria andCompanyLike(String value) {
addCriterion("company like", value, "company");
return (Criteria) this;
}
public Criteria andCompanyNotLike(String value) {
addCriterion("company not like", value, "company");
return (Criteria) this;
}
public Criteria andCompanyIn(List<String> values) {
addCriterion("company in", values, "company");
return (Criteria) this;
}
public Criteria andCompanyNotIn(List<String> values) {
addCriterion("company not in", values, "company");
return (Criteria) this;
}
public Criteria andCompanyBetween(String value1, String value2) {
addCriterion("company between", value1, value2, "company");
return (Criteria) this;
}
public Criteria andCompanyNotBetween(String value1, String value2) {
addCriterion("company not between", value1, value2, "company");
return (Criteria) this;
}
public Criteria andCompanyDescriptionIsNull() {
addCriterion("company_description is null");
return (Criteria) this;
}
public Criteria andCompanyDescriptionIsNotNull() {
addCriterion("company_description is not null");
return (Criteria) this;
}
public Criteria andCompanyDescriptionEqualTo(String value) {
addCriterion("company_description =", value, "companyDescription");
return (Criteria) this;
}
public Criteria andCompanyDescriptionNotEqualTo(String value) {
addCriterion("company_description <>", value, "companyDescription");
return (Criteria) this;
}
public Criteria andCompanyDescriptionGreaterThan(String value) {
addCriterion("company_description >", value, "companyDescription");
return (Criteria) this;
}
public Criteria andCompanyDescriptionGreaterThanOrEqualTo(String value) {
addCriterion("company_description >=", value, "companyDescription");
return (Criteria) this;
}
public Criteria andCompanyDescriptionLessThan(String value) {
addCriterion("company_description <", value, "companyDescription");
return (Criteria) this;
}
public Criteria andCompanyDescriptionLessThanOrEqualTo(String value) {
addCriterion("company_description <=", value, "companyDescription");
return (Criteria) this;
}
public Criteria andCompanyDescriptionLike(String value) {
addCriterion("company_description like", value, "companyDescription");
return (Criteria) this;
}
public Criteria andCompanyDescriptionNotLike(String value) {
addCriterion("company_description not like", value, "companyDescription");
return (Criteria) this;
}
public Criteria andCompanyDescriptionIn(List<String> values) {
addCriterion("company_description in", values, "companyDescription");
return (Criteria) this;
}
public Criteria andCompanyDescriptionNotIn(List<String> values) {
addCriterion("company_description not in", values, "companyDescription");
return (Criteria) this;
}
public Criteria andCompanyDescriptionBetween(String value1, String value2) {
addCriterion("company_description between", value1, value2, "companyDescription");
return (Criteria) this;
}
public Criteria andCompanyDescriptionNotBetween(String value1, String value2) {
addCriterion("company_description not between", value1, value2, "companyDescription");
return (Criteria) this;
}
......@@ -2576,6 +2936,76 @@ public class CitSalaryAdvanceExample {
return (Criteria) this;
}
public Criteria andSegment1DescriptionIsNull() {
addCriterion("segment1_description is null");
return (Criteria) this;
}
public Criteria andSegment1DescriptionIsNotNull() {
addCriterion("segment1_description is not null");
return (Criteria) this;
}
public Criteria andSegment1DescriptionEqualTo(String value) {
addCriterion("segment1_description =", value, "segment1Description");
return (Criteria) this;
}
public Criteria andSegment1DescriptionNotEqualTo(String value) {
addCriterion("segment1_description <>", value, "segment1Description");
return (Criteria) this;
}
public Criteria andSegment1DescriptionGreaterThan(String value) {
addCriterion("segment1_description >", value, "segment1Description");
return (Criteria) this;
}
public Criteria andSegment1DescriptionGreaterThanOrEqualTo(String value) {
addCriterion("segment1_description >=", value, "segment1Description");
return (Criteria) this;
}
public Criteria andSegment1DescriptionLessThan(String value) {
addCriterion("segment1_description <", value, "segment1Description");
return (Criteria) this;
}
public Criteria andSegment1DescriptionLessThanOrEqualTo(String value) {
addCriterion("segment1_description <=", value, "segment1Description");
return (Criteria) this;
}
public Criteria andSegment1DescriptionLike(String value) {
addCriterion("segment1_description like", value, "segment1Description");
return (Criteria) this;
}
public Criteria andSegment1DescriptionNotLike(String value) {
addCriterion("segment1_description not like", value, "segment1Description");
return (Criteria) this;
}
public Criteria andSegment1DescriptionIn(List<String> values) {
addCriterion("segment1_description in", values, "segment1Description");
return (Criteria) this;
}
public Criteria andSegment1DescriptionNotIn(List<String> values) {
addCriterion("segment1_description not in", values, "segment1Description");
return (Criteria) this;
}
public Criteria andSegment1DescriptionBetween(String value1, String value2) {
addCriterion("segment1_description between", value1, value2, "segment1Description");
return (Criteria) this;
}
public Criteria andSegment1DescriptionNotBetween(String value1, String value2) {
addCriterion("segment1_description not between", value1, value2, "segment1Description");
return (Criteria) this;
}
public Criteria andSegment2IsNull() {
addCriterion("segment2 is null");
return (Criteria) this;
......@@ -2646,6 +3076,76 @@ public class CitSalaryAdvanceExample {
return (Criteria) this;
}
public Criteria andSegment2DescriptionIsNull() {
addCriterion("segment2_description is null");
return (Criteria) this;
}
public Criteria andSegment2DescriptionIsNotNull() {
addCriterion("segment2_description is not null");
return (Criteria) this;
}
public Criteria andSegment2DescriptionEqualTo(String value) {
addCriterion("segment2_description =", value, "segment2Description");
return (Criteria) this;
}
public Criteria andSegment2DescriptionNotEqualTo(String value) {
addCriterion("segment2_description <>", value, "segment2Description");
return (Criteria) this;
}
public Criteria andSegment2DescriptionGreaterThan(String value) {
addCriterion("segment2_description >", value, "segment2Description");
return (Criteria) this;
}
public Criteria andSegment2DescriptionGreaterThanOrEqualTo(String value) {
addCriterion("segment2_description >=", value, "segment2Description");
return (Criteria) this;
}
public Criteria andSegment2DescriptionLessThan(String value) {
addCriterion("segment2_description <", value, "segment2Description");
return (Criteria) this;
}
public Criteria andSegment2DescriptionLessThanOrEqualTo(String value) {
addCriterion("segment2_description <=", value, "segment2Description");
return (Criteria) this;
}
public Criteria andSegment2DescriptionLike(String value) {
addCriterion("segment2_description like", value, "segment2Description");
return (Criteria) this;
}
public Criteria andSegment2DescriptionNotLike(String value) {
addCriterion("segment2_description not like", value, "segment2Description");
return (Criteria) this;
}
public Criteria andSegment2DescriptionIn(List<String> values) {
addCriterion("segment2_description in", values, "segment2Description");
return (Criteria) this;
}
public Criteria andSegment2DescriptionNotIn(List<String> values) {
addCriterion("segment2_description not in", values, "segment2Description");
return (Criteria) this;
}
public Criteria andSegment2DescriptionBetween(String value1, String value2) {
addCriterion("segment2_description between", value1, value2, "segment2Description");
return (Criteria) this;
}
public Criteria andSegment2DescriptionNotBetween(String value1, String value2) {
addCriterion("segment2_description not between", value1, value2, "segment2Description");
return (Criteria) this;
}
public Criteria andCreatedByIsNull() {
addCriterion("created_by is null");
return (Criteria) this;
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/CitSalaryAdvanceMapper.xml
View file @ ca4c21c3
......@@ -34,15 +34,22 @@
<result column="usable_invoice_amount" jdbcType="DECIMAL" property="usableInvoiceAmount" />
<result column="usable_balance" jdbcType="DECIMAL" property="usableBalance" />
<result column="advance_write_off" jdbcType="DECIMAL" property="advanceWriteOff" />
<result column="check_one" jdbcType="VARCHAR" property="checkOne" />
<result column="reclassify_amount" jdbcType="DECIMAL" property="reclassifyAmount" />
<result column="exchange_rate" jdbcType="VARCHAR" property="exchangeRate" />
<result column="ledger_id" jdbcType="VARCHAR" property="ledgerId" />
<result column="debit_advance_gene" jdbcType="VARCHAR" property="debitAdvanceGene" />
<result column="credit_prepaid_accounts" jdbcType="VARCHAR" property="creditPrepaidAccounts" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="subject_code" jdbcType="VARCHAR" property="subjectCode" />
<result column="subject_description" jdbcType="VARCHAR" property="subjectDescription" />
<result column="auxiliary_subject" jdbcType="VARCHAR" property="auxiliarySubject" />
<result column="auxiliary_subject_description" jdbcType="VARCHAR" property="auxiliarySubjectDescription" />
<result column="profit_center" jdbcType="VARCHAR" property="profitCenter" />
<result column="profit_center_description" jdbcType="VARCHAR" property="profitCenterDescription" />
<result column="product" jdbcType="VARCHAR" property="product" />
<result column="product_description" jdbcType="VARCHAR" property="productDescription" />
<result column="project" jdbcType="VARCHAR" property="project" />
<result column="project_description" jdbcType="VARCHAR" property="projectDescription" />
<result column="company" jdbcType="VARCHAR" property="company" />
<result column="company_description" jdbcType="VARCHAR" property="companyDescription" />
<result column="segment1" jdbcType="VARCHAR" property="segment1" />
<result column="segment1_description" jdbcType="VARCHAR" property="segment1Description" />
<result column="segment2" jdbcType="VARCHAR" property="segment2" />
<result column="segment2_description" jdbcType="VARCHAR" property="segment2Description" />
<result column="created_by" jdbcType="VARCHAR" property="createdBy" />
<result column="updated_by" jdbcType="VARCHAR" property="updatedBy" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
......@@ -123,9 +130,11 @@
purchase_person, po_subject_code, po_subject_name, cost_center_code, cost_center,
supplier, item, standard_money, currency, order_amount, executed_service_schedule,
coupa_total_accept, advance, unexecuted_service_schedule, approved_standard_invoice_amount,
paid_invoice_amount, usable_invoice_amount, usable_balance, advance_write_off, check_one,
reclassify_amount, exchange_rate, ledger_id, debit_advance_gene, credit_prepaid_accounts,
remark, segment1, segment2, created_by, updated_by, create_time, update_time
paid_invoice_amount, usable_invoice_amount, usable_balance, advance_write_off, subject_code,
subject_description, auxiliary_subject, auxiliary_subject_description, profit_center,
profit_center_description, product, product_description, project, project_description,
company, company_description, segment1, segment1_description, segment2, segment2_description,
created_by, updated_by, create_time, update_time
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.entity.CitSalaryAdvanceExample" resultMap="BaseResultMap">
<!--
......@@ -187,12 +196,14 @@
order_amount, executed_service_schedule, coupa_total_accept,
advance, unexecuted_service_schedule, approved_standard_invoice_amount,
paid_invoice_amount, usable_invoice_amount,
usable_balance, advance_write_off, check_one,
reclassify_amount, exchange_rate, ledger_id,
debit_advance_gene, credit_prepaid_accounts,
remark, segment1, segment2,
created_by, updated_by, create_time,
update_time)
usable_balance, advance_write_off, subject_code,
subject_description, auxiliary_subject, auxiliary_subject_description,
profit_center, profit_center_description,
product, product_description, project,
project_description, company, company_description,
segment1, segment1_description, segment2,
segment2_description, created_by, updated_by,
create_time, update_time)
values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR},
#{period,jdbcType=INTEGER}, #{source,jdbcType=VARCHAR}, #{poNo,jdbcType=VARCHAR},
#{poRow,jdbcType=VARCHAR}, #{poCreateTime,jdbcType=TIMESTAMP}, #{ladingBillPerson,jdbcType=VARCHAR},
......@@ -202,12 +213,14 @@
#{orderAmount,jdbcType=DECIMAL}, #{executedServiceSchedule,jdbcType=DECIMAL}, #{coupaTotalAccept,jdbcType=DECIMAL},
#{advance,jdbcType=DECIMAL}, #{unexecutedServiceSchedule,jdbcType=DECIMAL}, #{approvedStandardInvoiceAmount,jdbcType=DECIMAL},
#{paidInvoiceAmount,jdbcType=DECIMAL}, #{usableInvoiceAmount,jdbcType=DECIMAL},
#{usableBalance,jdbcType=DECIMAL}, #{advanceWriteOff,jdbcType=DECIMAL}, #{checkOne,jdbcType=VARCHAR},
#{reclassifyAmount,jdbcType=DECIMAL}, #{exchangeRate,jdbcType=VARCHAR}, #{ledgerId,jdbcType=VARCHAR},
#{debitAdvanceGene,jdbcType=VARCHAR}, #{creditPrepaidAccounts,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR}, #{segment1,jdbcType=VARCHAR}, #{segment2,jdbcType=VARCHAR},
#{createdBy,jdbcType=VARCHAR}, #{updatedBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
#{usableBalance,jdbcType=DECIMAL}, #{advanceWriteOff,jdbcType=DECIMAL}, #{subjectCode,jdbcType=VARCHAR},
#{subjectDescription,jdbcType=VARCHAR}, #{auxiliarySubject,jdbcType=VARCHAR}, #{auxiliarySubjectDescription,jdbcType=VARCHAR},
#{profitCenter,jdbcType=VARCHAR}, #{profitCenterDescription,jdbcType=VARCHAR},
#{product,jdbcType=VARCHAR}, #{productDescription,jdbcType=VARCHAR}, #{project,jdbcType=VARCHAR},
#{projectDescription,jdbcType=VARCHAR}, #{company,jdbcType=VARCHAR}, #{companyDescription,jdbcType=VARCHAR},
#{segment1,jdbcType=VARCHAR}, #{segment1Description,jdbcType=VARCHAR}, #{segment2,jdbcType=VARCHAR},
#{segment2Description,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR}, #{updatedBy,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.CitSalaryAdvance">
<!--
......@@ -300,33 +313,54 @@
<if test="advanceWriteOff != null">
advance_write_off,
</if>
<if test="checkOne != null">
check_one,
<if test="subjectCode != null">
subject_code,
</if>
<if test="reclassifyAmount != null">
reclassify_amount,
<if test="subjectDescription != null">
subject_description,
</if>
<if test="exchangeRate != null">
exchange_rate,
<if test="auxiliarySubject != null">
auxiliary_subject,
</if>
<if test="ledgerId != null">
ledger_id,
<if test="auxiliarySubjectDescription != null">
auxiliary_subject_description,
</if>
<if test="debitAdvanceGene != null">
debit_advance_gene,
<if test="profitCenter != null">
profit_center,
</if>
<if test="creditPrepaidAccounts != null">
credit_prepaid_accounts,
<if test="profitCenterDescription != null">
profit_center_description,
</if>
<if test="remark != null">
remark,
<if test="product != null">
product,
</if>
<if test="productDescription != null">
product_description,
</if>
<if test="project != null">
project,
</if>
<if test="projectDescription != null">
project_description,
</if>
<if test="company != null">
company,
</if>
<if test="companyDescription != null">
company_description,
</if>
<if test="segment1 != null">
segment1,
</if>
<if test="segment1Description != null">
segment1_description,
</if>
<if test="segment2 != null">
segment2,
</if>
<if test="segment2Description != null">
segment2_description,
</if>
<if test="createdBy != null">
created_by,
</if>
......@@ -425,33 +459,54 @@
<if test="advanceWriteOff != null">
#{advanceWriteOff,jdbcType=DECIMAL},
</if>
<if test="checkOne != null">
#{checkOne,jdbcType=VARCHAR},
<if test="subjectCode != null">
#{subjectCode,jdbcType=VARCHAR},
</if>
<if test="reclassifyAmount != null">
#{reclassifyAmount,jdbcType=DECIMAL},
<if test="subjectDescription != null">
#{subjectDescription,jdbcType=VARCHAR},
</if>
<if test="exchangeRate != null">
#{exchangeRate,jdbcType=VARCHAR},
<if test="auxiliarySubject != null">
#{auxiliarySubject,jdbcType=VARCHAR},
</if>
<if test="ledgerId != null">
#{ledgerId,jdbcType=VARCHAR},
<if test="auxiliarySubjectDescription != null">
#{auxiliarySubjectDescription,jdbcType=VARCHAR},
</if>
<if test="debitAdvanceGene != null">
#{debitAdvanceGene,jdbcType=VARCHAR},
<if test="profitCenter != null">
#{profitCenter,jdbcType=VARCHAR},
</if>
<if test="creditPrepaidAccounts != null">
#{creditPrepaidAccounts,jdbcType=VARCHAR},
<if test="profitCenterDescription != null">
#{profitCenterDescription,jdbcType=VARCHAR},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
<if test="product != null">
#{product,jdbcType=VARCHAR},
</if>
<if test="productDescription != null">
#{productDescription,jdbcType=VARCHAR},
</if>
<if test="project != null">
#{project,jdbcType=VARCHAR},
</if>
<if test="projectDescription != null">
#{projectDescription,jdbcType=VARCHAR},
</if>
<if test="company != null">
#{company,jdbcType=VARCHAR},
</if>
<if test="companyDescription != null">
#{companyDescription,jdbcType=VARCHAR},
</if>
<if test="segment1 != null">
#{segment1,jdbcType=VARCHAR},
</if>
<if test="segment1Description != null">
#{segment1Description,jdbcType=VARCHAR},
</if>
<if test="segment2 != null">
#{segment2,jdbcType=VARCHAR},
</if>
<if test="segment2Description != null">
#{segment2Description,jdbcType=VARCHAR},
</if>
<if test="createdBy != null">
#{createdBy,jdbcType=VARCHAR},
</if>
......@@ -567,33 +622,54 @@
<if test="record.advanceWriteOff != null">
advance_write_off = #{record.advanceWriteOff,jdbcType=DECIMAL},
</if>
<if test="record.checkOne != null">
check_one = #{record.checkOne,jdbcType=VARCHAR},
<if test="record.subjectCode != null">
subject_code = #{record.subjectCode,jdbcType=VARCHAR},
</if>
<if test="record.reclassifyAmount != null">
reclassify_amount = #{record.reclassifyAmount,jdbcType=DECIMAL},
<if test="record.subjectDescription != null">
subject_description = #{record.subjectDescription,jdbcType=VARCHAR},
</if>
<if test="record.exchangeRate != null">
exchange_rate = #{record.exchangeRate,jdbcType=VARCHAR},
<if test="record.auxiliarySubject != null">
auxiliary_subject = #{record.auxiliarySubject,jdbcType=VARCHAR},
</if>
<if test="record.ledgerId != null">
ledger_id = #{record.ledgerId,jdbcType=VARCHAR},
<if test="record.auxiliarySubjectDescription != null">
auxiliary_subject_description = #{record.auxiliarySubjectDescription,jdbcType=VARCHAR},
</if>
<if test="record.debitAdvanceGene != null">
debit_advance_gene = #{record.debitAdvanceGene,jdbcType=VARCHAR},
<if test="record.profitCenter != null">
profit_center = #{record.profitCenter,jdbcType=VARCHAR},
</if>
<if test="record.creditPrepaidAccounts != null">
credit_prepaid_accounts = #{record.creditPrepaidAccounts,jdbcType=VARCHAR},
<if test="record.profitCenterDescription != null">
profit_center_description = #{record.profitCenterDescription,jdbcType=VARCHAR},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
<if test="record.product != null">
product = #{record.product,jdbcType=VARCHAR},
</if>
<if test="record.productDescription != null">
product_description = #{record.productDescription,jdbcType=VARCHAR},
</if>
<if test="record.project != null">
project = #{record.project,jdbcType=VARCHAR},
</if>
<if test="record.projectDescription != null">
project_description = #{record.projectDescription,jdbcType=VARCHAR},
</if>
<if test="record.company != null">
company = #{record.company,jdbcType=VARCHAR},
</if>
<if test="record.companyDescription != null">
company_description = #{record.companyDescription,jdbcType=VARCHAR},
</if>
<if test="record.segment1 != null">
segment1 = #{record.segment1,jdbcType=VARCHAR},
</if>
<if test="record.segment1Description != null">
segment1_description = #{record.segment1Description,jdbcType=VARCHAR},
</if>
<if test="record.segment2 != null">
segment2 = #{record.segment2,jdbcType=VARCHAR},
</if>
<if test="record.segment2Description != null">
segment2_description = #{record.segment2Description,jdbcType=VARCHAR},
</if>
<if test="record.createdBy != null">
created_by = #{record.createdBy,jdbcType=VARCHAR},
</if>
......@@ -645,15 +721,22 @@
usable_invoice_amount = #{record.usableInvoiceAmount,jdbcType=DECIMAL},
usable_balance = #{record.usableBalance,jdbcType=DECIMAL},
advance_write_off = #{record.advanceWriteOff,jdbcType=DECIMAL},
check_one = #{record.checkOne,jdbcType=VARCHAR},
reclassify_amount = #{record.reclassifyAmount,jdbcType=DECIMAL},
exchange_rate = #{record.exchangeRate,jdbcType=VARCHAR},
ledger_id = #{record.ledgerId,jdbcType=VARCHAR},
debit_advance_gene = #{record.debitAdvanceGene,jdbcType=VARCHAR},
credit_prepaid_accounts = #{record.creditPrepaidAccounts,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR},
subject_code = #{record.subjectCode,jdbcType=VARCHAR},
subject_description = #{record.subjectDescription,jdbcType=VARCHAR},
auxiliary_subject = #{record.auxiliarySubject,jdbcType=VARCHAR},
auxiliary_subject_description = #{record.auxiliarySubjectDescription,jdbcType=VARCHAR},
profit_center = #{record.profitCenter,jdbcType=VARCHAR},
profit_center_description = #{record.profitCenterDescription,jdbcType=VARCHAR},
product = #{record.product,jdbcType=VARCHAR},
product_description = #{record.productDescription,jdbcType=VARCHAR},
project = #{record.project,jdbcType=VARCHAR},
project_description = #{record.projectDescription,jdbcType=VARCHAR},
company = #{record.company,jdbcType=VARCHAR},
company_description = #{record.companyDescription,jdbcType=VARCHAR},
segment1 = #{record.segment1,jdbcType=VARCHAR},
segment1_description = #{record.segment1Description,jdbcType=VARCHAR},
segment2 = #{record.segment2,jdbcType=VARCHAR},
segment2_description = #{record.segment2Description,jdbcType=VARCHAR},
created_by = #{record.createdBy,jdbcType=VARCHAR},
updated_by = #{record.updatedBy,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
......@@ -750,33 +833,54 @@
<if test="advanceWriteOff != null">
advance_write_off = #{advanceWriteOff,jdbcType=DECIMAL},
</if>
<if test="checkOne != null">
check_one = #{checkOne,jdbcType=VARCHAR},
<if test="subjectCode != null">
subject_code = #{subjectCode,jdbcType=VARCHAR},
</if>
<if test="reclassifyAmount != null">
reclassify_amount = #{reclassifyAmount,jdbcType=DECIMAL},
<if test="subjectDescription != null">
subject_description = #{subjectDescription,jdbcType=VARCHAR},
</if>
<if test="exchangeRate != null">
exchange_rate = #{exchangeRate,jdbcType=VARCHAR},
<if test="auxiliarySubject != null">
auxiliary_subject = #{auxiliarySubject,jdbcType=VARCHAR},
</if>
<if test="ledgerId != null">
ledger_id = #{ledgerId,jdbcType=VARCHAR},
<if test="auxiliarySubjectDescription != null">
auxiliary_subject_description = #{auxiliarySubjectDescription,jdbcType=VARCHAR},
</if>
<if test="debitAdvanceGene != null">
debit_advance_gene = #{debitAdvanceGene,jdbcType=VARCHAR},
<if test="profitCenter != null">
profit_center = #{profitCenter,jdbcType=VARCHAR},
</if>
<if test="creditPrepaidAccounts != null">
credit_prepaid_accounts = #{creditPrepaidAccounts,jdbcType=VARCHAR},
<if test="profitCenterDescription != null">
profit_center_description = #{profitCenterDescription,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
<if test="product != null">
product = #{product,jdbcType=VARCHAR},
</if>
<if test="productDescription != null">
product_description = #{productDescription,jdbcType=VARCHAR},
</if>
<if test="project != null">
project = #{project,jdbcType=VARCHAR},
</if>
<if test="projectDescription != null">
project_description = #{projectDescription,jdbcType=VARCHAR},
</if>
<if test="company != null">
company = #{company,jdbcType=VARCHAR},
</if>
<if test="companyDescription != null">
company_description = #{companyDescription,jdbcType=VARCHAR},
</if>
<if test="segment1 != null">
segment1 = #{segment1,jdbcType=VARCHAR},
</if>
<if test="segment1Description != null">
segment1_description = #{segment1Description,jdbcType=VARCHAR},
</if>
<if test="segment2 != null">
segment2 = #{segment2,jdbcType=VARCHAR},
</if>
<if test="segment2Description != null">
segment2_description = #{segment2Description,jdbcType=VARCHAR},
</if>
<if test="createdBy != null">
created_by = #{createdBy,jdbcType=VARCHAR},
</if>
......@@ -825,15 +929,22 @@
usable_invoice_amount = #{usableInvoiceAmount,jdbcType=DECIMAL},
usable_balance = #{usableBalance,jdbcType=DECIMAL},
advance_write_off = #{advanceWriteOff,jdbcType=DECIMAL},
check_one = #{checkOne,jdbcType=VARCHAR},
reclassify_amount = #{reclassifyAmount,jdbcType=DECIMAL},
exchange_rate = #{exchangeRate,jdbcType=VARCHAR},
ledger_id = #{ledgerId,jdbcType=VARCHAR},
debit_advance_gene = #{debitAdvanceGene,jdbcType=VARCHAR},
credit_prepaid_accounts = #{creditPrepaidAccounts,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
subject_code = #{subjectCode,jdbcType=VARCHAR},
subject_description = #{subjectDescription,jdbcType=VARCHAR},
auxiliary_subject = #{auxiliarySubject,jdbcType=VARCHAR},
auxiliary_subject_description = #{auxiliarySubjectDescription,jdbcType=VARCHAR},
profit_center = #{profitCenter,jdbcType=VARCHAR},
profit_center_description = #{profitCenterDescription,jdbcType=VARCHAR},
product = #{product,jdbcType=VARCHAR},
product_description = #{productDescription,jdbcType=VARCHAR},
project = #{project,jdbcType=VARCHAR},
project_description = #{projectDescription,jdbcType=VARCHAR},
company = #{company,jdbcType=VARCHAR},
company_description = #{companyDescription,jdbcType=VARCHAR},
segment1 = #{segment1,jdbcType=VARCHAR},
segment1_description = #{segment1Description,jdbcType=VARCHAR},
segment2 = #{segment2,jdbcType=VARCHAR},
segment2_description = #{segment2Description,jdbcType=VARCHAR},
created_by = #{createdBy,jdbcType=VARCHAR},
updated_by = #{updatedBy,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitJournalAdjustExtendsMapper.xml
View file @ ca4c21c3
......@@ -344,7 +344,11 @@
id, organization_id, project_id, period, date, source, ledger_id, ledger_name, currency_code,
status, header_id, line_num, approval_status, posted_status, account_period, accounting_date,
journal_source, category, name, voucher_num, description, org_code, subject_code,
org_name, subject_name, accounted_dr, accounted_cr,
org_name, segment2_name, subject_name, segment4_name, segment5_name, segment6_name, segment7_name, segment8_name,
segment9_name, segment10_name, journal_currency_code, sob_currency_code, accounted_dr, accounted_cr,
entered_dr, entered_cr, cf_item, attribute1, attribute2, attribute3, attribute4, attribute5,
attribute6, attribute7, attribute8, attribute9, attribute10, attribute11, attribute12, attribute13, attribute14, attribute15,
attribute16,
created_by, created_date, late_updated_by,
late_updated_date, create_time, update_time,is_select
from cit_journal_entry_adjust where project_id = #{projectId,jdbcType=VARCHAR}
......@@ -360,13 +364,22 @@
<if test="subjectName != null">
and subject_name = #{subjectName,jdbcType=VARCHAR}
</if>
<if test="periodStart!=null">
AND account_period &gt;= #{periodStart,jdbcType=INTEGER}
</if>
<if test="periodEnd!=null">
AND account_period &lt;= #{periodEnd,jdbcType=INTEGER}
</if>
UNION ALL
select
id, organization_id, project_id, tms_period as period ,date,source, ledger_id, ledger_name, currency_code,
status, header_id, line_num, approval_status, posted_status, period as account_period, accounting_date,
journal_source, category, name, voucher_num, description, segment1 as org_code, segment3 as subject_code,
segment1_name as org_name, segment3_name as subject_name, accounted_dr, accounted_cr,
created_by, created_date, late_updated_by, late_updated_date, create_time, update_time, is_select
segment1_name as org_name, segment2_name, segment3_name as subject_name, segment4_name, segment5_name, segment6_name,
segment7_name, segment8_name, segment9_name, segment10_name, journal_currency_code, sob_currency_code,
accounted_dr, accounted_cr, entered_dr, entered_cr, cf_item, attribute1, attribute2, attribute3, attribute4, attribute5,
attribute6, attribute7, attribute8, attribute9, attribute10, attribute11, attribute12, attribute13, attribute14, attribute15,
attribute16, created_by, created_date, late_updated_by, late_updated_date, create_time, update_time, is_select
from journal_entry where project_id = #{projectId,jdbcType=VARCHAR}
<if test="orgCode != null">
and segment1 = #{orgCode,jdbcType=VARCHAR}
......@@ -380,6 +393,12 @@
<if test="subjectName != null">
and segment3_name = #{subjectName,jdbcType=VARCHAR}
</if>
<if test="periodStart!=null">
AND period &gt;= #{periodStart,jdbcType=INTEGER}
</if>
<if test="periodEnd!=null">
AND period &lt;= #{periodEnd,jdbcType=INTEGER}
</if>
</select>
</mapper>
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitSalaryAdvanceExtendsMapper.xml
View file @ ca4c21c3
......@@ -139,41 +139,69 @@
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.checkOne != null">#{item.checkOne,jdbcType=VARCHAR},</when>
<when test="item.subjectCode != null">#{item.subjectCode,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.reclassifyAmount != null">#{item.reclassifyAmount,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
<when test="item.subjectDescription != null">#{item.subjectDescription,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.auxiliarySubject != null">#{item.auxiliarySubject,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.auxiliarySubjectDescription != null">#{item.auxiliarySubjectDescription,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.profitCenter != null">#{item.profitCenter,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.exchangeRate != null">#{item.exchangeRate,jdbcType=VARCHAR},</when>
<when test="item.profitCenterDescription != null">#{item.profitCenterDescription,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.ledgerId != null">#{item.ledgerId,jdbcType=VARCHAR},</when>
<when test="item.product != null">#{item.product,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.debitAdvanceGene != null">#{item.debitAdvanceGene,jdbcType=VARCHAR},</when>
<when test="item.productDescription != null">#{item.productDescription,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.creditPrepaidAccounts != null">#{item.creditPrepaidAccounts,jdbcType=VARCHAR},</when>
<when test="item.project != null">#{item.project,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.remark != null">#{item.remark,jdbcType=VARCHAR},</when>
<when test="item.projectDescription != null">#{item.projectDescription,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.company != null">#{item.company,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.companyDescription != null">#{item.companyDescription,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.segment1 != null">#{item.segment1,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.segment1Description != null">#{item.segment1Description,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.segment2 != null">#{item.segment2,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.segment2Description != null">#{item.segment2Description,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.createdBy != null">#{item.createdBy,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
......
atms-web/src/main/java/pwc/taxtech/atms/orangeheap/controller/OrangeHeapController.java
View file @ ca4c21c3
package pwc.taxtech.atms.orangeheap.controller;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import pwc.taxtech.atms.orangeheap.dto.ApiResultDto;
import pwc.taxtech.atms.orangeheap.service.OrangeHeapService;
import javax.annotation.Resource;
@RestController
@RequestMapping("/OrangeHeap/tableau")
public class OrangeHeapController {
@Resource
private OrangeHeapService tableauService;
@ResponseBody
@GetMapping("unreturnedTax")
public ApiResultDto getUnreturnedTax() {
return ApiResultDto.success(tableauService.getUnreturnedTax().orElse(StringUtils.EMPTY));
}
}
atms-web/src/main/java/pwc/taxtech/atms/orangeheap/dto/ApiResultDto.java 0 → 100644
View file @ ca4c21c3
package pwc.taxtech.atms.orangeheap.dto;
import org.apache.commons.lang3.StringUtils;
public class ApiResultDto {
private int code;
private Object data;
private String message;
public static final int SUCCESS = 0; //接口成功code
public static final int FAILED = -1; //通用失败code
/**
* 返回成功
*
* @param data data
* @return ApiResultDto
*/
public static ApiResultDto success(Object data) {
return new ApiResultDto(SUCCESS, data, StringUtils.EMPTY);
}
/**
* 返回成功
*
* @return ApiResultDto
*/
public static ApiResultDto success() {
return new ApiResultDto(SUCCESS, null, StringUtils.EMPTY);
}
/**
* 返回失败
*
* @param code fail code
* @param message msg
* @return ApiResultDto
*/
public static ApiResultDto fail(int code, String message) {
return new ApiResultDto(code, null, message);
}
/**
* 返回失败
*
* @param message msg
* @return ApiResultDto
*/
public static ApiResultDto fail(String message) {
return new ApiResultDto(FAILED, null, message);
}
public static ApiResultDto fail() {
return new ApiResultDto(FAILED, null, StringUtils.EMPTY);
}
public ApiResultDto() {
}
public ApiResultDto(int code, Object data, String message) {
this.code = code;
this.data = data;
this.message = message;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public Object getData() {
return data;
}
public void setData(Object data) {
this.data = data;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
}
atms-web/src/main/java/pwc/taxtech/atms/orangeheap/service/OrangeHeapService.java
View file @ ca4c21c3
package pwc.taxtech.atms.orangeheap.service;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import pwc.taxtech.atms.web.OrangeHeapConfig;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.Optional;
@Service
public class OrangeHeapService {
@Resource
private OrangeHeapConfig systemConfig;
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
public Optional<String> getTicket(String username) {
CloseableHttpClient httpClient = null;
try {
String ticketUrl = String.format(systemConfig.getTableauGetTicket(), username);
httpClient = HttpClients.createDefault();
HttpPost httpPost = new HttpPost(ticketUrl);
HttpResponse httpResponse = httpClient.execute(httpPost);
String response = IOUtils.toString(httpResponse.getEntity().getContent(), "UTF-8");
return StringUtils.equals(response, "-1") ? Optional.empty() : Optional.of(response);
} catch (Exception e) {
logger.error("getTicket error.", e);
} finally {
if (null != httpClient) {
try {
httpClient.close();
} catch (IOException e) {
logger.error("close httpClient error.", e);
}
}
}
return Optional.empty();
}
public Optional<String> getUnreturnedTax() {
// Optional<String> optional = authUserHelper.getCurrentAuditor();
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauUnreturnedTax(),
getTicket(s).orElse(StringUtils.EMPTY)));
}
}
atms-web/src/main/java/pwc/taxtech/atms/web/OrangeHeapConfig.java 0 → 100644
View file @ ca4c21c3
package pwc.taxtech.atms.web;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
@Configuration
public class OrangeHeapConfig {
@Value("${longi_api_basic_user}")
private String longiApiBasicUser;
@Value("${longi_api_basic_pwd}")
private String longiApiBasicPwd;
@Value("${longi_api_gl_balance}")
private String longiApiGlBalance;
//tableau相关配置
@Value("${tableau_get_ticket}")
private String tableauGetTicket;
@Value("${tableau_unreturned_tax}")
private String tableauUnreturnedTax;
@Value("${tableau_tax_comparison}")
private String tableauTaxComparison;
@Value("${tableau_other_countries}")
private String tableauOtherCountries;
@Value("${tableau_cost_analysis}")
private String tableauCostAnalysis;
@Value("${tableau_profit_and_loss}")
private String tableauProfitAndLoss;
@Value("${tableau_other_domestic_data}")
private String tableauOtherDomesticData;
@Value("${tableau_doc_situation}")
private String tableauDocSituation;
@Value("${tableau_global_overview}")
private String tableauGlobalOverview;
@Value("${tableau_mexican_tax}")
private String tableauMexicanTax;
@Value("${tableau_australian_tax}")
private String tableauAustralianTax;
@Value("${tableau_brazilian_tax}")
private String tableauBrazilianTax;
public String getLongiApiBasicUser() {
return this.longiApiBasicUser;
}
public void setLongiApiBasicUser(String longiApiBasicUser) {
this.longiApiBasicUser = longiApiBasicUser;
}
public String getLongiApiBasicPwd() {
return this.longiApiBasicPwd;
}
public void setLongiApiBasicPwd(String longiApiBasicPwd) {
this.longiApiBasicPwd = longiApiBasicPwd;
}
public String getLongiApiGlBalance() {
return this.longiApiGlBalance;
}
public void setLongiApiGlBalance(String longiApiGlBalance) {
this.longiApiGlBalance = longiApiGlBalance;
}
public String getTableauGetTicket() {
return this.tableauGetTicket;
}
public void setTableauGetTicket(String tableauGetTicket) {
this.tableauGetTicket = tableauGetTicket;
}
public String getTableauUnreturnedTax() {
return this.tableauUnreturnedTax;
}
public void setTableauUnreturnedTax(String tableauUnreturnedTax) {
this.tableauUnreturnedTax = tableauUnreturnedTax;
}
public String getTableauTaxComparison() {
return this.tableauTaxComparison;
}
public void setTableauTaxComparison(String tableauTaxComparison) {
this.tableauTaxComparison = tableauTaxComparison;
}
public String getTableauOtherCountries() {
return this.tableauOtherCountries;
}
public void setTableauOtherCountries(String tableauOtherCountries) {
this.tableauOtherCountries = tableauOtherCountries;
}
public String getTableauCostAnalysis() {
return this.tableauCostAnalysis;
}
public void setTableauCostAnalysis(String tableauCostAnalysis) {
this.tableauCostAnalysis = tableauCostAnalysis;
}
public String getTableauProfitAndLoss() {
return this.tableauProfitAndLoss;
}
public void setTableauProfitAndLoss(String tableauProfitAndLoss) {
this.tableauProfitAndLoss = tableauProfitAndLoss;
}
public String getTableauOtherDomesticData() {
return this.tableauOtherDomesticData;
}
public void setTableauOtherDomesticData(String tableauOtherDomesticData) {
this.tableauOtherDomesticData = tableauOtherDomesticData;
}
public String getTableauDocSituation() {
return this.tableauDocSituation;
}
public void setTableauDocSituation(String tableauDocSituation) {
this.tableauDocSituation = tableauDocSituation;
}
public String getTableauGlobalOverview() {
return this.tableauGlobalOverview;
}
public void setTableauGlobalOverview(String tableauGlobalOverview) {
this.tableauGlobalOverview = tableauGlobalOverview;
}
public String getTableauMexicanTax() {
return this.tableauMexicanTax;
}
public void setTableauMexicanTax(String tableauMexicanTax) {
this.tableauMexicanTax = tableauMexicanTax;
}
public String getTableauAustralianTax() {
return this.tableauAustralianTax;
}
public void setTableauAustralianTax(String tableauAustralianTax) {
this.tableauAustralianTax = tableauAustralianTax;
}
public String getTableauBrazilianTax() {
return this.tableauBrazilianTax;
}
public void setTableauBrazilianTax(String tableauBrazilianTax) {
this.tableauBrazilianTax = tableauBrazilianTax;
}
}
\ No newline at end of file
atms-web/src/main/resources/conf.properties
View file @ ca4c21c3
......@@ -14,3 +14,24 @@ get_user_info_url=${get_user_info_url}
app_id=${app_id}
app_key=${app_key}
cookie.maxAgeSeconds=${cookie.maxAgeSeconds}
# Tableau Settings
# Longi config
longi_api_basic_user=${longi_api_basic_user}
longi_api_basic_pwd=${longi_api_basic_pwd}
longi_api_gl_balance=${longi_api_gl_balance}
#tableau config
tableau_get_ticket=${tableau_get_ticket}
tableau_unreturned_tax=${tableau_unreturned_tax}
tableau_tax_comparison=${tableau_tax_comparison}
tableau_other_countries=${tableau_other_countries}
tableau_cost_analysis=${tableau_cost_analysis}
tableau_profit_and_loss=${tableau_profit_and_loss}
tableau_other_domestic_data=${tableau_other_domestic_data}
tableau_doc_situation=${tableau_doc_situation}
tableau_global_overview=${tableau_global_overview}
tableau_mexican_tax=${tableau_mexican_tax}
tableau_australian_tax=${tableau_australian_tax}
tableau_brazilian_tax=${tableau_brazilian_tax}
\ No newline at end of file
atms-web/src/main/resources/conf_profile_dev.properties
View file @ ca4c21c3
......@@ -12,4 +12,24 @@ check_ticket=false
get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
app_id=2500
app_key=983258e7fd04d7fa0534735f7b1c33f3
cookie.maxAgeSeconds=86400
\ No newline at end of file
cookie.maxAgeSeconds=86400
# Tableau Setting
# Longi config
longi_api_basic_user=
longi_api_basic_pwd=
longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
#tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_countries=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_domestic_data=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_doc_situation=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet40?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
atms-web/src/main/resources/conf_profile_pub.properties
View file @ ca4c21c3
......@@ -12,4 +12,24 @@ check_ticket=true
get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
app_id=2500
app_key=983258e7fd04d7fa0534735f7b1c33f3
cookie.maxAgeSeconds=18000
\ No newline at end of file
cookie.maxAgeSeconds=18000
# Tableau Setting
# Longi config
longi_api_basic_user=
longi_api_basic_pwd=
longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
#tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_countries=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_domestic_data=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_doc_situation=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet40?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
atms-web/src/main/resources/conf_profile_staging.properties
View file @ ca4c21c3
......@@ -13,3 +13,24 @@ check_ticket=false
get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
app_id=2500
app_key=983258e7fd04d7fa0534735f7b1c33f3
# Tableau Setting
# Longi config
longi_api_basic_user=
longi_api_basic_pwd=
longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
#tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_countries=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_domestic_data=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_doc_situation=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet40?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
atms-web/src/main/resources/conf_profile_uat.properties
View file @ ca4c21c3
......@@ -12,4 +12,24 @@ check_ticket=true
get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
app_id=2500
app_key=983258e7fd04d7fa0534735f7b1c33f3
cookie.maxAgeSeconds=18000
\ No newline at end of file
cookie.maxAgeSeconds=18000
# Tableau Setting
# Longi config
longi_api_basic_user=
longi_api_basic_pwd=
longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
#tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_countries=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_domestic_data=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_doc_situation=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet40?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @ ca4c21c3
......@@ -813,6 +813,7 @@
"dateFormat4YearMonthDayCh": "yyyy-mm-dd",
"RecordSize": "Record Size",
"ExtractFile": "Extract File",
"ExtractTaskId": "任务ID",
"TaxPayerIdNum": "纳税人识别号",
"ExtractDistribution": "Extract Distribution",
......
atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json
View file @ ca4c21c3
......@@ -1150,5 +1150,6 @@
"DistributionAmount": "Distribution Amount",
"Subtotal": "Total",
"AssetEamMapping": "Asset Eam Mapping",
"ItemData": "Item Data"
"ItemData": "Item Data",
"GenerateJournalMergeAndTB": "Handle Journal"
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ ca4c21c3
......@@ -857,6 +857,7 @@
"RecordSize": "记录条数",
"ExtractFile": "抽取类型",
"ExtractTaskId": "任务ID",
"TaxPayerIdNum": "纳税人识别号",
"ExtractDistribution": "抽取分发",
"Log":"日志",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ ca4c21c3
......@@ -1203,7 +1203,8 @@
"DistributionRatio": "分配比例",
"DistributionAmount": "分配税额",
"AssetEamMapping": "固资损失计算",
"ItemData": "条数据"
"ItemData": "条数据",
"GenerateJournalMergeAndTB": "处理日记账"
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list-search.html
View file @ ca4c21c3
<div class="popover">
<div class="popover-import-asset">
<div class="arrow"></div>
<div class="popover-content">
<div>
<table class=" table table-responsive">
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js
View file @ ca4c21c3
......@@ -489,7 +489,7 @@
{ caption: $translate.instant('ResidualRate'), dataField: "residualRate", format: { type: 'percent', precision: 2 }, width: 80, allowEditing: false },
{ caption: $translate.instant('PerMonthDepreciationAmount'), dataField: "accountMonthDepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{ caption: $translate.instant('YearDepreciationAmount'), dataField: "accountYearDepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{ caption: $translate.instant('AccountTotalepreciationAmount'), dataField: "accountTotalepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{ caption: $translate.instant('AccountTotalepreciationAmount'), dataField: "accountTotalDepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{ caption: $translate.instant('YearEndValue'), dataField: "yearEndValue", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
]
},
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.less
View file @ ca4c21c3
@import "~/app-resources/less/theme.less";
.cit-import-asset-list {
padding-left: 20px;
height: 96%;
.sweet-alert {
background-color: #eeeeee;
padding-left: 20px;
height: 96%;
.sweet-alert {
background-color: #eeeeee;
}
.nav-wrapper {
padding-bottom: 10px;
border-bottom: 1px solid #DBD8D3;
.nav-header {
height: 54px;
line-height: 54px;
font-family: "Microsoft YaHei Bold", "Microsoft YaHei Regular", "Microsoft YaHei";
font-weight: 700;
font-style: normal;
font-size: 15px;
color: #333;
}
.nav-wrapper {
padding-bottom: 10px;
border-bottom: 1px solid #DBD8D3;
.nav-header {
height: 54px;
line-height: 54px;
font-family: "Microsoft YaHei Bold", "Microsoft YaHei Regular", "Microsoft YaHei";
font-weight: 700;
font-style: normal;
font-size: 15px;
color: #333;
}
.nav-tab {
/*display: inline-block;*/
span {
display: inline-block;
height: 34px;
width: 80px;
text-align: center;
line-height: 34px;
padding: 0 10px;
background-color: #B90808;
color: #FFF;
font-family: "Microsoft YaHei";
font-weight: 400;
font-style: normal;
font-size: 14px;
cursor: pointer;
}
.active {
background-color: #F91000;
}
.nav-tab {
/*display: inline-block;*/
}
}
.alert-warning {
background-color: #FDE2DE;
span {
display: inline-block;
height: 34px;
width: 80px;
text-align: center;
line-height: 34px;
padding: 0 10px;
background-color: #B90808;
color: #FFF;
font-family: "Microsoft YaHei";
font-weight: 400;
font-style: normal;
font-size: 14px;
cursor: pointer;
}
}
.alert {
color: #CF2D1B;
font-weight: bold;
display: inline-block;
padding: 5px;
float: left;
margin: -45px 0 0 350px;
.active {
background-color: #F91000;
}
i {
font-size: 20px;
vertical-align: middle;
margin-right: 5px;
}
}
}
.dropdown-common() {
display: inline-block;
.alert-warning {
background-color: #FDE2DE;
cursor: pointer;
}
.select-button {
background-color: #F5F5F5;
padding: 6px 0;
width: 110px;
}
.alert {
color: #CF2D1B;
font-weight: bold;
display: inline-block;
padding: 5px;
float: left;
margin: -45px 0 0 350px;
i {
font-size: 20px;
vertical-align: middle;
margin-right: 5px;
}
}
.caret {
margin-top: 8px;
}
.dropdown-common() {
display: inline-block;
.dropdown-menu {
min-width: 140px;
max-height: 400px;
overflow-y: scroll;
li {
text-align: left;
min-height: 0px;
height: 30px;
color: #000;
font-weight: normal;
&:hover {
background-color: #F91000;
color: #FFF;
cursor: pointer;
}
i {
float: right;
font-size: 15px;
}
}
}
.select-button {
background-color: #F5F5F5;
padding: 6px 0;
width: 110px;
}
#tab_total {
display: block;
height: calc(~'100% - 80px');
position: relative;
.operation-wrapper {
margin: -40px 15px 0 0;
.caret {
margin-top: 8px;
}
span {
cursor: pointer;
}
.dropdown-menu {
min-width: 140px;
max-height: 400px;
overflow-y: scroll;
li {
text-align: left;
min-height: 0px;
height: 30px;
color: #000;
font-weight: normal;
&:hover {
background-color: #F91000;
color: #FFF;
cursor: pointer;
}
.import-wrapper {
margin-top: 10px;
span {
margin-left: 10px;
color: #333;
font-family: "Microsoft YaHei";
font-style: normal;
font-size: 14px;
font-weight: bold;
}
.dropdown {
.dropdown-common();
}
input {
width: 50px;
outline: none;
border-radius: 3px;
border: 1px solid #3c3a36;
padding: 2px;
text-align: center;
}
> button:last-child {
float: right;
margin-right: 20px;
}
.btn-wrapper {
border-radius: 5px;
background-color: #e0301e;
color: #FFF;
display: inline-block;
float: right;
margin-right: 10px;
.btn-vat-primary {
min-width: 80px;
}
}
.import-info-wrapper {
display: inline-block;
}
i {
float: right;
font-size: 15px;
}
}
}
}
.dt-init-wrapper {
margin: 10px 0;
max-width: 99%;
height: calc(100% - 200px);
position: relative;
z-index: 1;
.dropdown {
.dropdown-common();
i {
color: #F85550;
}
}
.total-Wrapper {
width: 99%;
margin-left: 0px;
font-size: 13px;
font-family: 'Microsoft YaHei';
padding-bottom: 5px;
.total_span {
color: #B4122A !important;
background-color: #ddd !important;
font-size: 12px !important;
font-weight: bold !important;
border-radius: 10px !important;
padding-left: 8px !important;
padding-right: 8px !important;
}
}
/*.balance-ouput-grid-wrapper {
height: calc(~'100% - -10px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 150px;
left: 0;
right: 0;
background-color: #FFF;
}*/
}
#tab_total {
display: block;
height: calc(~'100% - 80px');
position: relative;
.dt-import-wrapper {
margin: 10px 0;
max-width: 99%;
overflow: auto;
height: calc(~"100% - 70px");
.operation-wrapper {
margin: -40px 15px 0 0;
.dropdown {
.dropdown-common();
span {
cursor: pointer;
}
}
i {
color: #F85550;
}
.import-wrapper {
margin-top: 10px;
button {
color: #333;
}
}
}
span {
margin-left: 10px;
color: #333;
font-family: "Microsoft YaHei";
font-style: normal;
font-size: 14px;
font-weight: bold;
}
.error-info-wrapper {
position: absolute;
height: 150px;
bottom: 0;
left: 0;
right: 0;
overflow: hidden;
background-color: #FFF;
margin-left: -39px;
z-index: 2;
}
.dropdown {
.dropdown-common();
}
#content-resizer {
width: 110%;
position: absolute;
height: 4px;
bottom: 150px;
left: 0;
right: 0;
background-color: red;
cursor: n-resize;
margin-left: -39px;
#topIcon {
cursor: pointer;
margin-top: -19px;
width: 38px;
margin-left: 46%;
z-index: 999;
bottom: -200px;
text-align: center;
display: block !important;
}
}
}
input {
width: 50px;
outline: none;
border-radius: 3px;
border: 1px solid #3c3a36;
padding: 2px;
text-align: center;
}
#tab_Assets {
display: block;
height: calc(~'100% - 80px');
position: relative;
.total-Wrapper {
width: 72%;
margin-left: 0px;
font-size: 13px;
font-family: 'Microsoft YaHei';
padding-top: 5px;
position: absolute;
z-index: 9;
.total_span {
color: #B4122A !important;
background-color: #ddd !important;
font-size: 12px !important;
font-weight: bold !important;
border-radius: 10px !important;
padding-left: 8px !important;
padding-right: 8px !important;
}
}
> button:last-child {
float: right;
margin-right: 20px;
}
.dt-asset-result {
margin: 0px 0;
max-width: 99%;
height: calc(~'100% - 20px');
position: relative;
margin-top: 10px;
.herder-center {
text-align: center !important;
vertical-align: middle !important;
/*font-size:13px !important;*/
}
}
}
.btn-wrapper {
border-radius: 5px;
background-color: #e0301e;
color: #FFF;
display: inline-block;
float: right;
margin-right: 10px;
.error-list-modal {
.modal-title {
color: #FF0000;
.btn-vat-primary {
min-width: 80px;
}
}
.modal-body {
max-height: 300px;
overflow-y: auto;
.import-info-wrapper {
display: inline-block;
}
}
table {
border: 1px solid #CCC;
.dt-init-wrapper {
margin: 10px 0;
max-width: 99%;
height: calc(100% - 200px);
position: relative;
z-index: 1;
thead tr th {
height: 30px;
border: 1px solid #CCC;
}
.dropdown {
.dropdown-common();
tbody tr td {
height: 25px;
border: 1px solid #CCC;
}
}
i {
color: #F85550;
}
.modal-footer {
text-align: center;
}
.total-Wrapper {
width: 99%;
margin-left: 0px;
font-size: 13px;
font-family: 'Microsoft YaHei';
padding-bottom: 5px;
.total_span {
color: #B4122A !important;
background-color: #ddd !important;
font-size: 12px !important;
font-weight: bold !important;
border-radius: 10px !important;
padding-left: 8px !important;
padding-right: 8px !important;
}
}
/*.balance-ouput-grid-wrapper {
height: calc(~'100% - -10px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 150px;
left: 0;
right: 0;
background-color: #FFF;
}*/
}
.page-form-group {
float: right;
margin-top: 10px;
.dt-import-wrapper {
margin: 10px 0;
max-width: 99%;
overflow: auto;
height: calc(~"100% - 70px");
.page-size {
margin: 0;
.dropdown {
.dropdown-common();
i {
color: #F85550;
}
.pagination {
margin: 0;
button {
color: #333;
}
}
}
#gridInitData {
border-radius: 3px;
border: 1px solid #d4d4d4;
}
}
.error-info-wrapper {
position: absolute;
height: 150px;
bottom: 0;
left: 0;
right: 0;
overflow: hidden;
background-color: #FFF;
margin-left: -39px;
z-index: 2;
}
.set-asset-list-modal .modal-dialog {
height: 500px;
width: 800px;
#content-resizer {
width: 110%;
position: absolute;
height: 4px;
bottom: 150px;
left: 0;
right: 0;
background-color: red;
cursor: n-resize;
margin-left: -39px;
#topIcon {
cursor: pointer;
margin-top: -19px;
width: 38px;
margin-left: 46%;
z-index: 999;
bottom: -200px;
text-align: center;
display: block !important;
}
}
}
#tab_Assets {
display: block;
height: calc(~'100% - 80px');
position: relative;
.total-Wrapper {
width: 72%;
margin-left: 0px;
font-size: 13px;
font-family: 'Microsoft YaHei';
padding-top: 5px;
position: absolute;
z-index: 9;
.total_span {
color: #B4122A !important;
background-color: #ddd !important;
font-size: 12px !important;
font-weight: bold !important;
border-radius: 10px !important;
padding-left: 8px !important;
padding-right: 8px !important;
}
}
.modal-content {
height: 100%;
width: 100%;
.dt-asset-result {
margin: 0px 0;
max-width: 99%;
height: calc(~'100% - 20px');
position: relative;
margin-top: 10px;
.herder-center {
text-align: center !important;
vertical-align: middle !important;
/*font-size:13px !important;*/
}
}
}
.error-list-modal {
.modal-title {
color: #333;
font-size: 16px;
font-weight: bold;
color: #FF0000;
}
.modal-body {
height: 76%;
max-width: 760px !important;
margin-left: 22px;
overflow-y: auto;
max-height: 300px;
overflow-y: auto;
table {
border: 1px solid #CCC;
.herder-center {
text-align: center !important;
thead tr th {
height: 30px;
border: 1px solid #CCC;
}
.column-color {
color: red !important;
tbody tr td {
height: 25px;
border: 1px solid #CCC;
}
}
}
.modal-footer {
text-align:left;
text-align: center;
}
}
.page-form-group {
float: right;
margin-top: 10px;
.page-size {
margin: 0;
}
.pagination {
margin: 0;
}
}
#gridInitData {
border-radius: 3px;
border: 1px solid #d4d4d4;
}
}
.set-asset-list-modal .modal-dialog {
height: 500px;
width: 800px;
.modal-content {
height: 100%;
width: 100%;
}
.modal-title {
color: #333;
font-size: 16px;
font-weight: bold;
}
.modal-body {
height: 76%;
max-width: 760px !important;
margin-left: 22px;
overflow-y: auto;
.herder-center {
text-align: center !important;
}
.column-color {
color: red !important;
}
}
.modal-footer {
text-align: left;
}
}
.option {
margin-top: 10px;
margin-bottom: 10px;
margin-top: 10px;
margin-bottom: 10px;
}
.option > span {
margin-right: 10px;
margin-right: 10px;
}
.option > .dx-selectbox {
display: inline-block;
vertical-align: middle;
display: inline-block;
vertical-align: middle;
}
.filter-button {
width: 30px;
//margin-top: 16px;
width: 30px;
//margin-top: 16px;
}
.popover {
min-width: 370px;
.arrow {
left: 0px !important;
}
}
.popover-content {
.popover-import-asset {
position: absolute;
top: 0;
left: 0;
z-index: 1060;
display: none;
max-width: 276px;
padding: 1px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-style: normal;
font-weight: normal;
letter-spacing: normal;
line-break: auto;
line-height: 1.42857143;
text-align: left;
text-align: start;
text-decoration: none;
text-shadow: none;
text-transform: none;
white-space: normal;
word-break: normal;
word-spacing: normal;
word-wrap: normal;
font-size: 14px;
background-color: #ffffff;
-webkit-background-clip: padding-box;
background-clip: padding-box;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.2);
border-radius: 6px;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
min-width: 370px;
left: 60%;
.arrow {
left: 60% !important;
}
.popover-content {
td {
text-align: right;
padding: 6px;
vertical-align: middle;
text-align: right;
padding: 6px;
vertical-align: middle;
span {
text-align: right;
float: right;
}
span {
text-align: right;
float: right;
}
}
.form-control {
display: inline-block;
&:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
}
display: inline-block;
&:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
}
}
.input-width-small {
width: 100px;
width: 100px;
}
.input-width-middle {
width: 217px;
width: 217px;
}
}
}
.popover-import-asset.top {
margin-top: -10px;
}
.popover-import-asset.right {
margin-left: 10px;
}
.popover-import-asset.bottom {
margin-top: 10px;
}
.popover-import-asset.left {
margin-left: -10px;
}
.popover-title {
margin: 0;
padding: 8px 14px;
font-size: 14px;
background-color: #f7f7f7;
border-bottom: 1px solid #ebebeb;
border-radius: 5px 5px 0 0;
}
.popover-content {
padding: 9px 14px;
}
.popover-import-asset > .arrow,
.popover-import-asset > .arrow:after {
position: absolute;
display: block;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
}
.popover-import-asset > .arrow {
border-width: 11px;
}
.popover-import-asset > .arrow:after {
border-width: 10px;
content: "";
}
.popover-import-asset.top > .arrow {
left: 50%;
margin-left: -11px;
border-bottom-width: 0;
border-top-color: #999999;
border-top-color: rgba(0, 0, 0, 0.25);
bottom: -11px;
}
.popover-import-asset.top > .arrow:after {
content: " ";
bottom: 1px;
margin-left: -10px;
border-bottom-width: 0;
border-top-color: #ffffff;
}
.popover-import-asset.right > .arrow {
top: 50%;
left: -11px;
margin-top: -11px;
border-left-width: 0;
border-right-color: #999999;
border-right-color: rgba(0, 0, 0, 0.25);
}
.popover-import-asset.right > .arrow:after {
content: " ";
left: 1px;
bottom: -10px;
border-left-width: 0;
border-right-color: #ffffff;
}
.popover-import-asset.bottom > .arrow {
left: 50%;
margin-left: -11px;
border-top-width: 0;
border-bottom-color: #999999;
border-bottom-color: rgba(0, 0, 0, 0.25);
top: -11px;
}
.popover-import-asset.bottom > .arrow:after {
content: " ";
top: 1px;
margin-left: -10px;
border-top-width: 0;
border-bottom-color: #ffffff;
}
.popover-import-asset.left > .arrow {
top: 50%;
right: -11px;
margin-top: -11px;
border-right-width: 0;
border-left-color: #999999;
border-left-color: rgba(0, 0, 0, 0.25);
}
.popover-import-asset.left > .arrow:after {
content: " ";
right: 1px;
border-right-width: 0;
border-left-color: #ffffff;
bottom: -10px;
}
atms-web/src/main/webapp/app/cit/preview/cit-preview-balanceSheet/cit-preview-balanceSheet.less
View file @ ca4c21c3
......@@ -52,7 +52,6 @@
.popover {
min-width: 370px;
left: 119px !important;
.arrow {
left: 5% !important;
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.ctrl.js
View file @ ca4c21c3
......@@ -5,8 +5,8 @@
$scope.startDate = new Date(vatSessionService.project.year, 0, 1);
$scope.endDate = new Date(vatSessionService.project.year, 11, 31);
$scope.dateFormat = $translate.instant('dateFormat4YearMonthDay');
$scope.startMonth = vatSessionService.month;
$scope.endMonth = vatSessionService.month;
$scope.startMonth = 1;
$scope.endMonth = 12;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
......@@ -14,8 +14,8 @@
// var minDate = moment().startOf('month').subtract(0, 'months');
var maxDate = [12, vatSessionService.project.year];
var setDate = [
[vatSessionService.month, vatSessionService.project.year],
[vatSessionService.month, vatSessionService.project.year]];
[1, vatSessionService.project.year],
[12, vatSessionService.project.year]];
$scope.monthList = [$translate.instant('Month01'),
$translate.instant('Month02'),
......@@ -258,6 +258,18 @@
});
};
var handleJournal = function () {
citPreviewService.initExportJMData($scope.queryParams).success(function (data, status, headers) {
if(status===204){
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '日记账信息.xlsx');
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
};
(function initialize() {
$log.debug('VatPreviewInputInvoiceController.ctor()...');
......@@ -298,7 +310,7 @@
columnDefs: [
{ name: $translate.instant('ApprovalStatus'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.approvalStatus}}<span></div>' },
{ name: $translate.instant('Posting'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.postedStatus}}<span></div>' },
{ name: $translate.instant('AccountingPeriod'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountingPeriod}}</span></div>' },
{ name: $translate.instant('AccountingPeriod'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountPeriod}}</span></div>' },
{ name: $translate.instant('DocumentDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountingDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('JournalSource'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.journalSource}}</span></div>' },
{ name: $translate.instant('JournalCategory'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.category}}</span></div>' },
......@@ -307,41 +319,40 @@
{ name: $translate.instant('Summary'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.description}}">{{row.entity.description}}</span></div>' },
{ name: $translate.instant('MainBodyCode'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.orgCode}}</span></div>' },
{ name: $translate.instant('MainBodyDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.orgName}}</span></div>' },
// { name: $translate.instant('CostCenterDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment2Name}}</span></div>' },
{ name: $translate.instant('AccountCode'),width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.subjectCode}}</span></div>' },
{ name: $translate.instant('SubjectDescription'),width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.subjectName}}">{{row.entity.subjectName}}</span></div>' },
// { name: $translate.instant('AuxiliaryAccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment4Name}}</span></div>' },
// { name: $translate.instant('ProfitCenterDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment5Name}}</span></div>' },
// { name: $translate.instant('ProductManual'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment6Name}}</span></div>' },
// { name: $translate.instant('ProjectInstruction'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment7Name}}</span></div>' },
// { name: $translate.instant('InterCompanyDescription'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment8Name}}</span></div>' },
// { name: $translate.instant('Alternate1Description'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment9Name}}</span></div>' },
// { name: $translate.instant('Alternate2Description'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment10Name}}</span></div>' },
// { name: $translate.instant('Currency'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.journalCurrencyCode}}</span></div>' },
// { name: $translate.instant('LocalCurrency'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.sobCurrencyCode}}</span></div>' },
{ name: $translate.instant('CostCenterDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment2Name}}</span></div>' },
{ name: $translate.instant('AuxiliaryAccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment4Name}}</span></div>' },
{ name: $translate.instant('ProfitCenterDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment5Name}}</span></div>' },
{ name: $translate.instant('ProductManual'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment6Name}}</span></div>' },
{ name: $translate.instant('ProjectInstruction'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment7Name}}</span></div>' },
{ name: $translate.instant('InterCompanyDescription'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment8Name}}</span></div>' },
{ name: $translate.instant('Alternate1Description'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment9Name}}</span></div>' },
{ name: $translate.instant('Alternate2Description'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment10Name}}</span></div>' },
{ name: $translate.instant('Currency'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.journalCurrencyCode}}</span></div>' },
{ name: $translate.instant('LocalCurrency'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.sobCurrencyCode}}</span></div>' },
{ name: $translate.instant('JournalDebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountedDr}}</span></div>' },
{ name: $translate.instant('JournalCreditAmount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountedCr}}</span></div>' },
// { name: $translate.instant('Amount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span></span></div>' },
// { name: $translate.instant('LocalCurrencyDebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.enteredDr}}</span></div>' },
// { name: $translate.instant('LocalCurrencyCreditAmount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.enteredCr}}</span></div>' },
// { name: $translate.instant('CashFlowEntry'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.cfItem}}</span></div>' },
// { name: $translate.instant('City'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute1}}</span></div>' },
// { name: $translate.instant('TransactionDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute2| date:"yyyy-MM-dd"}}</span></div>' },
// { name: $translate.instant('BankAccountNumber'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute3}}</span></div>' },
// { name: $translate.instant('BankSerialNumber'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute4}}</span></div>' },
// { name: $translate.instant('SupplierCode'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute5}}</span></div>' },
// { name: $translate.instant('TransactionOrderNumber'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute6}}</span></div>' },
// { name: $translate.instant('SupplierName'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute7}}</span></div>' },
// { name: $translate.instant('ReceiveCode'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute8}}</span></div>' },
// { name: $translate.instant('PreparedBy'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute9}}</span></div>' },
// { name: $translate.instant('Reviewer'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute10}}</span></div>' },
// { name: $translate.instant('CostCenterDepartmentDescription1'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute11}}</span></div>' },
// { name: $translate.instant('CostCenterDepartmentDescription2'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute12}}</span></div>' },
// { name: $translate.instant('CostCenterDepartmentDescription3'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute13}}</span></div>' },
// { name: $translate.instant('CostCenterDepartmentDescription4'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute14}}</span></div>' },
// { name: $translate.instant('CostCenterDepartmentDescription5'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute15}}</span></div>' },
// { name: $translate.instant('CostCenterDepartmentDescription6'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute16}}</span></div>' },
// { name: $translate.instant('GroupCertificateNumber'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span></span></div>' }
{ name: $translate.instant('LocalCurrencyDebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.enteredDr}}</span></div>' },
{ name: $translate.instant('LocalCurrencyCreditAmount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.enteredCr}}</span></div>' },
{ name: $translate.instant('CashFlowEntry'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.cfItem}}</span></div>' },
{ name: $translate.instant('City'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute1}}</span></div>' },
{ name: $translate.instant('TransactionDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute2| date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('BankAccountNumber'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute3}}</span></div>' },
{ name: $translate.instant('BankSerialNumber'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute4}}</span></div>' },
{ name: $translate.instant('SupplierCode'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute5}}</span></div>' },
{ name: $translate.instant('TransactionOrderNumber'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute6}}</span></div>' },
{ name: $translate.instant('SupplierName'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute7}}</span></div>' },
{ name: $translate.instant('ReceiveCode'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute8}}</span></div>' },
{ name: $translate.instant('PreparedBy'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute9}}</span></div>' },
{ name: $translate.instant('Reviewer'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute10}}</span></div>' },
{ name: $translate.instant('CostCenterDepartmentDescription1'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute11}}</span></div>' },
{ name: $translate.instant('CostCenterDepartmentDescription2'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute12}}</span></div>' },
{ name: $translate.instant('CostCenterDepartmentDescription3'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute13}}</span></div>' },
{ name: $translate.instant('CostCenterDepartmentDescription4'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute14}}</span></div>' },
{ name: $translate.instant('CostCenterDepartmentDescription5'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute15}}</span></div>' },
{ name: $translate.instant('CostCenterDepartmentDescription6'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute16}}</span></div>' },
{ name: $translate.instant('importWay'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.source}}</span></div>' }
]
};
......@@ -351,17 +362,18 @@
$scope.prepareSummary = prepareSummary;
$scope.showPopover = showPopover;
$scope.downloadJE = downloadJE;
$scope.handleJournal = handleJournal;
initPeriods();
initJournalEntryPagination();
//初始化查询条件-期间范围
$scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.periodEnd = vatSessionService.year * 100 + 12;
$scope.queryParams.organizationId = vatSessionService.project.organizationID;
if($rootScope.currentLanguage === 'en-us'){
$('.periodInput')[0].style.left = "280px";
}else{
$('.periodInput')[0].style.left = "150px";
$('.periodInput')[0].style.left = "250px";
}
loadJournalEntryDataFromDB(1);
})();
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.html
View file @ ca4c21c3
......@@ -8,8 +8,10 @@
data-templateurl="/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge-search.html">
<i class="fa fa-filter" aria-hidden="true"></i>
</button>
<span translate="JournalTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
<span translate="JournalTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
<span class="text-bold" translate="AccountPeriod"></span>：
<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
<button translate="GenerateJournalMergeAndTB" ng-click="handleJournal()"></button>
<span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
</div>
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.less
View file @ ca4c21c3
......@@ -127,7 +127,6 @@
.popover {
min-width: 370px;
left: 119px !important;
.arrow {
left: 5% !important;
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.less
View file @ ca4c21c3
......@@ -127,7 +127,6 @@
.popover {
min-width: 370px;
left: 119px !important;
.arrow {
left: 5% !important;
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.less
View file @ ca4c21c3
......@@ -127,7 +127,6 @@
.popover {
min-width: 370px;
left: 119px !important;
.arrow {
left: 5% !important;
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.less
View file @ ca4c21c3
......@@ -127,7 +127,6 @@
.popover {
min-width: 370px;
left: 119px !important;
.arrow {
left: 5% !important;
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.less
View file @ ca4c21c3
......@@ -125,7 +125,6 @@
.popover {
min-width: 370px;
left: 119px !important;
.arrow {
left: 5% !important;
......
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.ctrl.js
View file @ ca4c21c3
......@@ -136,9 +136,8 @@
showBorders: true,
columns: [{
dataField: "id",
visible: false,
allowHeaderFiltering: false,
caption: $translate.instant('id')
caption: $translate.instant('ExtractTaskId')
}, {
dataField: "taxpayerIdNum",
width: '15%',
......@@ -195,7 +194,10 @@
dataField: "operateTime",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('LogOperationTime')
caption: $translate.instant('LogOperationTime'),
calculateCellValue: function(data) {
return new Date(data).formatDateTime('yyyy-MM-dd hh:mm:ss');
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/orangeheap/css/app.cf16809e.css 0 → 100644
View file @ ca4c21c3
.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file
atms-web/src/main/webapp/orangeheap/css/chunk-vendors.1d7fe95e.css 0 → 100644
View file @ ca4c21c3
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-web/src/main/webapp/orangeheap/index.html 0 → 100644
View file @ ca4c21c3
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=/js/about.173a42f4.js rel=prefetch><link href=/css/app.cf16809e.css rel=preload as=style><link href=/css/chunk-vendors.1d7fe95e.css rel=preload as=style><link href=/js/app.8d697197.js rel=preload as=script><link href=/js/chunk-vendors.cc3f6466.js rel=preload as=script><link href=/css/chunk-vendors.1d7fe95e.css rel=stylesheet><link href=/css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.cc3f6466.js></script><script src=/js/app.8d697197.js></script></body></html>
\ No newline at end of file
atms-web/src/main/webapp/orangeheap/js/about.173a42f4.js 0 → 100644
View file @ ca4c21c3
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["about"],{f820:function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement;t._self._c;return t._m(0)},s=[function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"about"},[n("h1",[t._v("This is an about page")])])}],u=n("2877"),c={},i=Object(u["a"])(c,a,s,!1,null,null,null);e["default"]=i.exports}}]);
//# sourceMappingURL=about.173a42f4.js.map
\ No newline at end of file
atms-web/src/main/webapp/orangeheap/js/about.173a42f4.js.map 0 → 100644
View file @ ca4c21c3
{"version":3,"sources":["webpack:///./src/views/About.vue?cd20","webpack:///./src/views/About.vue"],"names":["render","_vm","this","_h","$createElement","_self","_c","_m","staticRenderFns","staticClass","_v","script","component","Object","componentNormalizer","__webpack_exports__"],"mappings":"8GAAA,IAAAA,EAAA,WAA0B,IAAAC,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BH,EAAAI,MAAAC,GAAwB,OAAAL,EAAAM,GAAA,IACzFC,EAAA,YAAoC,IAAAP,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BE,EAAAL,EAAAI,MAAAC,IAAAH,EAAwB,OAAAG,EAAA,OAAiBG,YAAA,SAAoB,CAAAH,EAAA,MAAAL,EAAAS,GAAA,2CCAxIC,EAAA,GAKAC,EAAgBC,OAAAC,EAAA,KAAAD,CAChBF,EACEX,EACAQ,GACF,EACA,KACA,KACA,MAIeO,EAAA,WAAAH","file":"js/about.173a42f4.js","sourcesContent":["var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _vm._m(0)}\nvar staticRenderFns = [function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:\"about\"},[_c('h1',[_vm._v(\"This is an about page\")])])}]\n\nexport { render, staticRenderFns }","import { render, staticRenderFns } from \"./About.vue?vue&type=template&id=1ae8a7be&\"\nvar script = {}\n\n\n/* normalize component */\nimport normalizer from \"!../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\nexport default component.exports"],"sourceRoot":""}
\ No newline at end of file
atms-web/src/main/webapp/orangeheap/js/app.8d697197.js 0 → 100644
View file @ ca4c21c3
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-web/src/main/webapp/orangeheap/js/app.8d697197.js.map 0 → 100644
View file @ ca4c21c3
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-web/src/main/webapp/orangeheap/js/chunk-vendors.cc3f6466.js 0 → 100644
View file @ ca4c21c3
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-web/src/main/webapp/orangeheap/js/chunk-vendors.cc3f6466.js.map 0 → 100644
View file @ ca4c21c3
This source diff could not be displayed because it is too large. You can view the blob instead.
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