fix(征求意见流程): 80192

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationUserLink.java

@@ -1,23 +1,17 @@
 package com.jero.modules.activiti.process.fb.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
 
 
 /**
@@ -66,4 +60,16 @@ public class ProcessFbConsultationUserLink implements Serializable {
     @Excel(name = "父执行实例流id", width = 15)
     @ApiModelProperty(value = "父执行实例流id")
     private java.lang.String parentExecutionId;
+    /**部门主管级领导原始办理人*/
+    @Excel(name = "部门主管级领导原始办理人", width = 15)
+    @ApiModelProperty(value = "部门主管级领导原始办理人")
+    private java.lang.String originDepartLeaderId;
+    /**模块负责人原始办理人*/
+    @Excel(name = "模块负责人原始办理人", width = 15)
+    @ApiModelProperty(value = "模块负责人原始办理人")
+    private java.lang.String originModuleOwnerId;
+    /**设计工程师原始办理人*/
+    @Excel(name = "设计工程师原始办理人", width = 15)
+    @ApiModelProperty(value = "设计工程师原始办理人")
+    private java.lang.String originDesignEngineerId;
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java

@@ -351,7 +351,8 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
                     new LambdaUpdateWrapper<ProcessFbConsultationUserLink>()
                             .eq(ProcessFbConsultationUserLink::getBusinessId, projectId)
                             .eq(ProcessFbConsultationUserLink::getDesignEngineerId, CurrentUserUtil.getId())
-                            .set(ProcessFbConsultationUserLink::getDesignEngineerId, toUserId));
+                            .set(ProcessFbConsultationUserLink::getDesignEngineerId, toUserId)
+                            .set(ProcessFbConsultationUserLink::getOriginDesignEngineerId, CurrentUserUtil.getId()));
         }
         // 模块负责人分发/模块负责人汇总填写意见
         if (ConsultationTaskKey.MODULE_OWNER_START.equals(taskDefinitionKey)
@@ -362,7 +363,8 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
                     new LambdaUpdateWrapper<ProcessFbConsultationUserLink>()
                             .eq(ProcessFbConsultationUserLink::getBusinessId, projectId)
                             .eq(ProcessFbConsultationUserLink::getModuleOwnerId, CurrentUserUtil.getId())
-                            .set(ProcessFbConsultationUserLink::getModuleOwnerId, toUserId));
+                            .set(ProcessFbConsultationUserLink::getModuleOwnerId, toUserId)
+                            .set(ProcessFbConsultationUserLink::getOriginModuleOwnerId, CurrentUserUtil.getId()));
 
             runtimeService.setVariable(executionId, "moduleOwner", toUserId);
         }
@@ -374,7 +376,8 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
                     new LambdaUpdateWrapper<ProcessFbConsultationUserLink>()
                             .eq(ProcessFbConsultationUserLink::getBusinessId, projectId)
                             .eq(ProcessFbConsultationUserLink::getDepartLeaderId, CurrentUserUtil.getId())
-                            .set(ProcessFbConsultationUserLink::getDepartLeaderId, toUserId));
+                            .set(ProcessFbConsultationUserLink::getDepartLeaderId, toUserId)
+                            .set(ProcessFbConsultationUserLink::getOriginDepartLeaderId, CurrentUserUtil.getId()));
 
             runtimeService.setVariable(executionId, "departLeader", toUserId);
         }
@@ -417,6 +420,16 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
         switch (taskDefinitionKey) {
             case ConsultationTaskKey.DEPART_LEADER_START_1: // 各部所主管级领导分发
                 linkQueryWrapper.eq(ProcessFbConsultationUserLink::getDepartLeaderId, userId);
+                // 查询当前节点审批记录
+                ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getOne(
+                        new LambdaQueryWrapper<ProcessApprovalRecord>()
+                                .eq(ProcessApprovalRecord::getTaskId, taskId)
+                                .isNotNull(ProcessApprovalRecord::getTransferBy));
+                // 如果转办过
+                if (!Objects.isNull(processApprovalRecord)){
+                    linkQueryWrapper.eq(ProcessFbConsultationUserLink::getOriginDepartLeaderId,
+                            processApprovalRecord.getOriginUserId());
+                }
                 userLinks = processFbConsultationUserLinkService.list(linkQueryWrapper);
                 if (CollectionUtils.isNotEmpty(userLinks)) {
                     userLink = userLinks.get(0);
@@ -817,8 +830,11 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
             userLink.setUserType(FbCommon.USER_TYPE_MODULE_OWNER);
             userLink.setBusinessId(processFbConsultationUserLink.getBusinessId());
             userLink.setDepartLeaderId(processFbConsultationUserLink.getDepartLeaderId());
+            userLink.setOriginDepartLeaderId(processFbConsultationUserLink.getOriginDepartLeaderId());
             userLink.setModuleOwnerId(processFbConsultationUserLink.getModuleOwnerId());
+            userLink.setOriginModuleOwnerId(processFbConsultationUserLink.getOriginModuleOwnerId());
             userLink.setDesignEngineerId(designEngineer);
+            userLink.setOriginDesignEngineerId(designEngineer);
             userLinkList.add(userLink);
             idList.add(userLink.getId());
         });
