【事件上报】-【获取事件处理进度 本地业务调整】-（王童）-2020/12/17

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml

@@ -370,7 +370,12 @@
                              WHEN eih.STATE =  45 THEN '网格化平台-处理'
                              WHEN eih.STATE =  50 THEN '网格化平台-中间督办'
                              WHEN eih.STATE =  55 THEN '网格化平台-催办'
-                             WHEN eih.STATE =  60 THEN '网格化平台-结案' end from esua_epdc_events.epdc_item_handle_process eih
+                             WHEN eih.STATE =  60 THEN '网格化平台-结案'
+                             WHEN eih.STATE =  65 THEN '网格化平台-办理'
+                             WHEN eih.STATE =  70 THEN '网格化平台-批转'
+                             WHEN eih.STATE =  75 THEN '网格化平台-退单'
+                             WHEN eih.STATE =  80 THEN '网格化平台-办结'
+                             end from esua_epdc_events.epdc_item_handle_process eih
 				where eih.DEL_FLAG=0 and eih.ITEM_ID=ei.ID order by CREATED_TIME desc,id limit 1) as latestOperateDesc,
 	            DATE_FORMAT(now(),'%Y%m%d') as dataEndTime,
 				d.pids as allParentIds

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java

@@ -1,10 +1,5 @@
 package com.elink.esua.epdc.enums;
 
-import com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO;
-
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @Auther: yinzuomei
  * @Date: 2019/12/25 15:44
