diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/CancellaApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/CancellaApproverServiceImpl.java index 2ce30bf..6fe1a34 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/CancellaApproverServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/CancellaApproverServiceImpl.java @@ -1,5 +1,6 @@ package com.pusong.business.service.approver.impl; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.pusong.business.domain.PsApproverRecord; import com.pusong.business.domain.PsContractInfo; @@ -9,6 +10,7 @@ import com.pusong.business.enums.ApproverTypeEnum; import com.pusong.business.enums.CommonStatusEnum; import com.pusong.business.enums.ContractStatusEnum; import com.pusong.business.enums.TaskStatusEnum; +import com.pusong.business.mapper.PsApproverRecordMapper; import com.pusong.business.mapper.PsTaskAppointMapper; import com.pusong.business.mapper.PsTaskMainMapper; import com.pusong.business.service.IPsContractBusinessService; @@ -34,6 +36,7 @@ public class CancellaApproverServiceImpl extends ApproverAbstractServiceImpl { private final IPsContractInfoService contractInfoService; private final PsTaskMainMapper taskMainMapper; private final PsTaskAppointMapper taskAppointMapper; + private final PsApproverRecordMapper baseMapper; /** * 1 审批成功 合同作废成功,合同状态显示为【已作废】 @@ -45,6 +48,8 @@ public class CancellaApproverServiceImpl extends ApproverAbstractServiceImpl { psContractInfo.setContractCode(psApproverRecord.getContractCode()); psContractInfo.setIsCancel(CommonStatusEnum.SUCCESS.getCode()); contractInfoService.updateByCode(psContractInfo); + List list = taskMainMapper.selectList(Wrappers.lambdaUpdate().eq(PsTaskMain::getContractCode, psApproverRecord.getContractCode())); + List lis = taskAppointMapper.selectList(Wrappers.lambdaUpdate().eq(PsTaskAppoint::getContractCode, psApproverRecord.getContractCode())); //主任务作废 taskMainMapper.update(Wrappers.lambdaUpdate() .set(PsTaskMain::getTaskStatus,TaskStatusEnum.CANCEL.getCode()) @@ -54,6 +59,14 @@ public class CancellaApproverServiceImpl extends ApproverAbstractServiceImpl { taskAppointMapper.update(Wrappers.lambdaUpdate() .set(PsTaskAppoint::getAppointStatus, TaskStatusEnum.AppointStatusEnum.CANCEL.getCode()) .eq(PsTaskAppoint::getContractCode, psApproverRecord.getContractCode())); + //审批删除 + if(CollectionUtils.isNotEmpty(list)){ + List ids = list.stream().map(PsTaskMain::getId).toList(); + if(CollectionUtils.isNotEmpty(lis)){ids.addAll(lis.stream().map(PsTaskAppoint::getId).toList());} + baseMapper.update(Wrappers.lambdaUpdate().set(PsApproverRecord::getDelFlag, "2") + .in(PsApproverRecord::getBusinessId,ids)); + } + } /** diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TaskCancellaApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TaskCancellaApproverServiceImpl.java index cc5d9a8..d07dfd8 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TaskCancellaApproverServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TaskCancellaApproverServiceImpl.java @@ -1,5 +1,6 @@ package com.pusong.business.service.approver.impl; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.pusong.business.domain.PsApproverRecord; import com.pusong.business.domain.PsContractInfo; @@ -46,13 +47,17 @@ public class TaskCancellaApproverServiceImpl extends ApproverAbstractServiceImpl info.setTaskStatus(TaskStatusEnum.CANCEL.getCode()); taskMainMapper.updateById(info); List list = taskAppointMapper.selectList(Wrappers.lambdaQuery().eq(PsTaskAppoint::getTaskId, info.getId())); - List ids = list.stream().map(PsTaskAppoint::getId).toList(); + //子任务作废 taskAppointMapper.update(Wrappers.lambdaUpdate() .set(PsTaskAppoint::getAppointStatus, TaskStatusEnum.AppointStatusEnum.CANCEL.getCode()) .eq(PsTaskAppoint::getTaskId, info.getId())); + if(CollectionUtils.isNotEmpty(list)){ + List ids = list.stream().map(PsTaskAppoint::getId).toList(); // ids.add(info.getId()); - baseMapper.update(Wrappers.lambdaUpdate().set(PsApproverRecord::getDelFlag, "2").in(PsApproverRecord::getBusinessId, ids)); + baseMapper.update(Wrappers.lambdaUpdate().set(PsApproverRecord::getDelFlag, "2").in(PsApproverRecord::getBusinessId, ids)); + } + } /** 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 233e3d7..e15d3db 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 @@ -15,6 +15,7 @@ import com.pusong.business.domain.bo.PsTaskMediaBo; import com.pusong.business.domain.bo.PsTaskQueryBo; import com.pusong.business.domain.vo.*; import com.pusong.business.enums.ApproverTypeEnum; +import com.pusong.business.enums.ContractStatusEnum; import com.pusong.business.enums.TaskStatusEnum; import com.pusong.business.enums.TaskStatusEnum.*; import com.pusong.business.enums.TaskTypeEnum; @@ -289,6 +290,8 @@ public class PsTaskServiceImpl implements IPsTaskService { update.setStartDate(new Date()); update.setOperateUser(LoginHelper.getUserId()); baseMapper.updateById(update); + contractInfoMapper.update(Wrappers.lambdaUpdate().set(PsContractInfo::getContractStatus, ContractStatusEnum.EXECUTION.getCode()) + .eq(PsContractInfo::getContractCode,mainTask.getContractCode()).eq(PsContractInfo::getDelFlag,0)); } PsTaskAppoint psTaskAppoint = new PsTaskAppoint();