From 125c92aab882f027491c5bf8df28ec4baf76f788 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 6 Sep 2022 23:14:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E5=9C=B0?=
 =?UTF-8?q?=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

---
 .../com/elink/esua/epdc/dto/SysDeptDTO.java   | 12 ++++++++++
 .../item/service/impl/ItemServiceImpl.java    | 24 +++++++++++--------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
index 38ac7d499..4877ba59f 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
@@ -96,6 +96,10 @@ public class SysDeptDTO extends TreeNode implements Serializable {
      */
     private String infoCode;
 
+    /**地区编码
+     */
+    private String areaCode;
+
     public String getPartyCode() {
         return partyCode;
     }
@@ -203,4 +207,12 @@ public class SysDeptDTO extends TreeNode implements Serializable {
     public void setInfoCode(String infoCode) {
         this.infoCode = infoCode;
     }
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
 }
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 aa88ad356..e303924b7 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
@@ -1505,6 +1505,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             if("1".equals(itemEntity.getPeopleFlag())){
                 //事件来源
                 sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_FZ);
+                //事件描述
+                sendDto.setSJMS("测试事件，请勿处理"+itemEntity.getItemContent());//
             }else{
                 //事件描述
                 sendDto.setSJMS("测试事件，请勿处理"+getItemLawContent(itemEntity.getId()));
@@ -1520,7 +1522,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 throw new RenException("根据街道ID获取对应的街道编码失败" + streetResult.getMsg());
             }
             //所属街道
-            sendDto.setSSJD(deptInfo.getInfoCode());
+            sendDto.setSSJD(deptInfo.getAreaCode());
             //所属社区
             sendDto.setSSSQ("");//deptInfo.getCommunityInfoCode()
         }else{
@@ -1553,16 +1555,18 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         sendDto.setUID(UUID.randomUUID().toString().trim().replaceAll("-", ""));
 
         //事件领域
-        Integer lingYu = Integer.valueOf(itemEntity.getFirstCategoryCode());
-        if(lingYu < 10){
-            sendDto.setSJLYU("0"+itemEntity.getFirstCategoryCode());
-        }else{
-            sendDto.setSJLYU(itemEntity.getFirstCategoryCode());
-        }
-        log.info("处理项目-事件大类");
+//        Integer lingYu = Integer.valueOf(itemEntity.getFirstCategoryCode());
+//        if(lingYu < 10){
+//            sendDto.setSJLYU("0"+itemEntity.getFirstCategoryCode());
+//        }else{
+//            sendDto.setSJLYU(itemEntity.getFirstCategoryCode());
+//        }
+//        log.info("处理项目-事件大类");
         //事件大类
-        String secondCate = baseDao.selectSecondCateByItemId(itemEntity.getId());
-        lbHandle(sendDto,secondCate);
+//        String secondCate = baseDao.selectSecondCateByItemId(itemEntity.getId());
+//        lbHandle(sendDto,secondCate);
+        sendDto.setSJLYU("01");
+        sendDto.setSJDL("0104");
 
         //诉求联系人及联系方式
         Result<UserDTO> userResult =  userInfoFeignClient.getUserInfoById(itemEntity.getUserId());