diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java index 6005311..59d8293 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java @@ -119,10 +119,7 @@ public class PsTaskController extends BaseController { @SaCheckPermission("business:task:list") @GetMapping("/mainFinish") public R mainFinish(@NotNull Long id) { - String finish = contractInfoService.finish(psTaskMainService.finishMain(id)); - if (finish != null){ - return R.fail(finish); - } + contractInfoService.finish(psTaskMainService.finishMain(id)); return R.ok(); } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java index 40add34..cbdee99 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java @@ -168,6 +168,7 @@ public class PsContractInfoVo implements Serializable { private String rollBackFailDesc; /** * 合同回传状态0未回传1已回传 + * CommonStatusEnum */ private String rollBackStatus; /** diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsTaskService.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsTaskService.java index ba094e5..10188a8 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsTaskService.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsTaskService.java @@ -66,7 +66,7 @@ public interface IPsTaskService { * @param contractCode 合同编码 * @return */ - PsTaskMain queryByContractCode(String contractCode); + List queryByContractCode(String contractCode); PsTaskMain queryByContractCodeAndServiceCompanyId(String contractCode, Long serviceCompanyId); diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java index 99a37a2..19e6255 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java @@ -77,8 +77,8 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl //如果没有过回款记录初始化任务主表,并修改合同状态 // log.info("查询回款记录数量{}任务状态{}", list.size(),info.getContractStatus()); - PsTaskMain task = taskMainService.queryByContractCode(psApproverRecord.getContractCode()); - if(task == null || task.getId() == null){ + List tasks = taskMainService.queryByContractCode(psApproverRecord.getContractCode()); + if(tasks.isEmpty() || tasks.get(0).getId() == null){ log.info("任务未初始化，初始化任务主表"); List psTaskMainList = new ArrayList<>(); for (PsCompanyInfoVo psCompanyInfoVo : info.getPsCompanySerivceVo()) { 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 10ded07..8eb4cbc 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 @@ -124,7 +124,7 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { if (companyInfoBo.getId() == null){ companyInfoService.saveBo(companyInfoBo); }else{ - PsCompanyInfo update = MapstructUtils.convert(bo, PsCompanyInfo.class); + PsCompanyInfo update = MapstructUtils.convert(companyInfoBo, PsCompanyInfo.class); companyInfoMapper.updateById(update); for (PsContractBusinessBo psContractBusinessBo : companyInfoBo.getBusinessList()) { psContractBusinessBo.setCompanyId(companyInfoBo.getId()); @@ -488,6 +488,7 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { makePdf(add, updateBo,true); + finish(updateBo.getContractCode()); } public ContractStatusEnum calcContractStatus(PsContractInfoBo updateBo){ @@ -692,7 +693,7 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { } /** - * 合同完成 + * 合同检测是否完成 * 一、回传合同的条件 * 1. 生成合同，所选【服务类别】不包含【托管服务】（即【非托管业务】）：包括【新签】和【续费】 * 1. 合同金额 > = 8000元，必须回传合同，【电子签章】申请成功后才能回传合同 @@ -759,7 +760,7 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { if(num > 0){ return "还有未完任务"; } - if (info.getResidualMoney().compareTo(BigDecimal.ZERO) <= 0){ + if (info.getResidualMoney().compareTo(BigDecimal.ZERO) > 0){ return "还有未回款"; } PsContractInfo psContractInfo = new PsContractInfo(); diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java index fea96e4..fd0b732 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java @@ -234,8 +234,8 @@ public class PsTaskServiceImpl implements IPsTaskService { * @param contractCode 合同编码 * @return */ - public PsTaskMain queryByContractCode(String contractCode){ - return baseMapper.selectOne(Wrappers.lambdaQuery().eq(PsTaskMain::getContractCode, contractCode) + public List queryByContractCode(String contractCode){ + return baseMapper.selectList(Wrappers.lambdaQuery().eq(PsTaskMain::getContractCode, contractCode) .eq(PsTaskMain::getTaskType,TaskTypeEnum.CONTRACT.getCode()).ne(PsTaskMain::getTaskStatus,TaskStatusEnum.CANCEL.getCode())); } @@ -263,12 +263,12 @@ public class PsTaskServiceImpl implements IPsTaskService { // log.error("任务已完成，无法修改"); // throw new ServiceException("任务已完成，无法修改"); // } - customerId=taskMain.getCustomId(); - companyId=taskMain.getCompanyId(); + customerId = taskMain.getCustomId(); + companyId = taskMain.getCompanyId(); }else if(StringUtils.isNotBlank(save.getContractCode())){ PsContractInfo con = contractInfoMapper.selectOne(Wrappers.lambdaQuery().eq(PsContractInfo::getContractCode, save.getContractCode())); - customerId=con.getCustomId(); - companyId=con.getCompanyId(); + customerId = con.getCustomId(); + companyId = con.getCompanyId(); }else{ log.error("必传参数为空"); throw new ServiceException("必传参数为空"); diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml index 04680dc..40a7a9a 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" com.legal_person_idcard com_legal_person_idcard, com.legal_person_phone com_legal_person_phone, com.customer_num com_customer_num, - cus.id cus_id, + cus.id cus_id, cus.custom_name cus_custom_name , cus.custom_mobile cus_custom_mobile, cus.custom_status cus_custom_status,