LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
梁琦涛
2021-10-09 16:26:56 +08:00
parent 39c0a8eada
commit 676cb9265b
7 changed files with 42 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class PayIncomeContractCommon {
/**
* 支出合同excel表头
*/
public final static List<String> LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订单位联系人","是否开口","负责人",
public final static List<String> LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订联系人","是否开口","负责人",
"部门名称","签订合同总金额","税率","未税金额","合同签订日期","合同终止日期","合同约定主要时点",
"应收金额","已收金额","未收金额","账款状态","合同约定付款次数","是否打包","打包年份");
/**
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+2 -2
View File
@@ -557,7 +557,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
filedsList.add(new ExcelExportEntity("合同编号", "contractNum"));
filedsList.add(new ExcelExportEntity("合同名称", "contractName"));
filedsList.add(new ExcelExportEntity("签订单位", "signedCompanyTemporaryName"));
filedsList.add(new ExcelExportEntity("签订单位联系人", "signedContactsTemporaryName"));
filedsList.add(new ExcelExportEntity("签订联系人", "signedContactsTemporaryName"));
filedsList.add(new ExcelExportEntity("是否开口", "opening"));
filedsList.add(new ExcelExportEntity("负责人", "principalName"));
filedsList.add(new ExcelExportEntity("部门名称", "departmentName"));
@@ -570,8 +570,8 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
filedsList.add(new ExcelExportEntity("应收金额", "accountsReceivableAmount"));
filedsList.add(new ExcelExportEntity("已收金额", "amountReceived"));
filedsList.add(new ExcelExportEntity("未收金额", "outstandingAmount"));
filedsList.add(new ExcelExportEntity("合同约定付款次数", "contractPaymentTimes"));
filedsList.add(new ExcelExportEntity("账款状态", "accountStatus"));
filedsList.add(new ExcelExportEntity("合同约定付款次数", "contractPaymentTimes"));
filedsList.add(new ExcelExportEntity("是否打包", "pack"));
filedsList.add(new ExcelExportEntity("打包年份", "packYear"));
int count = mapCount.get("count");
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
+1 -1
View File
@@ -306,7 +306,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
filedsList.add(new ExcelExportEntity("合同编号", "contractNum"));
filedsList.add(new ExcelExportEntity("合同名称", "contractName"));
filedsList.add(new ExcelExportEntity("签订单位", "signedCompanyTemporaryName"));
filedsList.add(new ExcelExportEntity("签订单位联系人", "signedContactsTemporaryName"));
filedsList.add(new ExcelExportEntity("签订联系人", "signedContactsTemporaryName"));
filedsList.add(new ExcelExportEntity("是否开口", "opening"));
filedsList.add(new ExcelExportEntity("负责人", "principalName"));
filedsList.add(new ExcelExportEntity("部门名称", "departmentName"));
jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractExcelModel.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class PaySpendingContractExcelModel implements Serializable {
@Excel(name = "签订单位", width = 15)
private String signedCompanyTemporaryName;
/**临时签订单位联系人名称*/
@Excel(name = "签订单位联系人", width = 15)
@Excel(name = "签订联系人", width = 15)
private String signedContactsTemporaryName;
/**是否开口（1：是，0：否）*/
@Excel(name = "是否开口", width = 15)