From 1147912e4b471ac1d011d31fb4aca82a6981f9c2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 21 Nov 2022 14:08:05 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=20'=E5=90=88=E5=90=8C=E9=87=91=E9=A2=9D'=E6=94=B9?= =?UTF-8?q?=E5=90=8D=E4=B8=BA'=E5=B9=B4=E5=BA=A6=E5=BE=85=E7=A1=AE?= =?UTF-8?q?=E6=94=B6=E9=87=91=E9=A2=9D'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/project/entity/PayWorkGroupSubletStatistics.java | 2 +- .../com/jero/project/entity/PayWorkingGroupStatistics.java | 2 +- .../jero/project/service/impl/PayWorkingGroupServiceImpl.java | 2 +- .../java/com/jero/statistics/entity/AllProjectStatistics.java | 2 +- .../com/jero/statistics/entity/CompanyComeMoneyDetail.java | 2 +- .../java/com/jero/statistics/entity/CompanyComeMoneyList.java | 4 ++-- .../java/com/jero/statistics/entity/DepartStatistics.java | 2 +- .../com/jero/statistics/entity/PrincipalPeopleDetail.java | 2 +- .../java/com/jero/statistics/entity/PrincipalPeopleList.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java index e608dba6..9cafbeb9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java @@ -26,7 +26,7 @@ public class PayWorkGroupSubletStatistics { @Excel(name = "打包", width = 15) private String packText; - @Excel(name = "合同金额", width = 15) + @Excel(name = "年度待确收金额", width = 15) @ApiModelProperty(value = "应收总金额") private String allMoney; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java index b0010de2..08d79658 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java @@ -19,7 +19,7 @@ public class PayWorkingGroupStatistics { @Excel(name = "工作组", width = 15) @ApiModelProperty(value = "工作组") private String workGroup; - @Excel(name = "合同总金额", width = 15) + @Excel(name = "年度待确收金额", width = 15) @ApiModelProperty(value = "合同总金额") private String allMoney; @Excel(name = "确认收入金额", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index fba30ce1..b009b5e8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -619,7 +619,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl excelList = new ArrayList<>(); excelList.add(0,allProjectMoney); excelList.add(1,confirmAllProjectMoney); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java index 230443d7..a5a90b5c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java @@ -26,7 +26,7 @@ public class AllProjectStatistics { @ApiModelProperty(value = "来款单位") private String chargeCompanyTemporaryName; - @Excel(name = "合同金额", width = 15) + @Excel(name = "年度待确收金额", width = 15) @ApiModelProperty(value = "合同金额") private String allMoney; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java index d8a08c4f..11633b1a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java @@ -18,7 +18,7 @@ public class CompanyComeMoneyDetail { @ApiModelProperty(value = "来款项目") private String projectName; - @Excel(name = "来款企业", width = 15) + @Excel(name = "年度待确收金额", width = 15) @ApiModelProperty(value = "来款企业") private String chargeCompanyName; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java index 2598e8b0..7e65acec 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java @@ -18,8 +18,8 @@ public class CompanyComeMoneyList { @ApiModelProperty(value = "来款企业") private String chargeCompanyName; - @Excel(name = "合同总金额", width = 15) - @ApiModelProperty(value = "合同总金额") + @Excel(name = "年度待确收金额", width = 15) + @ApiModelProperty(value = "年度待确收金额") private String allMoney; @Excel(name = "确认收入金额", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java index fbdcee57..4b9ed92c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java @@ -14,7 +14,7 @@ public class DepartStatistics { @ApiModelProperty(value = "部门名称") private String departName; - @Excel(name = "合同总金额", width = 15) + @Excel(name = "年度待确收金额", width = 15) @ApiModelProperty(value = "合同金额") private String allMoney; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java index 6c07c958..3f5ebb4b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java @@ -24,7 +24,7 @@ public class PrincipalPeopleDetail { @ApiModelProperty(value = "来款项目") private String projectName; - @Excel(name = "合同金额", width = 15) + @Excel(name = "年度待确收金额", width = 15) @ApiModelProperty(value = "合同金额") private String allMoney; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java index b6fdbb0c..8f508430 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java @@ -14,7 +14,7 @@ public class PrincipalPeopleList { @ApiModelProperty(value = "项目负责人id") private String principalId; - @Excel(name = "合同金额", width = 15) + @Excel(name = "年度待确收金额", width = 15) @DecimalMax(value = "9999999999.99",message = "合同金额（元）格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) @ApiModelProperty(value = "合同金额")