项目插入响应表

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/async/DeptRespondTask.java

@@ -7,8 +7,10 @@ import com.elink.esua.epdc.constant.EventIssueItemState;
 import com.elink.esua.epdc.constant.EventsNoticeConstant;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueWaitHandleSubmitFormDTO;
+import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO;
 import com.elink.esua.epdc.dto.log.DeptRespondLogDTO;
 import com.elink.esua.epdc.enums.DeptRespondTypeEnum;
+import com.elink.esua.epdc.enums.ItemHandleCategoryEnum;
 import com.elink.esua.epdc.enums.ReferenceTypeEnum;
 import com.elink.esua.epdc.modules.issue.service.IssueService;
 import com.elink.esua.epdc.modules.log.entity.DeptRespondLogEntity;
@@ -31,8 +33,7 @@ public class DeptRespondTask {
     private DeptRespondLogService deptRespondLogService;
 
     /***
-     *  转议题插入部门响应记录
-     *  通过不通过
+     *  转议题插入部门响应记录  4-事件-审核通过   2-事件-驳回
      * @param dto
      * @return void
      * @author qushutong
@@ -63,7 +64,7 @@ public class DeptRespondTask {
     }
 
     /***
-     * 议事处理审核/关闭
+     * 议事处理审核/关闭 1-反馈，2-关闭，4-已转项目 不是这三种状态不作响应
      * @param dto
      * @return void
      * @author qushutong
@@ -71,6 +72,10 @@ public class DeptRespondTask {
      */
     @Async
     public void saveIssueDeptRespond(IssueWaitHandleSubmitFormDTO dto) {
+        //1-反馈，2-关闭，4-已转项目 不是这三种状态不作响应
+        if (EventIssueItemState.ISSUE_CLOSED != dto.getState() || EventIssueItemState.ISSUE_HANDLED_FEEDBACK != dto.getState() || EventIssueItemState.ISSUE_CHANGE_TO_ITEM != dto.getState()) {
+            return;
+        }
         //组装插入数据
         DeptRespondLogEntity entity = new DeptRespondLogEntity();
         UserDetail user = SecurityUser.getUser();
@@ -93,4 +98,41 @@ public class DeptRespondTask {
         DeptRespondLogDTO deptRespondLogDTO = ConvertUtils.sourceToTarget(entity, DeptRespondLogDTO.class);
         deptRespondLogService.save(deptRespondLogDTO);
     }
+
+
+    /***
+     * 项目 处理方式：0 处理，1 流转协助，5 关闭，10 结案
+     * @param  dto
+     * @return void
+     * @author qushutong
+     * @date 2019/10/22 16:03
+     */
+    @Async
+    public void saveItemDeptRespond(ItemHandleSubmitFormDTO dto) {
+        //组装插入数据
+        DeptRespondLogEntity entity = new DeptRespondLogEntity();
+        UserDetail user = SecurityUser.getUser();
+        entity.setReferenceId(dto.getId());
+        entity.setReferenceType(ReferenceTypeEnum.ITEM.getName());
+        entity.setRespondDeptId(user.getDeptId());
+        entity.setRespondTime(new Date());
+        //流转
+        if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) {
+            entity.setRespondType(DeptRespondTypeEnum.ITEM_CIRCULATION_ASSISTANCE.getValue());
+        }
+        //关闭
+        else if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory()) {
+            entity.setRespondType(DeptRespondTypeEnum.ITEM_HANDLED_CLOSE.getValue());
+        }
+        //结案
+        else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) {
+            entity.setRespondType(DeptRespondTypeEnum.ITEM_HANDLED_END.getValue());
+        }
+        //处理
+        else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) {
+            entity.setRespondType(DeptRespondTypeEnum.ITEM_I_HANDLE.getValue());
+        }
+        DeptRespondLogDTO deptRespondLogDTO = ConvertUtils.sourceToTarget(entity, DeptRespondLogDTO.class);
+        deptRespondLogService.save(deptRespondLogDTO);
+    }
 }

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

@@ -43,6 +43,7 @@ import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.enums.ItemHandleCategoryEnum;
+import com.elink.esua.epdc.modules.async.DeptRespondTask;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
 import com.elink.esua.epdc.modules.feign.AdminFeignClient;
@@ -91,6 +92,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Autowired
     private NewsTask newsTask;
 
+    @Autowired
+    private DeptRespondTask deptRespondTask;
+
     @Override
     public PageData<ItemDTO> page(Map<String, Object> params) {
         IPage<ItemEntity> page = baseDao.selectPage(
@@ -447,7 +451,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice());
             handleProcessEntity.setHandlerDeptId(user.getDeptId());
             itemHandleProcessService.insert(handleProcessEntity);
-
+            //插入部门响应表
+            deptRespondTask.saveItemDeptRespond(dto);
             // 发送消息
             newsTask.insertUserInformation(informationFormDTO);
         } catch (Exception e) {