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 06f2b8c..0b49530 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 @@ -57,6 +57,13 @@ public interface IPsTaskService { * @return 公司及资料信息 */ PsTaskMainVo queryInfo(Long id); + /** + * 根据合同编码查询任务 + * + * @param contractCode 合同编码 + * @return + */ + PsTaskMain queryByContractCode(String contractCode); /** * 根据主任务id查询进度 * 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 fdfcc37..e683438 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 @@ -54,11 +54,13 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl } update.setId(Long.valueOf(psApproverRecord.getBusinessId())); update.setPayStatus(PayStatusEnum.SUCCESS.getCode()); + payService.updateById(update); List list = payService.queryListByContractCode(info.getContractCode(), PayBuinessStatusEnum.PAY.getCode(), PayStatusEnum.SUCCESS); //如果没有过回款记录初始化任务主表,并修改合同状态 log.info("查询回款记录数量{}任务状态{}", list.size(),info.getContractStatus()); - if(CollectionUtils.isEmpty(list) && StringUtils.equals(ContractStatusEnum.CREATE.getCode(),info.getContractStatus())){ - log.info("合同未回款过,初始化任务主表"); + PsTaskMain task = taskMainService.queryByContractCode(psApproverRecord.getContractCode()); + if(task == null || task.getId() == null){ + log.info("任务未初始化,初始化任务主表"); PsTaskMain psTaskMain = new PsTaskMain(); psTaskMain.setContractCode(psApproverRecord.getContractCode()); psTaskMain.setTaskType(TaskTypeEnum.CONTRACT.getCode()); @@ -66,13 +68,15 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl psTaskMain.setCompanyId(info.getCompanyId()); psTaskMain.setCustomId(info.getCustomId()); taskMainService.insert(psTaskMain); + } + if(StringUtils.equals(ContractStatusEnum.CREATE.getCode(),info.getContractStatus())){ log.info("修改合同状态"); PsContractInfo updateInfo = new PsContractInfo(); updateInfo.setContractCode(info.getContractCode()); updateInfo.setContractStatus(ContractStatusEnum.RETURN.getCode()); psContractInfoService.updateByCode(updateInfo); } - payService.updateById(update); + } @Override 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 4b09a39..617fa52 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 @@ -162,7 +162,15 @@ public class PsTaskServiceImpl implements IPsTaskService { psTaskMainVo.setTaskMediaVoList(list); return psTaskMainVo; } - + /** + * 根据合同编码查询任务 + * + * @param contractCode 合同编码 + * @return + */ + public PsTaskMain queryByContractCode(String contractCode){ + return baseMapper.selectOne(Wrappers.lambdaQuery().eq(PsTaskMain::getContractCode, contractCode)); + } /** * 上传资料和公司信息 *