北尚诉办-补充部门编码结果

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/CompleteDeptDTO.java

@@ -32,6 +32,10 @@ public class CompleteDeptDTO implements Serializable {
      * 街道ID
      */
     private Long streetId;
+    /**
+     * 社区-市中心区划编码
+     */
+    private String streetDisCenterZoningCode;
     /**
      * 社区
      */
@@ -40,6 +44,10 @@ public class CompleteDeptDTO implements Serializable {
      * 社区ID
      */
     private Long communityId;
+    /**
+     * 社区-市中心区划编码
+     */
+    private String communityDisCenterZoningCode;
     /**
      * 网格
      */

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -60,8 +60,10 @@
             dis.id districtId,
             str.`name` street,
             str.id streetId,
+            str.dis_center_zoning_code as streetDisCenterZoningCode,
             com.`name` community,
             com.id communityId,
+            com.dis_center_zoning_code as  communityDisCenterZoningCode,
             gri.`name` grid,
             gri.id gridId
         FROM

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java

@@ -114,4 +114,14 @@ public class CategoryEntity extends BaseEntity {
 	 */
 	private String enableFlag;
 
+	/**
+	 * 事件大类名称
+	 */
+	private String eventCategoryName;
+
+	/**
+	 * 事件大类值
+	 */
+	private String eventCategoryCode;
+
 }

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

@@ -76,6 +76,7 @@ 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;
 import com.elink.esua.epdc.modules.async.NewsTask;
+import com.elink.esua.epdc.modules.category.dao.CategoryDao;
 import com.elink.esua.epdc.modules.category.entity.CategoryEntity;
 import com.elink.esua.epdc.modules.category.service.CategoryService;
 import com.elink.esua.epdc.modules.events.dao.ImgDao;
@@ -194,6 +195,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Autowired
     private CategoryService categoryService;
 
+    @Autowired
+    private CategoryDao categoryDao;
+
     @Autowired
     private PushToCityGridServiceImpl pushToCityGridServiceImpl;
 
@@ -1927,8 +1931,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         //事件大类
 //        String secondCate = baseDao.selectSecondCateByItemId(itemEntity.getId());
 //        lbHandle(sendDto,secondCate);
-        sendDto.setSJLYU("01");
+        //组装事件领域和事件大类
-        sendDto.setSJDL("0104");
+        setItemCategoryInfo(sendDto,itemEntity);
 
         //诉求联系人及联系方式
 //        Result<UserDTO> userResult =  userInfoFeignClient.getUserInfoById(itemEntity.getUserId());
@@ -1960,6 +1964,38 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return sendDto;
     }
 
+    /**
+    * @describe: 组装事件领域和事件大类
+    * @author wangtong
+    * @date 2022/9/23 17:03
+    * @params [sendDto, itemEntity]
+    * @return void
+    */
+    private void setItemCategoryInfo(SendEventFormDto sendDto, ItemEntity itemEntity) {
+        CategoryEntity cate = categoryDao.selectById(itemEntity.getCategoryCode());
+        if(null == cate){
+            sendDto.setSJLYU("01");
+            sendDto.setSJDL("0104");
+            return;
+        }
+        //诉求所属分类为领域或者大类
+        if(StringUtils.isNotBlank(cate.getEventCategoryCode())){
+            String sjly = cate.getEventCategoryCode();
+            if(sjly.length()==2){
+                //赋值领域
+                sendDto.setSJLYU(sjly);
+                return;
+            } else if(sjly.length()==4){
+                //赋值领域、大类
+                sendDto.setSJLYU(sjly.substring(0,2));
+                sendDto.setSJDL(sjly);
+                return;
+            }
+        }
+        //诉求所属分类为更低级，或者为领域或者大类但是没有相关编码
+        //取第三
+    }
+
     /**
     * @describe: 组装驳回重办数据
     * @author wangtong