From 8403f743ba7e6adeba7c01f5af767f8ae622d8c9 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 6 Sep 2022 21:54:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?=
 =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E7=BC=96=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/SysDeptDao.xml                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
index c0fec51f8..46ab0f799 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
@@ -432,8 +432,8 @@
     </select>
     <select id="selectDeptInfoCode" resultType="com.elink.esua.epdc.dto.DeptInfoCodeDTO">
         select g.id as gridId,g.name as gridName,
-                     c.id as communityId,c.name as communityName,c.info_code as communityInfoCode,
-                     s.id as streetId,s.name as streetName,s.info_code as streetInfoCode
+                     c.id as communityId,c.name as communityName,c.area_code as communityInfoCode,
+                     s.id as streetId,s.name as streetName,s.area_code as streetInfoCode
         from sys_dept g
         left join sys_dept c on g.pid=c.id
         left join sys_dept s on c.pid=s.id

From 9f2aac22335c2464cf0e1b04551d57ca8dca5bd9 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 6 Sep 2022 22:04:17 +0800
Subject: [PATCH 2/2] buchong

---
 esua-epdc/epdc-cloud-commons-shibei           |  2 +-
 .../ItemGridPlatformHandleStatusEnum.java     |  3 +
 .../item/service/impl/ItemServiceImpl.java    | 55 +++++++++++++++----
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei
index 66154aa34..f694c0262 160000
--- a/esua-epdc/epdc-cloud-commons-shibei
+++ b/esua-epdc/epdc-cloud-commons-shibei
@@ -1 +1 @@
-Subproject commit 66154aa34097995cc8411ae3ede7179ba3c1d182
+Subproject commit f694c0262c4675a2b28eb2148cf952bf8417be87
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java
index 01fc9f817..a349202d3 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java
@@ -27,6 +27,9 @@ public enum ItemGridPlatformHandleStatusEnum {
 	HANDLE_PZ(70, "批转"),
 	HANDLE_TD(75, "退单"),
 	HANDLE_BJ(80, "办结"),
+	HANDLE_XFHC(1062, "下发核查"),
+	HANDLE_CZWC(1063, "处置完成"),
+	HANDLE_DB(1064, "督办"),
 	HANDLE_BH(1065, "驳回"),
 	HANDLE_CX(1066, "撤消办理");
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index 7f23c6bbf..aa88ad356 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -1551,6 +1551,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
         //推送端记录唯一标识
         sendDto.setUID(UUID.randomUUID().toString().trim().replaceAll("-", ""));
+
         //事件领域
         Integer lingYu = Integer.valueOf(itemEntity.getFirstCategoryCode());
         if(lingYu < 10){
@@ -1561,17 +1562,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         log.info("处理项目-事件大类");
         //事件大类
         String secondCate = baseDao.selectSecondCateByItemId(itemEntity.getId());
-        if(StringUtils.isNotBlank(secondCate)){
-            if(secondCate.length()==3){
-                sendDto.setSJDL("0"+secondCate);
-            }else{
-                sendDto.setSJDL(secondCate);
-            }
-        }
-        //事件小类
-        sendDto.setSJXL("");
-        //事件细类
-        sendDto.setSJXIL("");
+        lbHandle(sendDto,secondCate);
 
         //诉求联系人及联系方式
         Result<UserDTO> userResult =  userInfoFeignClient.getUserInfoById(itemEntity.getUserId());
@@ -2583,5 +2574,47 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return new Result().ok("操作成功");
     }
 
+    /**
+     * 领域类别处理
+     *
+     * @param
+     * @return void
+     * @author zhy
+     * @date 2022/9/6 21:14
+     */
+    private void lbHandle(SendEventFormDto dto,String secondCategory){
+        if(StringUtils.isNotBlank(secondCategory)){
+            int length =secondCategory.length();
+            if(length % 2 == 0){
+                // 偶数
+            }else {
+                // 奇数
+                secondCategory = "0"+secondCategory;
+            }
+            if(length>2){
+                // 每隔2位加一个逗号
+                secondCategory= secondCategory.replaceAll("(.{2})", "$1,");
+                String[] categoryList = secondCategory.split(",");
+                if(categoryList.length==NumConstant.TWO){
+                    // 事件大类
+                    dto.setSJDL(categoryList[1]);
+                }else if(categoryList.length==NumConstant.THREE){
+                    // 事件大类
+                    dto.setSJDL(categoryList[1]);
+                    //事件小类
+                    dto.setSJXL(categoryList[2]);
+                }else if(categoryList.length==NumConstant.FOUR){
+                    // 事件大类
+                    dto.setSJDL(categoryList[1]);
+                    //事件小类
+                    dto.setSJXL(categoryList[2]);
+                    //事件细类
+                    dto.setSJXIL(categoryList[3]);
+                }
+
+            }
+
+        }
+    }
 
 }