议题项目处理表添加操作人部门信息

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java

@@ -25,4 +25,8 @@ public class ItemHandleProgressResultDTO implements Serializable {
      * 意见
      */
     private String advice;
+    /**
+     * 操作人部门
+     */
+    private String handlerDeptName;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.EventIssueItemState;
@@ -166,6 +168,9 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
             issueHandleEntity.setIssueId(issueEntity.getId());
             issueHandleEntity.setState(EventIssueItemState.ISSUE_HANDLED_PASS);
             issueHandleEntity.setAdvice(dto.getAdvice());
+            UserDetail user = SecurityUser.getUser();
+            issueHandleEntity.setHandlerDeptId(user.getDeptId());
+            issueHandleEntity.setHandlerDept(user.getDeptName());
             issueHandleService.insert(issueHandleEntity);
 
             informationFormDTO.setBusinessId(issueEntity.getId());

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueHandleEntity.java

@@ -53,4 +53,13 @@ public class IssueHandleEntity extends BaseEpdcEntity {
      */
 	private String advice;
 
+	/**
+	 * 操作人部门ID
+	 */
+	private long handlerDeptId;
+	/**
+	 * 操作人部门
+	 */
+	private String handlerDept;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -152,6 +153,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         handleEntity.setAdvice(dto.getAdvice());
         handleEntity.setState(dto.getState());
         handleEntity.setIssueId(dto.getId());
+        UserDetail user = SecurityUser.getUser();
+        handleEntity.setHandlerDeptId(user.getDeptId());
+        handleEntity.setHandlerDept(user.getDeptName());
 
         IssueEntity issueEntity = new IssueEntity();
         issueEntity.setId(dto.getId());
@@ -190,7 +194,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                 itemHandleProcessEntity.setState(EventIssueItemState.ITEM_HANDLING);
                 itemHandleProcessEntity.setHandleAdvice(dto.getAdvice());
                 itemHandleProcessEntity.setOutHandleAdvice(dto.getAdvice());
-                itemHandleProcessEntity.setHandlerDeptId(SecurityUser.getDeptId());
+                itemHandleProcessEntity.setHandlerDeptId(user.getDeptId());
+                itemHandleProcessEntity.setHandlerDept(user.getDeptName());
                 itemHandleProcessService.insert(itemHandleProcessEntity);
                 // 插入项目部门关联表
                 ItemDeptEntity itemDeptEntity = new ItemDeptEntity();

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemHandleProcessEntity.java

@@ -61,4 +61,9 @@ public class ItemHandleProcessEntity extends BaseEpdcEntity {
      */
 	private long handlerDeptId;
 
+	/**
+	 * 操作人部门
+	 */
+	private String handlerDept;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -392,6 +392,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Transactional(rollbackFor = Exception.class)
     public Result modifyHandleResult(ItemHandleSubmitFormDTO dto) {
         try {
+            UserDetail user = SecurityUser.getUser();
             ItemEntity entity = baseDao.selectById(dto.getId());
             // 组装发送消息内容
             EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
@@ -404,6 +405,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             informationFormDTO.setRelBusinessContent("项目："+entity.getItemContent());
 
             ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity();
+            handleProcessEntity.setHandlerDeptId(user.getDeptId());
+            handleProcessEntity.setHandlerDept(user.getDeptName());
             if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) {
                 // 项目流转校验
                 Result checkResult = this.checkItemCirculation(dto);
@@ -438,7 +441,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             handleProcessEntity.setItemId(dto.getId());
             handleProcessEntity.setHandleAdvice(dto.getHandleAdvice());
             handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice());
-            handleProcessEntity.setHandlerDeptId(SecurityUser.getDeptId());
+            handleProcessEntity.setHandlerDeptId(user.getDeptId());
             itemHandleProcessService.insert(handleProcessEntity);
 
             // 发送消息

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -287,6 +287,7 @@
         SELECT
             CREATED_TIME AS createdTime,
             advice,
+            HANDLER_DEPT_NAME AS handlerDeptName,
             CASE STATE WHEN 0 THEN '【审核通过】' WHEN 1 THEN '【反馈】' WHEN 2 THEN '【已关闭】' ELSE '' END AS progressName
         FROM
             epdc_issue_handle