From 9265cb946da58448108ea6a68e6c3eef750e8625 Mon Sep 17 00:00:00 2001 From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com> Date: Fri, 9 Aug 2024 18:03:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pusong/business/domain/PsContractBusiness.java | 5 ++++- .../business/domain/bo/PsContractBusinessBo.java | 5 ++++- .../business/domain/vo/PsContractBusinessVo.java | 5 ++++- .../service/impl/PsContractInfoServiceImpl.java | 10 +++++++--- .../mapper/business/PsContractBusinessMapper.xml | 2 +- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsContractBusiness.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsContractBusiness.java index 351d032..2c1bbc0 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsContractBusiness.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsContractBusiness.java @@ -43,7 +43,10 @@ public class PsContractBusiness extends TenantEntity { * 服务总金额 */ private BigDecimal businessAmount; - + /** + * 服务类型辅助 + */ + private String desc; /** * 结束时间 */ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractBusinessBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractBusinessBo.java index b9869e7..65724ae 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractBusinessBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractBusinessBo.java @@ -47,7 +47,10 @@ public class PsContractBusinessBo { */ @NotNull(message = "服务总金额不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal businessAmount; - + /** + * 服务类型辅助 + */ + private String desc; /** * 结束时间 */ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractBusinessVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractBusinessVo.java index 66b578a..dd75665 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractBusinessVo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractBusinessVo.java @@ -56,7 +56,10 @@ public class PsContractBusinessVo implements Serializable { */ private BigDecimal businessAmount; - + /** + * 服务类型辅助 + */ + private String desc; /** * 结束时间 */ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java index 36404ea..5c564eb 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java @@ -81,12 +81,14 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { //3.如果已存在合同，则进行修改，否则新增 if(add == null){ add = new PsContractInfo(); + MapstructUtils.convert(bo, add); add.setContractCode(UUID.randomUUID().toString().replaceAll("-", ""));//合同编码 add.setContractName("合同名称");//todo 合同名称 add.setCustomManager(LoginHelper.getUserId());//所属销售经理id + }else{ + MapstructUtils.convert(bo, add); } add.setCompanyId(bo.getCompanyInfoBo().getId());//公司id - MapstructUtils.convert(bo, add); bo.getBusinessList().forEach(item->{ BigDecimal mony = BigDecimal.ZERO; if(CollectionUtils.isNotEmpty(item.getDetailBos())){ @@ -100,7 +102,7 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { add.setContractStatus(type == 1?ContractStatusEnum.INIT.getCode():ContractStatusEnum.CREATE.getCode());//合同状态 baseMapper.insertOrUpdate(add); //4.删除所有服务类型和服务项目,.插入服务类型 - businessService.saveList(bo.getBusinessList(),bo.getContractCode()); + businessService.saveList(bo.getBusinessList(),add.getContractCode()); //7.生成合同 return makePdf(add,bo); } @@ -371,7 +373,9 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { //未付金额(合同金额-已付金额) vo.setResidualMoney((vo.getContractAmount() == null ? BigDecimal.ZERO:vo.getContractAmount()).subtract(vo.getPayMoney())); //付款周期 - if(payList.size() == 1){ + if(payList.size() == 0){ + vo.setPeriod(null); + }else if(payList.size() == 1){ vo.setPeriod(1); }else{ //包含最后一天 diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml index 41fb425..99ba09a 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ps_contract_business bus left join ps_contract_business_detail detail on bus.id = detail.business_id where bus.del_flag = 0 - and detail.del_flag = 0 + and (detail.del_flag = 0 or detail.del_flag is null) and bus.contract_code = #{contractCode}