@@ -869,8 +885,11 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
             userLink.setBusinessId(processFbConsultationUserLink.getBusinessId());
             userLink.setBusinessId(processInfoVO.getBusinessId());
             userLink.setDepartLeaderId(processFbConsultationUserLink.getDepartLeaderId());
+            userLink.setOriginDepartLeaderId(processFbConsultationUserLink.getOriginDepartLeaderId());
             userLink.setModuleOwnerId(processFbConsultationUserLink.getModuleOwnerId());
+            userLink.setOriginModuleOwnerId(processFbConsultationUserLink.getOriginModuleOwnerId());
             userLink.setDesignEngineerId(designEngineer);
+            userLink.setOriginDesignEngineerId(designEngineer);
             userLink.setParentExecutionId(processFbConsultationUserLink.getParentExecutionId());
             userLinkList.add(userLink);
             idList.add(userLink.getId());
@@ -1037,6 +1056,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
         String processInstanceId = task.getProcessInstanceId();
 
         LambdaQueryWrapper<ProcessFbConsultationUserLink> removeWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotBlank(userLink.getId())){
+            removeWrapper.eq(ProcessFbConsultationUserLink::getId, userLink.getId());
+        }
         removeWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, processInfoVO.getBusinessId());
         removeWrapper.eq(ProcessFbConsultationUserLink::getDepartLeaderId, CurrentUserUtil.getId());
         processFbConsultationUserLinkService.remove(removeWrapper); // 删除原先存储的关联
@@ -1053,6 +1075,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
                 link.setUserType(FbCommon.USER_TYPE_MODULE_OWNER);
                 link.setBusinessId(processInfoVO.getBusinessId());
                 link.setDepartLeaderId(CurrentUserUtil.getId());
+                link.setOriginDepartLeaderId(userLink.getOriginDepartLeaderId());
                 link.setModuleOwnerId(moduleOwnerId);
                 linkList.add(link);
             });
@@ -1070,7 +1093,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
                 link.setUserType(FbCommon.USER_TYPE_DESIGN_ENGINEER);
                 link.setBusinessId(processInfoVO.getBusinessId());
                 link.setDepartLeaderId(CurrentUserUtil.getId());
+                link.setOriginDepartLeaderId(userLink.getOriginDepartLeaderId());
                 link.setDesignEngineerId(designEngineerId);
+                link.setOriginDesignEngineerId(userLink.getOriginDesignEngineerId());
                 linkList.add(link);
             });
             processFbConsultationUserLinkService.saveBatch(linkList, linkList.size());
@@ -1094,6 +1119,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
         ProcessFbConsultationUserLink userLink = businessInfoDTO.getProcessFbConsultationUserLink(); // 业务分派信息
 
         LambdaQueryWrapper<ProcessFbConsultationUserLink> removeWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotBlank(userLink.getId())){
+            removeWrapper.eq(ProcessFbConsultationUserLink::getId, userLink.getId());
+        }
         removeWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, processInfoVO.getBusinessId());
         removeWrapper.eq(ProcessFbConsultationUserLink::getDepartLeaderId, CurrentUserUtil.getId());
         processFbConsultationUserLinkService.remove(removeWrapper); // 删除原先存储的关联
@@ -1107,6 +1135,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
                 link.setUserType(FbCommon.USER_TYPE_MODULE_OWNER);
                 link.setBusinessId(processInfoVO.getBusinessId());
                 link.setDepartLeaderId(CurrentUserUtil.getId());
+                link.setOriginDepartLeaderId(userLink.getOriginDepartLeaderId());
                 link.setModuleOwnerId(moduleOwnerId);
                 linkList.add(link);
             });
@@ -1119,7 +1148,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
                 link.setUserType(FbCommon.USER_TYPE_DESIGN_ENGINEER);
                 link.setBusinessId(processInfoVO.getBusinessId());
                 link.setDepartLeaderId(CurrentUserUtil.getId());
+                link.setOriginDepartLeaderId(userLink.getOriginDepartLeaderId());
                 link.setDesignEngineerId(designEngineerId);
+                link.setOriginDesignEngineerId(userLink.getOriginDesignEngineerId());
                 linkList.add(link);
             });
             processFbConsultationUserLinkService.saveBatch(linkList, linkList.size());