diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml index fdd385a3..80d41bc7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml @@ -173,6 +173,9 @@ AND c.pack = #{pack} + + AND c.charge_use = #{chargeUse} + UNION ALL @@ -197,6 +200,9 @@ AND gsub.pack = #{pack} + + AND gsub.charge_use = #{chargeUse} + UNION ALL @@ -221,6 +227,9 @@ AND sit.pack = #{pack} + + AND sit.charge_use = #{chargeUse} + UNION ALL @@ -244,6 +253,9 @@ AND msub.pack = #{pack} + + AND msub.charge_use = #{chargeUse} + UNION ALL @@ -267,6 +279,9 @@ AND tmsub.pack = #{pack} + + AND tmsub.charge_use = #{chargeUse} + @@ -291,6 +306,9 @@ AND tcp.pack = #{pack} + + AND tcp.charge_use = #{chargeUse} + ) project diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/vo/PayPackCompanyProjectInput.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/vo/PayPackCompanyProjectInput.java index c1f41313..000ded8b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/vo/PayPackCompanyProjectInput.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/vo/PayPackCompanyProjectInput.java @@ -52,4 +52,10 @@ public class PayPackCompanyProjectInput implements Serializable { */ @ApiModelProperty(value = "来款年份") private String paymentDate; + + /** + * 来款用途 20220708 + */ + @ApiModelProperty(value = "来款用途") + private String chargeUse; } 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 93686063..e608dba6 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,21 +26,21 @@ public class PayWorkGroupSubletStatistics { @Excel(name = "打包", width = 15) private String packText; - @Excel(name = "应收总金额", width = 15) + @Excel(name = "合同金额", width = 15) @ApiModelProperty(value = "应收总金额") private String allMoney; - @Excel(name = "实收总金额", width = 15) - @ApiModelProperty(value = "实收总金额") - private String comeAllMoney; + @Excel(name = "确认收入金额", width = 15) + @ApiModelProperty(value = "确认收入金额") + private String confirmAmount; @Excel(name = "开票金额", width = 15) @ApiModelProperty(value = "开票金额") private String billMoney; - @Excel(name = "确认到账金额", width = 15) - @ApiModelProperty(value = "确认到账金额") - private String confirmAmount; + @Excel(name = "到账金额", width = 15) + @ApiModelProperty(value = "到账金额") + private String comeAllMoney; @Excel(name = "来款用途", width = 15, dicCode="payment_charge_use") @Dict(dicCode = "payment_charge_use") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java index da793cff..f2d898e0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java @@ -22,6 +22,12 @@ public class PayWorkingGroupSearch { @ApiModelProperty(value = "应收总金额") private String allMoney; + /** + * 2022.7.7 billYear->paymentYear + */ + @ApiModelProperty(value = "确认年份") + private String paymentYear; + @ApiModelProperty(value = "应收总金额范围") private String allMoneyTwo; 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 07da5fc2..b0010de2 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,20 +19,20 @@ public class PayWorkingGroupStatistics { @Excel(name = "工作组", width = 15) @ApiModelProperty(value = "工作组") private String workGroup; - @Excel(name = "应收总金额", width = 15) - @ApiModelProperty(value = "应收总金额") + @Excel(name = "合同总金额", width = 15) + @ApiModelProperty(value = "合同总金额") private String allMoney; - @Excel(name = "实收总金额", width = 15) - @ApiModelProperty(value = "实收总金额") + @Excel(name = "确认收入金额", width = 15) + @ApiModelProperty(value = "确认收入金额") + private String confirmAmount; + @Excel(name = "开票金额", width = 15) + @ApiModelProperty(value = "开票金额") + private String billMoney; + @Excel(name = "到账总金额", width = 15) + @ApiModelProperty(value = "到账总金额") private String comeAllMoney; @Excel(name = "实收完成率", width = 15) @ApiModelProperty(value = "实收完成率") private String moneyRate; - @Excel(name = "开票金额", width = 15) - @ApiModelProperty(value = "开票金额") - private String billMoney; - @Excel(name = "确认到账金额", width = 15) - @ApiModelProperty(value = "确认到账金额") - private String confirmAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java index 258187d4..69711955 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java @@ -32,8 +32,11 @@ public class PayWorkingGroupSubletSearch { @ApiModelProperty(value = "来款年份") private String year; - @ApiModelProperty(value = "开票年份") - private String billYear; + /** + * 2022.7.7 billYear->paymentYear + */ + @ApiModelProperty(value = "确认年份") + private String paymentYear; @ApiModelProperty(value = "来款用途") private String chargeUse; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 61387271..98f4c87d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -3,27 +3,27 @@ - + - + - + - + - - - + - - - - select projectId as id, projectName, principalNameId as principalId, @@ -1362,6 +1348,7 @@ from v_statistical v left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id left join pay_mail_bill pmb on pmbp.bill_id = pmb.id + left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id) principalNameId = #{principalPeopleDetailSearch.principalNameId} @@ -1393,15 +1380,72 @@ - - and DATE_FORMAT (pmb.bill_date,'%Y') like concat(#{principalPeopleDetailSearch.billYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{principalPeopleDetailSearch.paymentYear}, '%') + + + + + - - - + - + - + select sum(allMoney) as allMoney, - sum(comeAllMoney) as comeAllMoney, - if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney, - sum(confirmAmount) as confirmAmount + sum(comeAllMoney) as comeAllMoney, + if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney, + sum(confirmAmount) as confirmAmount from v_statistical v - left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id - left join pay_mail_bill pmb on pmbp.bill_id = pmb.id + left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id + left join pay_mail_bill pmb on pmbp.bill_id = pmb.id #{item} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index 47c99e45..17d4a569 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -82,6 +82,7 @@ FROM v_statistical v left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id left join pay_mail_bill pmb on pmbp.bill_id = pmb.id + left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id) superId = #{id} @@ -118,8 +119,8 @@ - - and DATE_FORMAT (pmb.bill_date,'%Y') like concat(#{payWorkingGroupSubletSearch.billYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSubletSearch.paymentYear}, '%') group by id @@ -144,6 +145,7 @@ FROM v_statistical v left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id left join pay_mail_bill pmb on pmbp.bill_id = pmb.id + left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id) superId = #{id} @@ -180,8 +182,8 @@ - - and DATE_FORMAT (pmb.bill_date,'%Y') like concat(#{payWorkingGroupSubletSearch.billYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSubletSearch.paymentYear}, '%') group by id) p diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java index 31fa6a90..b2eb3d9b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java @@ -178,8 +178,6 @@ public class AllProjectStatisticsController { @ApiOperation(value = "全所统计导出-导出统计", notes = "全所统计导出-导出统计") public ModelAndView excel(AllProjectStatisticsSearch allProjectStatisticsSearch, @RequestParam(name = "selections", required = false) String selections) { - - if (StringUtils.isBlank(selections)) { allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName())); allProjectStatisticsSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName())); if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { @@ -205,34 +203,7 @@ public class AllProjectStatisticsController { } } return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "所领导统计"); - } else { - ArrayList strings = new ArrayList<>(Arrays.asList(selections.split(","))); - allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName())); - allProjectStatisticsSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName())); - if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { - Calendar calendar = Calendar.getInstance(); - String year = String.valueOf(calendar.get(Calendar.YEAR)); - allProjectStatisticsSearch.setYear(year); - } - - List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, null, strings); - if (pageList != null) { - for (AllProjectStatistics s : pageList) { - String key = String.valueOf(s.getChargeUse()); - String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key); - s.setChargeUse_text(payment_charge_use); - //处理为空数据为0 - if (s.getAllMoney() == null || s.getAllMoney().equals("")) { - s.setAllMoney("0.00"); - } - if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) { - s.setComeAllMoney("0.00"); - } - } - } - return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "所领导统计"); - } } /** @@ -265,7 +236,7 @@ public class AllProjectStatisticsController { idList.addAll(allDepartIds); } else { ArrayList objects = new ArrayList<>(); - return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "项目来款统计"); + return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "科室统计"); } List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList); @@ -283,7 +254,7 @@ public class AllProjectStatisticsController { } } } - return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "项目来款统计"); + return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "科室统计"); } @ApiOperation(value = "通过部门id查所有人员", notes = "通过部门id查所有人员") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 0cdb1318..819035ee 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -126,6 +126,9 @@ public class CompanyComeMoneyStatisticsController { if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) { s.setComeAllMoney("0.00"); } + if (s.getBillMoney() == null || s.getBillMoney().equals("")) { + s.setBillMoney("0.00"); + } } AllMoney allMoney = payWorkingGroupService.queryPageListForCompanyDetail33(companyComeMoneyDetailSearch, null); hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); @@ -185,6 +188,9 @@ public class CompanyComeMoneyStatisticsController { if (ss.getComeAllMoney() == null || ss.getComeAllMoney().equals("")) { ss.setComeAllMoney("0.00"); } + if (s.getBillMoney() == null || s.getBillMoney().equals("")) { + s.setBillMoney("0.00"); + } } } return AmountUtil.exportListXls(pageList, CompanyComeMoneyDetail.class, "企业来款详情统计"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java index da97de1b..90bc1dc5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java @@ -86,7 +86,6 @@ public class PayWorkingGroupStatisticsController { } } HashMap hashMap = new HashMap<>(); - hashMap.put("pageList", pageList.setRecords(records)); hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney()); @@ -103,7 +102,6 @@ public class PayWorkingGroupStatisticsController { @GetMapping(value = "/exportXls2") @ApiOperation(value = "工作组项目统计-统计导出excel", notes = "工作组项目统计-统计导出excel") public ModelAndView exportXls2(PayWorkingGroupSearch payWorkingGroupSearch, @RequestParam(name = "selections", required = false) String selections) { - if (StringUtils.isBlank(selections)) { payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup())); List pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, null); @@ -120,25 +118,6 @@ public class PayWorkingGroupStatisticsController { } } return AmountUtil.exportListXls(pageList, PayWorkingGroupStatistics.class, "工作组项目统计"); - } else { - ArrayList strings = new ArrayList<>(Arrays.asList(selections.split(","))); - payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup())); - - List pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, null, strings); - //处理为空数据为0 - for (PayWorkingGroupStatistics s : pageList) { - if (s.getAllMoney() == null || s.getAllMoney().equals("")) { - s.setAllMoney("0.00"); - } - if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) { - s.setComeAllMoney("0.00"); - } - if (s.getMoneyRate() == null || s.getMoneyRate().equals("")) { - s.setMoneyRate("0.00%"); - } - } - return AmountUtil.exportListXls(pageList, PayWorkingGroupStatistics.class, "工作组项目统计"); - } } @@ -199,7 +178,7 @@ public class PayWorkingGroupStatisticsController { PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, @RequestParam(name = "id", required = true) String id, @RequestParam(name = "selections", required = false) String selections) { - if (ObjectUtils.isEmpty(selections)) { + payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName())); List pageList = payWorkingGroupSubItemService.importExcelStatistics(payWorkingGroupSubletSearch, id); //处理为空数据为0 @@ -212,22 +191,6 @@ public class PayWorkingGroupStatisticsController { } } return AmountUtil.exportListXls(pageList, PayWorkGroupSubletStatistics.class, "工作组成员统计"); - } else { - payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName())); - ArrayList selections2 = new ArrayList<>(Arrays.asList(selections.split(","))); - List pageList = payWorkingGroupSubItemService.importExcelStatistics2(payWorkingGroupSubletSearch, id, selections2); - //处理为空数据为0 - for (PayWorkGroupSubletStatistics s : pageList) { - if (s.getAllMoney() == null || s.getAllMoney().equals("")) { - s.setAllMoney("0.00"); - } - if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) { - s.setComeAllMoney("0.00"); - } - - } - return AmountUtil.exportListXls(pageList, PayWorkGroupSubletStatistics.class, "工作组成员统计"); } - } } 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 7d46fbb4..03149b6f 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 @@ -22,21 +22,21 @@ public class AllProjectStatistics { @ApiModelProperty(value = "来款单位") private String chargeCompanyTemporaryName; - @Excel(name = "应收总金额", width = 15) - @ApiModelProperty(value = "应收总金额") + @Excel(name = "合同金额", width = 15) + @ApiModelProperty(value = "合同金额") private String allMoney; - @Excel(name = "实收总金额", width = 15) - @ApiModelProperty(value = "实收总金额") - private String comeAllMoney; + @Excel(name = "确认收入金额", width = 15) + @ApiModelProperty(value = "确认收入金额") + private String confirmAmount; @Excel(name = "开票金额", width = 15) @ApiModelProperty(value = "开票金额") private String billMoney; - @Excel(name = "确认到账金额", width = 15) - @ApiModelProperty(value = "确认到账金额") - private String confirmAmount; + @Excel(name = "到账金额", width = 15) + @ApiModelProperty(value = "到账金额") + private String comeAllMoney; @ApiModelProperty(value = "来款用途编码") private String chargeUse; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java index 4049bd75..1bb0852c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java @@ -44,9 +44,11 @@ public class AllProjectStatisticsSearch { @ApiModelProperty(value = "部门编码") private String departCode; - - @ApiModelProperty(value = "开票年份") - private String billYear; + /** + * 2022.7.7 billYear->paymentYear + */ + @ApiModelProperty(value = "确认年份") + private String paymentYear; @ApiModelProperty(value = "字段") private String column; 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 004d08bb..d8a08c4f 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 @@ -13,26 +13,30 @@ import org.jeecgframework.poi.excel.annotation.Excel; public class CompanyComeMoneyDetail { @ApiModelProperty(value = "项目id") private String projectId; + @Excel(name = "来款项目", width = 15) @ApiModelProperty(value = "来款项目") private String projectName; + @Excel(name = "来款企业", width = 15) @ApiModelProperty(value = "来款企业") private String chargeCompanyName; - @Excel(name = "应收总金额", width = 15) - @ApiModelProperty(value = "应收金额") + + @Excel(name = "合同金额", width = 15) + @ApiModelProperty(value = "合同金额") private String allMoney; - @Excel(name = "实收总金额", width = 15) - @ApiModelProperty(value = "实收金额") - private String comeAllMoney; + + @Excel(name = "确认收入金额", width = 15) + @ApiModelProperty(value = "确认收入金额") + private String confirmAmount; @Excel(name = "开票金额", width = 15) @ApiModelProperty(value = "开票金额") private String billMoney; - @Excel(name = "确认到账金额", width = 15) - @ApiModelProperty(value = "确认到账金额") - private String confirmAmount; + @Excel(name = "到账金额", width = 15) + @ApiModelProperty(value = "到账金额") + private String comeAllMoney; @ApiModelProperty(value = "来款用途编码") private String chargeUse; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java index a763b432..436561aa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java @@ -38,8 +38,11 @@ public class CompanyComeMoneyDetailSearch { @ApiModelProperty(value = "应收总金额范围") private String allMoneyTwo; - @ApiModelProperty(value = "开票年份") - private String billYear; + /** + * 2022.7.7 billYear->paymentYear + */ + @ApiModelProperty(value = "确认年份") + private String paymentYear; @ApiModelProperty(value = "字段") private String column; 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 b4957ca5..0595d3ed 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,23 +18,23 @@ 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) - @ApiModelProperty(value = "实收总金额") - private String comeAllMoney; + @Excel(name = "确认收入金额", width = 15) + @ApiModelProperty(value = "确认收入金额") + private String confirmAmount; @Excel(name = "开票金额", width = 15) @ApiModelProperty(value = "开票金额") private String billMoney; - @Excel(name = "确认到账金额", width = 15) - @ApiModelProperty(value = "确认到账金额") - private String confirmAmount; + @Excel(name = "到账总金额", width = 15) + @ApiModelProperty(value = "到账总金额") + private String comeAllMoney; - @Excel(name = "到账率", width = 15) - @ApiModelProperty(value = "到账率") + @Excel(name = "确收率", width = 15) + @ApiModelProperty(value = "确收率") private String finishRate; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java index c5081123..6e9c5797 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java @@ -29,8 +29,11 @@ public class CompanyComeMoneySearch { @ApiModelProperty(value = "应收总金额范围") private String allMoneyTwo; - @ApiModelProperty(value = "开票年份") - private String billYear; + /** + * 2022.7.7 billYear->paymentYear + */ + @ApiModelProperty(value = "确认年份") + private String paymentYear; @ApiModelProperty(value = "字段") private String column; 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 871edb28..6c07c958 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,21 +24,21 @@ public class PrincipalPeopleDetail { @ApiModelProperty(value = "来款项目") private String projectName; - @Excel(name = "应收总金额", width = 15) - @ApiModelProperty(value = "应收总金额") + @Excel(name = "合同金额", width = 15) + @ApiModelProperty(value = "合同金额") private String allMoney; - @Excel(name = "实收总金额", width = 15) - @ApiModelProperty(value = "实收总金额") - private String comeAllMoney; + @Excel(name = "确认收入金额", width = 15) + @ApiModelProperty(value = "确认收入金额") + private String confirmAmount; @Excel(name = "开票金额", width = 15) @ApiModelProperty(value = "开票金额") private String billMoney; - @Excel(name = "确认到账金额", width = 15) - @ApiModelProperty(value = "确认到账金额") - private String confirmAmount; + @Excel(name = "到账金额", width = 15) + @ApiModelProperty(value = "到账金额") + private String comeAllMoney; @ApiModelProperty(value = "打包") private Integer pack; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java index ac4f839e..13c67a6d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java @@ -38,8 +38,11 @@ public class PrincipalPeopleDetailSearch { @ApiModelProperty(value = "应收总金额范围") private String allMoneyTwo; - @ApiModelProperty(value = "开票年份") - private String billYear; + /** + * 2022.7.7 billYear->paymentYear + */ + @ApiModelProperty(value = "确认年份") + private String paymentYear; @ApiModelProperty(value = "字段") private String column; 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 2cd8a20f..b6fdbb0c 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,25 +14,25 @@ public class PrincipalPeopleList { @ApiModelProperty(value = "项目负责人id") private String principalId; - @Excel(name = "应收金额", width = 15) - @DecimalMax(value = "9999999999.99",message = "应收总金额（元）格式错误") + @Excel(name = "合同金额", width = 15) + @DecimalMax(value = "9999999999.99",message = "合同金额（元）格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) - @ApiModelProperty(value = "应收总金额") + @ApiModelProperty(value = "合同金额") private String allMoney; - @Excel(name = "实收金额", width = 15) - @DecimalMax(value = "9999999999.99",message = "实收总金额（元）格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @ApiModelProperty(value = "实收总金额") - private String comeAllMoney; + @Excel(name = "确认收入金额", width = 15) + @ApiModelProperty(value = "确认收入金额") + private String confirmAmount; @Excel(name = "开票金额", width = 15) @ApiModelProperty(value = "开票金额") private String billMoney; - @Excel(name = "确认到账金额", width = 15) - @ApiModelProperty(value = "确认到账金额") - private String confirmAmount; + @Excel(name = "到账金额", width = 15) + @DecimalMax(value = "9999999999.99",message = "到账金额（元）格式错误") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @ApiModelProperty(value = "到账金额") + private String comeAllMoney; @Excel(name = "个人完成率", width = 15) @ApiModelProperty(value = "个人完成率") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleSearch.java index ada57047..4a5dd9ef 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleSearch.java @@ -26,8 +26,11 @@ public class PrincipalPeopleSearch { @ApiModelProperty(value = "部门编码") private String departCode; - @ApiModelProperty(value = "开票年份") - private String billYear; + /** + * 2022.7.7 billYear->paymentYear + */ + @ApiModelProperty(value = "确认年份") + private String paymentYear; @ApiModelProperty(value = "字段") private String column;