From 8aff348999770d7ed366a090cb68734ca22f7baf Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 20 Jul 2023 17:13:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update=20[=E5=BA=94=E6=94=B6=E9=87=91?= =?UTF-8?q?=E9=A2=9D]=E6=9B=BF=E6=8D=A2=E4=B8=BA[=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 --- .../common/service/ProjectDetailService.java | 4 ++-- .../service/impl/ProjectDetailServiceImpl.java | 18 +++++++++--------- .../com/jero/common/vo/ProjectDetailVO.java | 4 ++-- .../PayIncomeContractController.java | 4 ++-- .../contract/entity/PayIncomeContract.java | 10 +++++----- ...ayIncomeContractAssociatedCancellation.java | 6 +++--- .../entity/PayIncomeContractInstallment.java | 10 +++++----- .../contract/entity/PaySpendingContract.java | 10 +++++----- .../entity/PaySpendingContractInstallment.java | 6 +++--- .../impl/PayIncomeContractServiceImpl.java | 6 +++--- .../com/jero/contract/vo/ProjectOutput.java | 4 ++-- .../java/com/jero/mail/commont/constant.java | 2 +- .../mail/controller/PayMailBillController.java | 2 +- .../service/impl/PayMailBillServiceImpl.java | 4 ++-- .../meeting/entity/PayMeetingSituation.java | 4 ++-- .../impl/PayMeetingSituationServiceImpl.java | 4 ++-- .../com/jero/meeting/vo/MeetingEntity.java | 4 ++-- .../meeting/vo/MeetingSituationContractVO.java | 4 ++-- .../jero/meeting/vo/PayMeetingSituationVO.java | 4 ++-- .../vo/excel/StandardsSituationExcel.java | 4 ++-- .../PayMemberProjectSubitemController.java | 2 +- .../member/entity/PayMemberProjectSubitem.java | 10 +++++----- .../member/entity/TbCertificatePayment.java | 8 ++++---- .../member/entity/TbMemberProjectSubitem.java | 10 +++++----- .../PayPayMemberProjectSubitemServiceImpl.java | 4 ++-- .../vo/PayMemberProjectSubitemExcel.java | 10 +++++----- .../java/com/jero/pack/vo/PayProjectExcel.java | 10 +++++----- .../impl/PayPaymentCheckServiceImpl.java | 4 ++-- .../jero/project/entity/PayCommonProject.java | 10 +++++----- .../project/entity/PayWorkingGroupSubItem.java | 8 ++++---- .../impl/PayCommonProjectServiceImpl.java | 4 ++-- .../impl/PayWorkingGroupServiceImpl.java | 2 +- .../PayWorkingGroupSubItemServiceImpl.java | 18 +++++++++--------- .../com/jero/project/vo/SetChargeInput.java | 8 ++++---- .../vo/excel/PayWorkingGroupSubItemExcel.java | 6 +++--- .../main/java/com/jero/util/AmountUtil.java | 8 ++++---- 36 files changed, 118 insertions(+), 118 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java index 4b6712c8..59602688 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java @@ -28,11 +28,11 @@ public interface ProjectDetailService { */ List queryProjectList(List list); /** - * @Description 获取变更应收金额之后的状态 + * @Description 获取变更待确收金额之后的状态 * @Author lqt * @Date 2021/9/14 * @Param projectId 项目id - * @Param receivableAmount 应收金额 + * @Param receivableAmount 待确收金额 * @Param needInvoice 需要发票 * @Return * @Exception diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index d331adfc..817fc889 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -358,13 +358,13 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(Objects.isNull(payCommonProject.getPaidAmount())){ payCommonProject.setPaidAmount(new BigDecimal("0.00")); } - // 应收金额没有变更 && 验证来款方式没有变更 + // 待确收金额没有变更 && 验证来款方式没有变更 if(receivableAmount.compareTo(payCommonProject.getReceivableAmount()) == 0 && needInvoice.equals(payCommonProject.getNeedInvoice())){ return null; } - // 验证应收金额不能小于实收金额 + // 验证待确收金额不能小于实收金额 if(receivableAmount.compareTo(payCommonProject.getPaidAmount()) < 0){ - throw new JeroBootException("应收金额不能小于实收金额！"); + throw new JeroBootException("待确收金额不能小于实收金额！"); } // 验证来款方式,有变更，按照变更处理 if(!needInvoice.equals(payCommonProject.getNeedInvoice())){ @@ -384,7 +384,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { BigDecimal b = listPayMailBillProject.stream().map(PayMailBillProject::getInvoiceAmount).reduce(BigDecimal.ZERO,BigDecimal::add); invoice = invoice.add(b); if(receivableAmount.compareTo(invoice) < 0){ - throw new JeroBootException("应收金额不可小于实收金额，请先修改实际来款后再来修改！"); + throw new JeroBootException("待确收金额不可小于实收金额，请先修改实际来款后再来修改！"); } List list = listPayMailBillProject.stream().map(PayMailBillProject::getBillId).collect(Collectors.toList()); LambdaQueryWrapper queryPayMailBill = new LambdaQueryWrapper<>(); @@ -394,7 +394,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { y = listPayMailBill.size(); } // 到账 - // 应收金额 = 实收金额 = 1 + // 待确收金额 = 实收金额 = 1 if(receivableAmount.compareTo(payCommonProject.getPaidAmount()) == 0){ projectStatusVO.setInAccount(ProjectCommon.IN_ACCOUNT1); } @@ -402,7 +402,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(payCommonProject.getPaidAmount().compareTo(new BigDecimal("0.00")) == 0){ projectStatusVO.setInAccount(ProjectCommon.IN_ACCOUNT0); } - // 0 < 实收金额 && 实收金额 < 应收金额 = 2 + // 0 < 实收金额 && 实收金额 < 待确收金额 = 2 if(payCommonProject.getPaidAmount().compareTo(new BigDecimal("0.00")) > 0 && payCommonProject.getPaidAmount().compareTo(receivableAmount) < 0){ projectStatusVO.setInAccount(ProjectCommon.IN_ACCOUNT2); @@ -412,7 +412,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(Objects.equals(payCommonProject.getNeedInvoice(),ProjectCommon.NEED_INVOICE0)){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0); }else{ - // 开票金额 = 应收金额 = 1 + // 开票金额 = 待确收金额 = 1 if(invoice.compareTo(receivableAmount) == 0 ){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE1); } @@ -420,13 +420,13 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(invoice.compareTo(new BigDecimal("0.00")) == 0){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0); } - // 开票金额 > 0 && 开票金额 < 应收金额 = 2 + // 开票金额 > 0 && 开票金额 < 待确收金额 = 2 if(invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(payCommonProject.getReceivableAmount()) < 0){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE2); } } // 邮寄 - // 开票金额 = 应收金额 && 邮寄次数 = 开票次数 = 1 + // 开票金额 = 待确收金额 && 邮寄次数 = 开票次数 = 1 if(invoice.compareTo(receivableAmount) == 0 && c == y){ projectStatusVO.setMail(ProjectCommon.MAIL1); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java index 7141e18d..a2a45ed5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java @@ -24,9 +24,9 @@ public class ProjectDetailVO implements Serializable { @ApiModelProperty(value = "项目类型") private Integer projectType; /** - * 应收金额 + * 待确收金额 */ - @ApiModelProperty(value = "应收金额") + @ApiModelProperty(value = "待确收金额") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal receivableAmount; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index 03c3441f..f54393d6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -663,7 +663,7 @@ public class PayIncomeContractController extends JeroController listPayMailBill = payMailBillService.list(queryPayMailBill); y = listPayMailBill.size(); } - //获取项目应收金额 + //获取项目待确收金额 BigDecimal receivableAmount = new BigDecimal("0.00"); String project = ""; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 2f67509b..0998b977 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -793,7 +793,7 @@ public class PayMailBillServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } @@ -220,7 +220,7 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl0 && 实收金额 == 应收金额 + // 应收>0 && 实收金额 == 待确收金额 if(amountReceivable.compareTo(new BigDecimal("0.00")) > 0 && paidAmount.compareTo(amountReceivable) == 0){ paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//已完结 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index 9609e967..2417d387 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -90,11 +90,11 @@ public class PayCommonProject implements Serializable { @ApiModelProperty(value = "临时联系人名称") @Excel(name = "企业联系人", width = 15,orderNum = "3") private String contactsTemporaryName; - /**应收金额（元）*/ - @Excel(name = "应收金额（元）", width = 15,orderNum = "4") - @ApiModelProperty(value = "应收金额（元）") - @NotNull(message = "应收金额（元）不能为空") - @DecimalMax(value = "9999999999.99",message = "应收金额（元）格式错误") + /**待确收金额（元）*/ + @Excel(name = "待确收金额（元）", width = 15,orderNum = "4") + @ApiModelProperty(value = "待确收金额（元）") + @NotNull(message = "待确收金额（元）不能为空") + @DecimalMax(value = "9999999999.99",message = "待确收金额（元）格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal receivableAmount; /**实收金额（元）*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index 00f95412..c1f53e7b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -117,10 +117,10 @@ public class PayWorkingGroupSubItem implements Serializable { @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）") @NotNull(message = "来款方式不能为空") private java.lang.Integer chargeWay; - /**应收金额（元）*/ - @Excel(name = "应收金额（元）", width = 15) - @ApiModelProperty(value = "应收金额（元）") - @DecimalMax(value = "9999999999.99",message = "应收金额（元）格式错误") + /**待确收金额（元）*/ + @Excel(name = "待确收金额（元）", width = 15) + @ApiModelProperty(value = "待确收金额（元）") + @DecimalMax(value = "9999999999.99",message = "待确收金额（元）格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal receivableAmount; /**实收金额（元）*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java index 88d49dd0..9a8285ce 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java @@ -149,7 +149,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } @@ -223,7 +223,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 6388cf01..5caccda1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -183,7 +183,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } @@ -331,7 +331,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); + msg.append("第").append(count + 3).append("行:待确收金额不能为空，请修改。
"); } if (StringUtils.isBlank(p.getContractNum())) { msg.append("第").append(count + 3).append("行:合同号不能为空，请修改。
"); @@ -660,7 +660,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); + msg.append("第").append(count + 3).append("行:待确收金额不能为空，请修改。
"); } } p.setChargeUse(PayProjectCommon.CHARGE_USE1); @@ -925,7 +925,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); - // 变更应收金额，重新校验状态 + // 变更待确收金额，重新校验状态 ProjectStatusVO projectStatusVO = projectDetailService.getStatus(p.getId(),input.getReceivableAmount(),p.getNeedInvoice()); if(!Objects.isNull(projectStatusVO)){ if(!Objects.isNull(projectStatusVO.getInAccount())){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetChargeInput.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetChargeInput.java index 4c44d057..8d8df73c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetChargeInput.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetChargeInput.java @@ -20,10 +20,10 @@ public class SetChargeInput implements Serializable { @ApiModelProperty(value = "收费通知唯一标识(收费通知号A:a,收费通知号B:b)") @NotEmpty(message = "收费通知唯一标识不能为空") private java.lang.String charge; - /**应收金额（元）*/ - @ApiModelProperty(value = "应收金额（元）") - @DecimalMax(value = "9999999999.99",message = "应收金额（元）格式错误") - @NotNull(message = "应收金额（元）不能为空！") + /**待确收金额（元）*/ + @ApiModelProperty(value = "待确收金额（元）") + @DecimalMax(value = "9999999999.99",message = "待确收金额（元）格式错误") + @NotNull(message = "待确收金额（元）不能为空！") private BigDecimal receivableAmount; /**收费通知号*/ @ApiModelProperty(value = "收费通知号") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java index 4bd92799..f114a460 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java @@ -38,10 +38,10 @@ public class PayWorkingGroupSubItemExcel implements Serializable { @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）") private Integer chargeWay; /** - * 应收金额（元） + * 待确收金额（元） */ - @Excel(name = "应收金额（元）", width = 15) - @ApiModelProperty(value = "应收金额（元）") + @Excel(name = "待确收金额（元）", width = 15) + @ApiModelProperty(value = "待确收金额（元）") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal receivableAmount; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/util/AmountUtil.java b/jero-boot-incoming-payment/src/main/java/com/jero/util/AmountUtil.java index 013eb081..ef52a68e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/util/AmountUtil.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/util/AmountUtil.java @@ -22,17 +22,17 @@ public class AmountUtil { /** * 计算到账状态 * - * @param amountReceivable 应收金额 + * @param amountReceivable 待确收金额 * @param paidAmount 实收金额 * @return */ public static int calculate(Integer amountReceivable, Integer paidAmount) { - //应收金额大于0时 + //待确收金额大于0时 if (amountReceivable > 0) { - //实收金额等于应收金额 + //实收金额等于待确收金额 if (paidAmount.equals(amountReceivable)) { return 2; - //实收金额大于0小于应收金额时 + //实收金额大于0小于待确收金额时 } else if (paidAmount > 0 && paidAmount < amountReceivable) { return 1; //实收金额等于0时 From 4512a446740b9e14fb97bf32ab6ef73844db9475 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 24 Jul 2023 13:46:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?add=20=E9=A6=96=E9=A1=B5=20=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=BA=94=E6=94=B6=E8=B4=A6=E6=AC=BE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/index/contoller/IndexController.java | 32 +++++++++++++++++ .../entity/AllProjectStatistics.java | 34 +++++++++---------- 2 files changed, 48 insertions(+), 18 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java index 7f3e452f..e5f983d3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java @@ -15,11 +15,16 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.enmus.ExcelType; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import java.text.DecimalFormat; @@ -132,4 +137,31 @@ public class IndexController { } + @ApiOperation(value = "导出应收账款统计列表") + @GetMapping(value = "/exportUncollectedList") + public ModelAndView exportUncollectedList( + @RequestParam(name="type",defaultValue = "1")String type, + @RequestParam(name="departCode",required = false)String departCode, + @RequestParam(name="column",required = false)String column, + @RequestParam(name="order",required = false)String order) { + + Page page = new Page<>(-1, -1); + HashMap hashMap = indexService.uncollectedList(type,departCode,page,column,order); + IPage pageList = (IPage) hashMap.get("pageList"); + List records = pageList.getRecords(); + + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + String title = "应收账款统计"; + mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.CLASS, AllProjectStatistics.class); + //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- + ExportParams exportParams=new ExportParams(title, title); + exportParams.setType(ExcelType.XSSF); + //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, records); + return mv; + + } + } 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 a5a90b5c..c811e4c2 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,10 +22,26 @@ public class AllProjectStatistics { @ApiModelProperty(value = "来款项目") private String projectName; + @Excel(name = "项目负责人", width = 15) + @ApiModelProperty(value = "项目负责人") + private String principalName; + + @Excel(name = "科室", width = 15) + @ApiModelProperty(value = "科室") + private String depart; + @Excel(name = "来款单位", width = 15) @ApiModelProperty(value = "来款单位") private String chargeCompanyTemporaryName; + @ApiModelProperty(value = "打包") + private Integer pack; + + @TableField(exist = false) + @Excel(name = "打包", width = 15) + @ApiModelProperty(value = "打包") + private String packText; + @Excel(name = "年度待确收金额", width = 15) @ApiModelProperty(value = "合同金额") private String allMoney; @@ -49,24 +65,6 @@ public class AllProjectStatistics { @ApiModelProperty(value = "来款用途") private String ChargeUse_text; - - @ApiModelProperty(value = "打包") - private Integer pack; - - @TableField(exist = false) - @Excel(name = "打包", width = 15) - @ApiModelProperty(value = "打包") - private String packText; - - @Excel(name = "科室", width = 15) - @ApiModelProperty(value = "科室") - private String depart; - - @Excel(name = "项目负责人", width = 15) - @ApiModelProperty(value = "项目负责人") - private String principalName; - - @Excel(name = "到账时间", width = 15) @ApiModelProperty(value = "到账时间") private String paymentDate; From f28a2ffbc80549625e51583afb97b7df1cfa2b4d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 24 Jul 2023 14:12:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update=20=E5=85=A8=E6=89=80=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=B9=B4=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/project/mapper/xml/PayWorkingGroupMapper.xml | 6 ++++-- .../com/jero/statistics/entity/AllProjectStatistics.java | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) 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 c9689828..2ecc1b13 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 @@ -456,7 +456,8 @@ packText, pack, invoiceNoTaxAmount as billMoney, - confirmNoTaxAmount as confirmAmount + confirmNoTaxAmount as confirmAmount, + year from v_statistical v @@ -2435,7 +2436,8 @@ allMoney, paidNoTaxAmount AS comeAllMoney, invoiceNoTaxAmount AS billMoney, - confirmNoTaxAmount AS confirmAmount + confirmNoTaxAmount AS confirmAmount, + year FROM v_statistical v left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id left join pay_mail_bill pmb on pmb.id = pmbp.bill_id 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 c811e4c2..5d577275 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 @@ -68,6 +68,11 @@ public class AllProjectStatistics { @ApiModelProperty(value = "到账时间") private String paymentDate; + @Excel(name = "项目年份", width = 15) + @ApiModelProperty(value = "项目年份") + private String year; + + public AllProjectStatistics(String allMoney, String confirmAmount, String billMoney, String comeAllMoney, String paymentDate) { this.allMoney=allMoney; this.confirmAmount=confirmAmount; From 427164f471bfa3d17e64173c9b6de1829b42144c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 25 Jul 2023 13:56:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=20=E9=A6=96=E9=A1=B5=E5=BA=94=E6=94=B6?= =?UTF-8?q?=E8=B4=A6=E6=AC=BE=E7=BB=9F=E8=AE=A1=E4=B8=8D=E5=87=86=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/统计视图.sql | 228 ++++++++++++++++++ .../mapper/xml/PayWorkingGroupMapper.xml | 18 +- 2 files changed, 237 insertions(+), 9 deletions(-) diff --git a/db/统计视图.sql b/db/统计视图.sql index adcbe1c3..fb2fa311 100644 --- a/db/统计视图.sql +++ b/db/统计视图.sql @@ -720,3 +720,231 @@ INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `descri INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1587319992635285506', '1587319627974107138', '13%', '0.13', '', 7.00, 1, 'LKGLZ', '2022-11-01 13:45:52', 'LKGLZ', '2022-11-01 13:54:02'); INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1587320050650898434', '1587319627974107138', '19%欧洲', '0.19', '', 8.00, 1, 'LKGLZ', '2022-11-01 13:46:06', 'LKGLZ', '2022-11-01 13:53:55'); +create view v_statistical_all as +select pp.id as projectId, + pp.superId, + pp.projectName, + principalName, + chargeCompanyId, + chargeCompanyTemporaryId, + chargeCompanyTemporaryName, + allMoney, + comeAllMoney, + chargeUse, + depart, + createTime, + if(pp.pack = 0, '否', '是') as packText, + year, + payStatue, + departId, + departCode, + principalNameId, + type, + billMoney as invoiceAmount, + if(billMoney is null, 0, billMoney) as billMoney, + confirmAmount, + invoiceNoTaxAmount, + paidNoTaxAmount, + confirmNoTaxAmount, + contactsName, + confirmDate, + pp.pack +from (SELECT pwgs.id, + pwg.id as superId, + pwg.working_group_project AS projectName, + pwg.principal_name_a as principalName, + pwgs.charge_company_id AS chargeCompanyId, + pwgs.charge_company_temporary_id as chargeCompanyTemporaryId, + pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName, + pwgs.no_tax_amount as allMoney, + pwgs.paid_amount as comeAllMoney, + pwgs.charge_use as chargeUse, + sd.depart_name as depart, + pwgs.pack as pack, + pwg.year as year, + pwgs.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + pwg.principal_id_a as principalNameId, + 2 as type, + pwgs.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + confirm_no_tax_amount as confirmNoTaxAmount, + GROUP_CONCAT(DISTINCT pwgsc.contacts_temporary_name order by pwgsc.contacts_temporary_name) as contactsName, + GROUP_CONCAT(DISTINCT DATE_FORMAT(pcpr.payment_date,'%Y-%m')) as confirmDate, + pwgs.create_time as createTime + FROM pay_working_group pwg + right join pay_working_group_subitem pwgs on (pwg.id = pwgs.working_group_id) + left JOIN sys_user su on (pwg.principal_id_a = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left JOIN pay_working_group_subitem_contacts pwgsc on pwgsc.working_group_sub_id = pwgs.id + left join pay_confirm_payment_record pcpr on pwgs.id = pcpr.project_id + group by pwgs.id + union all + SELECT pcp.id, + pcp.id as superId, + pcp.charge_project AS projectName, + pcp.principal_name as principalName, + pcp.charge_company_id AS chargeCompanyId, + pcp.charge_company_temporary_id as chargeCompanyTemporaryId, + pcp.charge_company_temporary_name AS chargeCompanyTemporaryName, + pcp.no_tax_amount as allMoney, + pcp.paid_amount as comeAllMoney, + pcp.charge_use as chargeUse, + sd.depart_name as depart, + pcp.pack as pack, + pcp.year as year, + pcp.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + pcp.principal_id as principalNameId, + 1 as type, + pcp.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + confirm_no_tax_amount as confirmNoTaxAmount, + contacts_temporary_name as contactsName, + GROUP_CONCAT(DATE_FORMAT(pcpr.payment_date,'%Y-%m')) as confirmDate, + pcp.create_time as createTime + FROM pay_common_project pcp + left JOIN sys_user su on (pcp.principal_id = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left join pay_confirm_payment_record pcpr on pcp.id = pcpr.project_id + group by pcp.id + union all + SELECT pmps.id, + pmp.id as superId, + pmp.project_name AS projectName, + su.realname as principalName, + pmps.company_id AS chargeCompanyId, + pmps.company_id as chargeCompanyTemporaryId, + pmps.company_name AS chargeCompanyTemporaryName, + pmps.no_tax_amount as allMoney, + pmps.paid_amount as comeAllMoney, + pmps.charge_use as chargeUse, + sd.depart_name as depart, + pmps.pack as pack, + pmp.particular_year as year, + pmps.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + pmp.director_id as principalNameId, + 4 as type, + pmps.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + confirm_no_tax_amount as confirmNoTaxAmount, + company_contact_name as contactsName, + GROUP_CONCAT(DATE_FORMAT(pcpr.payment_date,'%Y-%m')) as confirmDate, + pmps.create_time as createTime + FROM pay_member_project pmp + right join pay_member_project_subitem pmps on (pmp.id = pmps.project_id) + left JOIN sys_user su on (pmp.director_id = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left join pay_confirm_payment_record pcpr on pmps.id = pcpr.project_id + group by pmps.id + union all + SELECT pms.id, + pm.id as superId, + pm.meeting_name AS projectName, + su.realname as principalName, + pms.company_id AS chargeCompanyId, + pms.company_id as chargeCompanyTemporaryId, + pms.company_name AS chargeCompanyTemporaryName, + pms.no_tax_amount as allMoney, + pms.paid_amount as comeAllMoney, + pms.charge_use as chargeUse, + sd.depart_name as depart, + pms.pack as pack, + pm.particular_year as year, + pms.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + pm.director_id as principalNameId, + 3 as type, + pms.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + confirm_no_tax_amount as confirmNoTaxAmount, + company_contact_name as contactsName, + GROUP_CONCAT(DATE_FORMAT(pcpr.payment_date,'%Y-%m')) as confirmDate, + pms.create_time as createTime + FROM pay_meeting pm + right join pay_meeting_situation pms on (pm.id = pms.meeting_id) + left JOIN sys_user su on (pm.director_id = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left join pay_confirm_payment_record pcpr on pms.id = pcpr.project_id + group by pms.id + union all + SELECT tmps.id, + tmp.id as superId, + tmp.project_name AS projectName, + su.realname as principalName, + tmps.company_id AS chargeCompanyId, + tmps.company_id as chargeCompanyTemporaryId, + tmps.company_name AS chargeCompanyTemporaryName, + tmps.no_tax_amount as allMoney, + tmps.paid_amount as comeAllMoney, + tmps.charge_use as chargeUse, + sd.depart_name as depart, + tmps.pack as pack, + tmp.year as year, + tmps.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + tmp.director_id as principalNameId, + 5 as type, + tmps.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + confirm_no_tax_amount as confirmNoTaxAmount, + liaison_man as contactsName, + GROUP_CONCAT(DATE_FORMAT(pcpr.payment_date,'%Y-%m')) as confirmDate, + tmps.create_time as createTime + FROM tb_member_project tmp + left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id) + left JOIN sys_user su on (tmp.director_id = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left join pay_confirm_payment_record pcpr on tmps.id = pcpr.project_id + group by tmps.id + union all + SELECT tcp.id, + tmp.id as superId, + tmp.project_name AS projectName, + su.realname as principalName, + tcp.company_id AS chargeCompanyId, + tcp.company_id as chargeCompanyTemporaryId, + tcp.company_name AS chargeCompanyTemporaryName, + tcp.no_tax_amount as allMoney, + tcp.paid_amount as comeAllMoney, + tcp.charge_use as chargeUse, + sd.depart_name as depart, + tcp.pack as pack, + tmp.year as year, + tcp.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + tmp.director_id as principalNameId, + 6 as type, + tcp.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + confirm_no_tax_amount as confirmNoTaxAmount, + liaison_man as contactsName, + GROUP_CONCAT(DATE_FORMAT(pcpr.payment_date,'%Y-%m')) as confirmDate, + tcp.create_time as createTime + FROM tb_member_project tmp + left join tb_certificate_payment tcp on (tmp.id = tcp.project_id) + left JOIN sys_user su on (tmp.director_id = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left join pay_confirm_payment_record pcpr on tcp.id = pcpr.project_id + group by tcp.id + ) pp +order by pp.createTime; \ No newline at end of file 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 2ecc1b13..9f875de2 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 @@ -2368,7 +2368,7 @@ IFNULL(sum(money),0) from ( SELECT distinct v.projectId, invoiceNoTaxAmount - ifnull( paidNoTaxAmount, 0) money - FROM v_statistical v + FROM v_statistical_all v left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id left join pay_mail_bill pmb on pmb.id = pmbp.bill_id @@ -2385,8 +2385,8 @@ and departCode = #{departCode} - AND (paidNoTaxAmount invoiceNoTaxAmount or - (paidNoTaxAmount is null and invoiceNoTaxAmount is not null and invoiceNoTaxAmount != 0)) + AND (comeAllMoney v.invoiceAmount or + (comeAllMoney is null and v.invoiceAmount is not null and v.invoiceAmount != 0)) ) a @@ -2438,7 +2438,7 @@ invoiceNoTaxAmount AS billMoney, confirmNoTaxAmount AS confirmAmount, year - FROM v_statistical v + FROM v_statistical_all v left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id left join pay_mail_bill pmb on pmb.id = pmbp.bill_id @@ -2455,8 +2455,8 @@ and departCode = #{departCode} - AND (paidNoTaxAmount invoiceNoTaxAmount or - (paidNoTaxAmount is null and invoiceNoTaxAmount is not null and invoiceNoTaxAmount != 0)) + AND (comeAllMoney v.invoiceAmount or + (comeAllMoney is null and v.invoiceAmount is not null and v.invoiceAmount != 0)) ) p @@ -2498,7 +2498,7 @@ paidNoTaxAmount, invoiceNoTaxAmount, confirmNoTaxAmount - FROM v_statistical v + FROM v_statistical_all v left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id left join pay_mail_bill pmb on pmb.id = pmbp.bill_id @@ -2515,8 +2515,8 @@ and departCode = #{departCode} - AND (paidNoTaxAmount invoiceNoTaxAmount or - (paidNoTaxAmount is null and invoiceNoTaxAmount is not null and invoiceNoTaxAmount != 0)) + AND (comeAllMoney v.invoiceAmount or + (comeAllMoney is null and v.invoiceAmount is not null and v.invoiceAmount != 0)) ) a