|
|
@@ -1,19 +1,36 @@
|
|
|
package cn.iocoder.yudao.module.bpm.service.oa.universal;
|
|
|
|
|
|
+import cn.hutool.core.collection.CollectionUtil;
|
|
|
+import cn.hutool.core.util.IdUtil;
|
|
|
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
|
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
|
|
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
|
|
|
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
|
|
|
import cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo.OaUniversalPageReqVO;
|
|
|
import cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo.OaUniversalSaveReqVO;
|
|
|
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
|
|
|
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskReturnReqVO;
|
|
|
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.universal.OaUniversalDO;
|
|
|
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.universal.OaUniversalMapper;
|
|
|
+import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.flowable.engine.TaskService;
|
|
|
+import org.flowable.task.api.Task;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import javax.annotation.Resource;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
|
|
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.universal.OaUniversalDO;
|
|
|
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
|
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
|
|
-
|
|
|
-import cn.iocoder.yudao.module.bpm.dal.mysql.oa.universal.OaUniversalMapper;
|
|
|
+import javax.annotation.Resource;
|
|
|
+import java.time.LocalDateTime;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
|
-import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;
|
|
|
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_UNIVERSAL_NOT_EXISTS;
|
|
|
|
|
|
/**
|
|
|
* 通用审批流程信息 Service 实现类
|
|
|
@@ -22,11 +39,175 @@ import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;
|
|
|
*/
|
|
|
@Service
|
|
|
@Validated
|
|
|
-public class OaUniversalServiceImpl implements OaUniversalService {
|
|
|
+public class OaUniversalServiceImpl extends ServiceImpl<OaUniversalMapper, OaUniversalDO> implements OaUniversalService {
|
|
|
+
|
|
|
+ /**
|
|
|
+ * OA 合同续签对应的流程定义 KEY
|
|
|
+ */
|
|
|
+ public static final String PROCESS_KEY = "oa_universal";
|
|
|
+
|
|
|
|
|
|
@Resource
|
|
|
private OaUniversalMapper oaUniversalMapper;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private BpmProcessInstanceApi processInstanceApi;
|
|
|
+
|
|
|
+ @Resource
|
|
|
+ private BpmTaskService bpmTaskService;
|
|
|
+
|
|
|
+ @Resource
|
|
|
+ private TaskService taskService;
|
|
|
+
|
|
|
+ @Override
|
|
|
+ @Transactional
|
|
|
+ public Long startOaUniversal(Long userId, OaUniversalSaveReqVO createReqVO) {
|
|
|
+ //判断是否已经发起流程
|
|
|
+ Boolean auditPass = createReqVO.getAuditPass();
|
|
|
+ // 创建单据uuid
|
|
|
+ String uuid = IdUtil.fastSimpleUUID();
|
|
|
+ OaUniversalDO oaUniversal = BeanUtils.toBean(createReqVO, OaUniversalDO.class);
|
|
|
+ if (StringUtils.isBlank(oaUniversal.getUniversalId())) {
|
|
|
+ oaUniversal.setUniversalId(uuid);
|
|
|
+ }
|
|
|
+ // 保存或更新表单信息
|
|
|
+ this.saveOrUpdate(oaUniversal);
|
|
|
+
|
|
|
+ // 提交
|
|
|
+ if (auditPass) {
|
|
|
+ // 发起 BPM 流程
|
|
|
+ Map<String, Object> processInstanceVariables = new HashMap<>();
|
|
|
+ processInstanceVariables.put("auditPass", auditPass);
|
|
|
+ //添加审批人信息
|
|
|
+ Map<String, List<Long>> startUserSelectAssignees = new HashMap<>();
|
|
|
+ startUserSelectAssignees.put("approver", createReqVO.getStartUserSelectAssignees());
|
|
|
+ String processInstanceId = processInstanceApi
|
|
|
+ .createProcessInstance(userId,
|
|
|
+ new BpmProcessInstanceCreateReqDTO()
|
|
|
+ .setProcessDefinitionKey(PROCESS_KEY)
|
|
|
+ .setVariables(processInstanceVariables)
|
|
|
+ .setBusinessKey(String.valueOf(oaUniversal.getId()))
|
|
|
+ .setStartUserSelectAssignees(startUserSelectAssignees));
|
|
|
+
|
|
|
+ //获取下一个审批人
|
|
|
+ Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult();
|
|
|
+
|
|
|
+ // 将工作流的编号，单据状态 最后一次审批时间 当前审批人 更新到 OA 转正中
|
|
|
+ oaUniversalMapper.updateById(new OaUniversalDO()
|
|
|
+ .setId(oaUniversal.getId())
|
|
|
+ .setProcInstId(processInstanceId)
|
|
|
+ .setAuditStatus("1")
|
|
|
+ .setUniversalId(uuid)
|
|
|
+ .setFinalAuditDate(LocalDateTime.now())
|
|
|
+ .setCurrentAuditEmployeeId(Long.valueOf(task.getAssignee())));
|
|
|
+
|
|
|
+ // TODO 发送通知
|
|
|
+
|
|
|
+ }else {
|
|
|
+ // 暂存，不发起流程
|
|
|
+ // 将单据状态 更新到 OA转正中
|
|
|
+ oaUniversalMapper.updateById(new OaUniversalDO()
|
|
|
+ .setId(oaUniversal.getId())
|
|
|
+ .setAuditStatus("0"));
|
|
|
+ }
|
|
|
+
|
|
|
+ // TODO 保存或更新附件uuid
|
|
|
+ if (CollectionUtil.isNotEmpty(createReqVO.getFileIdList())) {
|
|
|
+ }
|
|
|
+
|
|
|
+ // 返回
|
|
|
+ return oaUniversal.getId();
|
|
|
+ }
|
|
|
+ @Override
|
|
|
+ public Long completeTrueOaUniversal(Long userId, BpmTaskApproveReqVO reqVO) {
|
|
|
+ Task currentTask = bpmTaskService.getTask(reqVO.getId());
|
|
|
+ // 审批同意
|
|
|
+ bpmTaskService.approveTask(userId, reqVO);
|
|
|
+
|
|
|
+ Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
|
|
|
+ if (nextTask != null) {
|
|
|
+ LambdaUpdateWrapper<OaUniversalDO> updateWrapper = new LambdaUpdateWrapper<>();
|
|
|
+ updateWrapper.set(OaUniversalDO::getAuditStatus, "2")
|
|
|
+ .set(OaUniversalDO::getCurrentAuditEmployeeId, nextTask.getAssignee())
|
|
|
+ .set(OaUniversalDO::getFinalAuditDate, new Date())
|
|
|
+ .eq(OaUniversalDO::getProcInstId, currentTask.getProcessInstanceId());
|
|
|
+ oaUniversalMapper.update(updateWrapper);
|
|
|
+ } else {
|
|
|
+ LambdaUpdateWrapper<OaUniversalDO> updateWrapper = new LambdaUpdateWrapper<>();
|
|
|
+ updateWrapper.set(OaUniversalDO::getAuditStatus, "3")
|
|
|
+ .set(OaUniversalDO::getCurrentAuditEmployeeId, null)
|
|
|
+ .set(OaUniversalDO::getFinalAuditDate, new Date())
|
|
|
+ .eq(OaUniversalDO::getProcInstId, currentTask.getProcessInstanceId());
|
|
|
+ oaUniversalMapper.update(updateWrapper);
|
|
|
+
|
|
|
+ // TODO 复制业务单据信息到业务模块单据表
|
|
|
+
|
|
|
+ }
|
|
|
+ // 发送通知
|
|
|
+
|
|
|
+ // 返回
|
|
|
+ return 1L;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Long completeFalseOaUniversal(Long userId, BpmTaskApproveReqVO reqVO) {
|
|
|
+
|
|
|
+ Task currentTask = bpmTaskService.getTask(reqVO.getId());
|
|
|
+
|
|
|
+ BpmTaskReturnReqVO reqVO2 = BeanUtils.toBean(reqVO, BpmTaskReturnReqVO.class);
|
|
|
+ reqVO2.setTargetTaskDefinitionKey("modifyApply");
|
|
|
+ bpmTaskService.returnTask(userId, reqVO2);
|
|
|
+
|
|
|
+ Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
|
|
|
+
|
|
|
+ // 更新单据状态，当前处理人，最后处理时间
|
|
|
+ LambdaUpdateWrapper<OaUniversalDO> updateWrapper = new LambdaUpdateWrapper<>();
|
|
|
+ updateWrapper.set(OaUniversalDO::getCurrentAuditEmployeeId, nextTask.getAssignee())
|
|
|
+ .set(OaUniversalDO::getFinalAuditDate, new Date())
|
|
|
+ .set(OaUniversalDO::getAuditStatus, "0")
|
|
|
+ .eq(OaUniversalDO::getProcInstId, currentTask.getProcessInstanceId());
|
|
|
+ oaUniversalMapper.update(updateWrapper);
|
|
|
+
|
|
|
+ // 发送通知
|
|
|
+
|
|
|
+ // 返回
|
|
|
+ return 1L;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Long updateCompleteOaUniversal(Long userId, OaUniversalSaveReqVO createReqVO, BpmTaskApproveReqVO reqVO) {
|
|
|
+ // 判断是否已经发起流程
|
|
|
+ Boolean auditPass = createReqVO.getAuditPass();
|
|
|
+
|
|
|
+ OaUniversalDO oaUniversal = BeanUtils.toBean(createReqVO, OaUniversalDO.class);
|
|
|
+
|
|
|
+ Task currentTask = taskService.createTaskQuery().processInstanceId(oaUniversal.getProcInstId()).singleResult();
|
|
|
+
|
|
|
+ //审批通过
|
|
|
+ bpmTaskService.approveTask(userId, reqVO);
|
|
|
+
|
|
|
+ // 提交
|
|
|
+ if (auditPass) {
|
|
|
+ Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
|
|
|
+
|
|
|
+ oaUniversal.setAuditStatus("1");
|
|
|
+ oaUniversal.setCurrentAuditEmployeeId(Long.valueOf(nextTask.getAssignee()));
|
|
|
+ oaUniversal.setFinalAuditDate(LocalDateTime.now());
|
|
|
+ oaUniversalMapper.updateById(oaUniversal);
|
|
|
+
|
|
|
+ } else {
|
|
|
+ OaUniversalDO oaUniversalClose = new OaUniversalDO();
|
|
|
+ oaUniversalClose.setId(oaUniversal.getId());
|
|
|
+ oaUniversalClose.setAuditStatus("4");
|
|
|
+ oaUniversalClose.setCurrentAuditEmployeeId(null);
|
|
|
+ oaUniversalClose.setFinalAuditDate(LocalDateTime.now());
|
|
|
+ oaUniversalMapper.updateById(oaUniversalClose);
|
|
|
+ }
|
|
|
+
|
|
|
+ return oaUniversal.getId();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
public Long createOaUniversal(OaUniversalSaveReqVO createReqVO) {
|
|
|
// 插入
|
