生成合同
This commit is contained in:
parent
e3eaf40fe1
commit
2feccb86c5
@ -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<PsTaskMain> list = taskMainMapper.selectList(Wrappers.<PsTaskMain>lambdaUpdate().eq(PsTaskMain::getContractCode, psApproverRecord.getContractCode()));
|
||||
List<PsTaskAppoint> lis = taskAppointMapper.selectList(Wrappers.<PsTaskAppoint>lambdaUpdate().eq(PsTaskAppoint::getContractCode, psApproverRecord.getContractCode()));
|
||||
//主任务作废
|
||||
taskMainMapper.update(Wrappers.<PsTaskMain>lambdaUpdate()
|
||||
.set(PsTaskMain::getTaskStatus,TaskStatusEnum.CANCEL.getCode())
|
||||
@ -54,6 +59,14 @@ public class CancellaApproverServiceImpl extends ApproverAbstractServiceImpl {
|
||||
taskAppointMapper.update(Wrappers.<PsTaskAppoint>lambdaUpdate()
|
||||
.set(PsTaskAppoint::getAppointStatus, TaskStatusEnum.AppointStatusEnum.CANCEL.getCode())
|
||||
.eq(PsTaskAppoint::getContractCode, psApproverRecord.getContractCode()));
|
||||
//审批删除
|
||||
if(CollectionUtils.isNotEmpty(list)){
|
||||
List<Long> ids = list.stream().map(PsTaskMain::getId).toList();
|
||||
if(CollectionUtils.isNotEmpty(lis)){ids.addAll(lis.stream().map(PsTaskAppoint::getId).toList());}
|
||||
baseMapper.update(Wrappers.<PsApproverRecord>lambdaUpdate().set(PsApproverRecord::getDelFlag, "2")
|
||||
.in(PsApproverRecord::getBusinessId,ids));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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,15 +47,19 @@ public class TaskCancellaApproverServiceImpl extends ApproverAbstractServiceImpl
|
||||
info.setTaskStatus(TaskStatusEnum.CANCEL.getCode());
|
||||
taskMainMapper.updateById(info);
|
||||
List<PsTaskAppoint> list = taskAppointMapper.selectList(Wrappers.<PsTaskAppoint>lambdaQuery().eq(PsTaskAppoint::getTaskId, info.getId()));
|
||||
List<Long> ids = list.stream().map(PsTaskAppoint::getId).toList();
|
||||
|
||||
//子任务作废
|
||||
taskAppointMapper.update(Wrappers.<PsTaskAppoint>lambdaUpdate()
|
||||
.set(PsTaskAppoint::getAppointStatus, TaskStatusEnum.AppointStatusEnum.CANCEL.getCode())
|
||||
.eq(PsTaskAppoint::getTaskId, info.getId()));
|
||||
if(CollectionUtils.isNotEmpty(list)){
|
||||
List<Long> ids = list.stream().map(PsTaskAppoint::getId).toList();
|
||||
// ids.add(info.getId());
|
||||
baseMapper.update(Wrappers.<PsApproverRecord>lambdaUpdate().set(PsApproverRecord::getDelFlag, "2").in(PsApproverRecord::getBusinessId, ids));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 审批拒绝 合同的状态变回原状态,并在原状态下方展示【拒绝原因】
|
||||
* @param psApproverRecord
|
||||
|
@ -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.<PsContractInfo>lambdaUpdate().set(PsContractInfo::getContractStatus, ContractStatusEnum.EXECUTION.getCode())
|
||||
.eq(PsContractInfo::getContractCode,mainTask.getContractCode()).eq(PsContractInfo::getDelFlag,0));
|
||||
|
||||
}
|
||||
PsTaskAppoint psTaskAppoint = new PsTaskAppoint();
|
||||
|
Loading…
Reference in New Issue
Block a user