作废合同在回款时不生成任务

This commit is contained in:
mx 2025-07-01 11:00:15 +08:00
parent 7d3ce255fd
commit f697179594

View File

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