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 01d9913..00f953c 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 @@ -94,25 +94,26 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl } } //不是续费合同 或者 是续费但是有除了托管之外其他的项目 - if((!"1".equals(info.getIsDue()) || hasTaskBus)&& (tasks.isEmpty() || tasks.get(0).getId() == null)){ - log.info("任务未初始化,初始化任务主表"); - List psTaskMainList = new ArrayList<>(); - for (PsCompanyInfoVo psCompanyInfoVo : info.getPsCompanySerivceVo()) { - PsTaskMain psTaskMain = new PsTaskMain(); - psTaskMain.setContractCode(psApproverRecord.getContractCode()); - psTaskMain.setTaskType(TaskTypeEnum.CONTRACT.getCode()); - psTaskMain.setTaskStatus(TaskStatusEnum.INIT.getCode()); - psTaskMain.setCompanyId(info.getCompanyId()); - psTaskMain.setCustomId(info.getCustomId()); - psTaskMain.setServiceCompanyId(psCompanyInfoVo.getId()); - psTaskMainList.add(psTaskMain); + if(!StringUtils.equals(CommonStatusEnum.SUCCESS.getCode(), info.getIsCancel())){//作废合同不生成任务 + if((!"1".equals(info.getIsDue()) || hasTaskBus)&& (tasks.isEmpty() || tasks.get(0).getId() == null)){ + log.info("任务未初始化,初始化任务主表"); + List psTaskMainList = new ArrayList<>(); + for (PsCompanyInfoVo psCompanyInfoVo : info.getPsCompanySerivceVo()) { + PsTaskMain psTaskMain = new PsTaskMain(); + psTaskMain.setContractCode(psApproverRecord.getContractCode()); + psTaskMain.setTaskType(TaskTypeEnum.CONTRACT.getCode()); + psTaskMain.setTaskStatus(TaskStatusEnum.INIT.getCode()); + psTaskMain.setCompanyId(info.getCompanyId()); + psTaskMain.setCustomId(info.getCustomId()); + psTaskMain.setServiceCompanyId(psCompanyInfoVo.getId()); + psTaskMainList.add(psTaskMain); - noticeService.sendNotice(SysNoticeBo.getNewTaskInstance(psCompanyInfoVo.getCompanyName())); + noticeService.sendNotice(SysNoticeBo.getNewTaskInstance(psCompanyInfoVo.getCompanyName())); + } + taskMainService.insertBatch(psTaskMainList); } - taskMainService.insertBatch(psTaskMainList); } - PsContractPayVo psContractPayVo = payService.queryById(Long.valueOf(psApproverRecord.getBusinessId())); if (psContractPayVo.getMoney().equals(info.getPayMoney())){