@@ -14,13 +9,26 @@ public enum ItemGridPlatformHandleStatusEnum {
 	HANDLE_SB(15, "上报"),
 	HANDLE_SL(20, "受理"),
 	HANDLE_LA(25, "立案"),
-	HANDLE_PQ(30, "派遣"),
+//	HANDLE_PQ(30, "派遣"),
-	HANDLE_ZJZP(35, "中间再派遣"),
+//	HANDLE_ZJZP(35, "中间再派遣"),
 	HANDLE_JD(40, "接单"),
-	HANDLE_CL(45, "处理"),
+//	HANDLE_CL(45, "处理"),
 	HANDLE_ZJDB(50, "中间督办"),
 	HANDLE_CB(55, "催办"),
-	HANDLE_JA(60, "结案");
+	HANDLE_JA(60, "结案"),
+
+	//**********新版状态**********
+
+	HANDLE_BL(65, "办理"),
+	HANDLE_PQ(30, "派遣"),
+	HANDLE_ZJZP(35, "再派遣"),
+	HANDLE_CL(45, "处置完成"),
+	HANDLE_PZ(70, "批转"),
+	HANDLE_TD(75, "退单"),
+	HANDLE_BJ(80, "办结");
+
+
+
 
 	private int value;
 	private String name;

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/GridPlatformHandleLogExcel.java

@@ -37,7 +37,7 @@ public class GridPlatformHandleLogExcel {
     @Excel(name = "网格化平台项目关系表ID")
     private String itemGridPlatformId;
 
-    @Excel(name = "状态 15-网格化平台-上报，20-网格化平台-受理，25-网格化平台-立案，30-网格化平台-派遣，35-网格化平台-中间再派，40-网格化平台-接单，45-网格化平台-处理，50-网格化平台-中间督办，55-网格化平台-催办，55-网格化平台-结案")
+    @Excel(name = "状态 15-网格化平台-上报，20-网格化平台-受理，25-网格化平台-立案，30-网格化平台-派遣，35-网格化平台-中间再派，40-网格化平台-接单，45-网格化平台-处理，50-网格化平台-中间督办，55-网格化平台-催办，55-网格化平台-结案，65-网格化平台-办理，70-网格化平台-批转，75-网格化平台-退单，80-网格化平台-办结")
     private Integer status;
 
     @Excel(name = "项目处理表ID")

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemGridPlatformExcel.java

@@ -43,7 +43,7 @@ public class ItemGridPlatformExcel {
     @Excel(name = "上报人部门ID")
     private Integer reportPersonDeptId;
 
-    @Excel(name = "状态 15-网格化平台-上报，20-网格化平台-受理，25-网格化平台-立案，30-网格化平台-派遣，35-网格化平台-中间再派，40-网格化平台-接单，45-网格化平台-处理，50-网格化平台-中间督办，55-网格化平台-催办，55-网格化平台-结案")
+    @Excel(name = "状态 15-网格化平台-上报，20-网格化平台-受理，25-网格化平台-立案，30-网格化平台-派遣，35-网格化平台-中间再派，40-网格化平台-接单，45-网格化平台-处理，50-网格化平台-中间督办，55-网格化平台-催办，55-网格化平台-结案，65-网格化平台-办理，70-网格化平台-批转，75-网格化平台-退单，80-网格化平台-办结")
     private Integer status;
 
     @Excel(name = "乐观锁")

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

@@ -61,12 +61,13 @@ import com.elink.esua.epdc.gird.shibei.api.ShiBeiCityGridApi;
 import com.elink.esua.epdc.gird.shibei.constant.CommonConstants;
 import com.elink.esua.epdc.gird.shibei.contants.ApiConstants;
 import com.elink.esua.epdc.gird.shibei.dto.GridDto;
-import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdDto;
 import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdItemDto;
 import com.elink.esua.epdc.gird.shibei.dto.form.ImageFile;
 import com.elink.esua.epdc.gird.shibei.dto.form.ReportFile;
 import com.elink.esua.epdc.gird.shibei.dto.form.SendEventFormDto;
 import com.elink.esua.epdc.gird.shibei.dto.form.SendInputInfoFormDto;
+import com.elink.esua.epdc.gird.shibei.dto.result.EventProcessHisResultDto;
+import com.elink.esua.epdc.gird.shibei.dto.result.EventProcessResultDto;
 import com.elink.esua.epdc.gird.shibei.dto.result.SendEventResultDto;
 import com.elink.esua.epdc.gird.shibei.util.XstreamUtil;
 import com.elink.esua.epdc.modules.async.IssueOverseeResultsTask;
@@ -1089,7 +1090,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
-    * @describe: 新版时间上报
+    * @describe: 新版事件上报
     * @author wangtong
     * @date 2020/12/16 10:45
     * @params [dto]
@@ -1373,13 +1374,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         // 拉取处理情况
         for (ItemGridPlatformDTO dto :
                 gridPlatformDTOList) {
-            SearchCaseProcessByTaskIdDto searchResultDot = shiBeiCityGridApi.searchCaseProcessByTaskId(dto.getTaskid());
+            EventProcessHisResultDto processHistory = shiBeiCityGridApi.getHistoryByRecId(dto.getTaskid());
             String successFlag = YesOrNoEnum.NO.value();
             String returnMsgBody = "";
-            if (null != searchResultDot) {
+            if (null != processHistory) {
                 successFlag = YesOrNoEnum.YES.value();
-                returnMsgBody = XstreamUtil.objectToXml(searchResultDot);
+                returnMsgBody = XstreamUtil.objectToXml(processHistory);
-                List<SearchCaseProcessByTaskIdItemDto> progressList = searchResultDot.getRequest();
+                List<EventProcessResultDto> progressList = processHistory.getHISTORY();
                 if (null != progressList && progressList.size() > 0) {
                     // 删除已有处理记录
                     this.removeOldHandleProcess(dto.getId());
@@ -1431,22 +1432,22 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      * @author liuchuang
      * @since 2019/12/25 19:27
      */
-    private void insertNewHandleProcess(List<SearchCaseProcessByTaskIdItemDto> progressList, String itemId, String itemGridPlatformId) {
+    private void insertNewHandleProcess(List<EventProcessResultDto> progressList, String itemId, String itemGridPlatformId) {
 
         try {
-            for (SearchCaseProcessByTaskIdItemDto dto :
+            for (EventProcessResultDto dto :
                     progressList) {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-                Date insertTime = sdf.parse(dto.getInserttime());
+                Date insertTime = sdf.parse(dto.getCREATEDATE());
                 String itemHandleProcessId = UUID.randomUUID().toString().replaceAll("-", "");
                 // 插入项目处理进度表
                 ItemHandleProcessDTO itemHandleProcessDto = new ItemHandleProcessDTO();
                 itemHandleProcessDto.setId(itemHandleProcessId);
                 itemHandleProcessDto.setItemId(itemId);
-                itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.getValueByName(dto.getItemname()));
+                itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.getValueByName(dto.getTASKCNNAME()));
-                itemHandleProcessDto.setHandleAdvice(dto.getNote());
+                itemHandleProcessDto.setHandleAdvice(dto.getTASKDESC());
-                itemHandleProcessDto.setOutHandleAdvice(dto.getNote());
+                itemHandleProcessDto.setOutHandleAdvice(dto.getTASKDESC());
-                itemHandleProcessDto.setHandlerDept(dto.getDeptname());
+                itemHandleProcessDto.setHandlerDept("网格化平台");
                 itemHandleProcessDto.setCreatedTime(insertTime);
                 itemHandleProcessDto.setUpdatedTime(insertTime);
                 itemHandleProcessService.saveItemHandleProcess(itemHandleProcessDto);
@@ -1455,10 +1456,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 GridPlatformHandleLogEntity gridPlatformHandleLogEntity = new GridPlatformHandleLogEntity();
                 gridPlatformHandleLogEntity.setItemGridPlatformId(itemGridPlatformId);
                 gridPlatformHandleLogEntity.setItemHandleProcessId(itemHandleProcessId);
-                gridPlatformHandleLogEntity.setStatus(ItemGridPlatformHandleStatusEnum.getValueByName(dto.getItemname()));
+                gridPlatformHandleLogEntity.setStatus(ItemGridPlatformHandleStatusEnum.getValueByName(dto.getTASKCNNAME()));
-                gridPlatformHandleLogEntity.setHandler(dto.getUsername());
+                gridPlatformHandleLogEntity.setHandler(dto.getPARTNAME());
-                gridPlatformHandleLogEntity.setHandlingOpinions(dto.getNote());
+                gridPlatformHandleLogEntity.setHandlingOpinions(dto.getTASKDESC());
-                gridPlatformHandleLogEntity.setHandlingDept(dto.getDeptname());
+                gridPlatformHandleLogEntity.setHandlingDept("网格化平台");
                 gridPlatformHandleLogEntity.setHandlingTime(insertTime);
                 gridPlatformHandleLogService.insert(gridPlatformHandleLogEntity);
             }
@@ -1477,7 +1478,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         // 保存网格化平台处理记录
         SearchCaseProcessByTaskIdItemDto taskDto = ConvertUtils.sourceToTarget(formDto, SearchCaseProcessByTaskIdItemDto.class);
-        this.insertNewHandleProcess(Collections.singletonList(taskDto), platformDto.getReferenceId(), platformDto.getId());
+//        this.insertNewHandleProcess(Collections.singletonList(taskDto), platformDto.getReferenceId(), platformDto.getId());
 
         return new Result();
     }

esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java

@@ -9,13 +9,25 @@ public enum ItemGridPlatformHandleStatusEnum {
 	HANDLE_SB(15, "上报"),
 	HANDLE_SL(20, "受理"),
 	HANDLE_LA(25, "立案"),
-	HANDLE_PQ(30, "派遣"),
+//	HANDLE_PQ(30, "派遣"),
-	HANDLE_ZJZP(35, "中间再派"),
+//	HANDLE_ZJZP(35, "中间再派"),
 	HANDLE_JD(40, "接单"),
-	HANDLE_CL(45, "处理"),
+//	HANDLE_CL(45, "处理"),
 	HANDLE_ZJDB(50, "中间督办"),
 	HANDLE_CB(55, "催办"),
-	HANDLE_JA(60, "结案");
+	HANDLE_JA(60, "结案"),
+
+	//**********新版状态**********
+
+	HANDLE_BL(65, "办理"),
+	HANDLE_PQ(30, "派遣"),
+	HANDLE_ZJZP(35, "再派遣"),
+	HANDLE_CL(45, "处置完成"),
+	HANDLE_PZ(70, "批转"),
+	HANDLE_TD(75, "退单"),
+	HANDLE_BJ(80, "办结");
+
+
 
 	private int value;
 	private String name;