update 统计报表中 '合同金额'改名为'年度待确收金额'
This commit is contained in:
+1
-1
@@ -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;
|
||||
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
+1
-1
@@ -619,7 +619,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
|
||||
AllProjectMoneyExcel comeAllProjectMoney=new AllProjectMoneyExcel("到账金额",allMoney.getComeAllMoney());
|
||||
AllProjectMoneyExcel billAllProjectMoney=new AllProjectMoneyExcel("开票金额",allMoney.getBillMoney());
|
||||
AllProjectMoneyExcel confirmAllProjectMoney=new AllProjectMoneyExcel("确认收入金额",allMoney.getConfirmAmount());
|
||||
AllProjectMoneyExcel allProjectMoney=new AllProjectMoneyExcel("合同金额",allMoney.getAllMoney());
|
||||
AllProjectMoneyExcel allProjectMoney=new AllProjectMoneyExcel("年度待确收金额",allMoney.getAllMoney());
|
||||
List<AllProjectMoneyExcel> excelList = new ArrayList<>();
|
||||
excelList.add(0,allProjectMoney);
|
||||
excelList.add(1,confirmAllProjectMoney);
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
|
||||
+2
-2
@@ -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)
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
|
||||
+1
-1
@@ -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 = "合同金额")
|
||||
|
||||
Reference in New Issue
Block a user