sop人员配置

sop-business/src/main/java/com/qmth/sop/business/activiti/service/impl/ActivitiServiceImpl.java

@@ -658,20 +658,27 @@ public class ActivitiServiceImpl implements ActivitiService {
     @Override
     @Transactional
     public Boolean taskApproverExchange(Long userId, Long taskId) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        if (Objects.equals(String.valueOf(sysUser.getId()), String.valueOf(userId))) {
+        Task task = taskService.createTaskQuery().taskId(String.valueOf(taskId)).singleResult();
+        Optional.ofNullable(task).orElseThrow(() -> ExceptionResultEnum.FLOW_TASK_NO_DATA.exception());
+
+        if (Objects.nonNull(task.getAssignee()) && task.getAssignee().equals(userId.toString())) {
             throw ExceptionResultEnum.ERROR.exception("不能转给自己！");
+        } else {
+            List<IdentityLink> identityLinkList = taskService.getIdentityLinksForTask(task.getId());
+            if (!CollectionUtils.isEmpty(identityLinkList)) {
+                for (IdentityLink i : identityLinkList) {
+                    if (i.getTaskId().equals(taskId.toString()) && i.getUserId().equals(userId.toString())) {
+                        throw ExceptionResultEnum.ERROR.exception("不能转给自己！");
+                    }
+                }
+            }
         }
-
         boolean lock = memoryLock.lock(SystemConstant.LOCK_FLOW_EXCHANGE_PREFIX + taskId, taskId,
                 SystemConstant.LOCK_FLOW_TIME_OUT);
         if (!lock) {
             throw ExceptionResultEnum.ERROR.exception("正在转审中，请稍候再试！");
         }
         try {
-            Task task = taskService.createTaskQuery().taskId(String.valueOf(taskId)).singleResult();
-            Optional.ofNullable(task).orElseThrow(() -> ExceptionResultEnum.FLOW_TASK_NO_DATA.exception());
-
             BpmnModel bpmnModel = repositoryService.getBpmnModel(task.getProcessDefinitionId());
             FlowNode currFlow = (FlowNode) bpmnModel.getMainProcess().getFlowElement(task.getTaskDefinitionKey());
             boolean multiInstance = false;
@@ -699,7 +706,21 @@ public class ActivitiServiceImpl implements ActivitiService {
             }
 
             if (!multiInstance) {
-                taskService.deleteCandidateUser(String.valueOf(taskId), String.valueOf(sysUser.getId()));
+                String oldUserId = task.getAssignee();
+                if (Objects.nonNull(task.getAssignee())) {
+                    oldUserId = task.getAssignee();
+                } else {
+                    List<IdentityLink> identityLinkList = taskService.getIdentityLinksForTask(task.getId());
+                    if (!CollectionUtils.isEmpty(identityLinkList)) {
+                        for (IdentityLink i : identityLinkList) {
+                            if (i.getTaskId().equals(taskId.toString())) {
+                                oldUserId = i.getUserId();
+                                break;
+                            }
+                        }
+                    }
+                }
+                taskService.deleteCandidateUser(String.valueOf(taskId), oldUserId);
                 taskService.addCandidateUser(String.valueOf(taskId), String.valueOf(userId));
             } else {
                 taskService.setAssignee(String.valueOf(taskId), String.valueOf(userId));
@@ -715,6 +736,7 @@ public class ActivitiServiceImpl implements ActivitiService {
             LinkedHashMap<String, FlowTaskResult> setupMap = flowResult.getSetupMap();
             FlowTaskResult currFlowTaskResult = GsonUtil.fromJson(
                     GsonUtil.toJson(setupMap.get(task.getTaskDefinitionKey())), FlowTaskResult.class);
+            SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
             TFFlowLog tfFlowLog = new TFFlowLog(sysUser.getOrgId(), sysUser.getId(), sysUser.getId(),
                     currFlowTaskResult.getSetup(), Long.parseLong(task.getProcessInstanceId()),
                     Long.parseLong(task.getId()), tfCustomFlowEntity.getId(), String.valueOf(userId));

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -754,7 +754,7 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                         approveUserIds.add(u.getUserId().toString());
                     }
                 } else {
-                    //todo 需要调用曹子轩项目经理变更的方法
+                    //todo 需要调用曹子轩项目经理变更的方法，并且注释是[系统]
                     Objects.requireNonNull(crmProjectResult.getRegionManagerId(), "未设置大区经理");
                     try {
                         tbUserArchivesService.findByUserId(crmProjectResult.getRegionManagerId());

sop-business/src/main/resources/mapper/TBSopInfoMapper.xml

@@ -76,6 +76,7 @@
                cast(tfcf.flow_deployment_id as char) as flowDeploymentId,
                IFNULL(art.NAME_,'--') as taskName,
                art.TASK_DEF_KEY_ as taskDefKey,
+               tbcd.id as crmDetailId,
                (select group_concat(cast(art.ID_ as char)) from ACT_RU_TASK art where art.PROC_INST_ID_ = tffa.flow_id) as taskId
                 <if test="fieldName != null and fieldName != ''">
                     ,${fieldName}
@@ -92,6 +93,7 @@
                  left join ACT_RU_TASK art on art.PROC_INST_ID_ = tffa.flow_id
                  left join act_ru_identitylink ari on ari.TASK_ID_ = art.ID_
                  left join t_f_custom_flow tfcf on tfcf.id = tfcfe.t_f_custom_flow_id
+                 left join t_b_crm_detail tbcd on tbcd.sop_no = tbsi.sop_no
                  <if test="tableName != null and tableName != ''">
                      left join ${tableName} t on t.flow_deployment_id = tfcf.flow_deployment_id and t.code = tfcfe.code
                  </if>