From e3eaf40fe1a7e07f46fd91d5133ed4522de0a016 Mon Sep 17 00:00:00 2001 From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com> Date: Wed, 4 Sep 2024 09:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../approver/impl/TaskCancellaApproverServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 f244533..cc5d9a8 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 @@ -5,6 +5,7 @@ import com.pusong.business.domain.PsApproverRecord; import com.pusong.business.domain.PsContractInfo; import com.pusong.business.domain.PsTaskAppoint; import com.pusong.business.domain.PsTaskMain; +import com.pusong.business.enums.ApproverStatusEnum; import com.pusong.business.enums.ApproverTypeEnum; import com.pusong.business.enums.ContractStatusEnum; import com.pusong.business.enums.TaskStatusEnum; @@ -17,6 +18,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.List; + /** * 任务作废审批 */ @@ -33,7 +36,7 @@ public class TaskCancellaApproverServiceImpl extends ApproverAbstractServiceImpl private final PsApproverRecordMapper baseMapper; /** - * 1 审批成功 合同作废成功，合同状态显示为【已作废】 + * 1 审批成功 任务作废成功，合同状态显示为【已作废】 * @param psApproverRecord 神瀑类 */ @Override @@ -42,11 +45,14 @@ public class TaskCancellaApproverServiceImpl extends ApproverAbstractServiceImpl PsTaskMain info = taskMainMapper.selectById(psApproverRecord.getBusinessId()); 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())); - +// ids.add(info.getId()); + baseMapper.update(Wrappers.lambdaUpdate().set(PsApproverRecord::getDelFlag, "2").in(PsApproverRecord::getBusinessId, ids)); } /**