Merge remote-tracking branch 'origin/feature/hotfix_shangbao' into feature/hotfix_shangbao

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

@@ -2189,6 +2189,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark());
             }
             Result<DeptInfoCodeDTO> deptResult = adminFeignClient.getDeptInfoCode(itemEntity.getGridId());
+
             DeptInfoCodeDTO deptInfo = deptResult.getData();
             if (deptInfo == null) {
                 throw new RenException("根据网格ID获取对应的社区编码、街道编码失败" + deptResult.getMsg());
@@ -2297,7 +2298,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
         //查询所对应的大类
         CategoryEntity thirdCate = categoryDao.selectById(thirdId);
-        if (null == thirdCate) {
+        if (null == thirdCate || StringUtils.isBlank(thirdCate.getEventCategoryCode())) {
             sendDto.setSJLYU("21");
             sendDto.setSJDL("2199");
             return;
@@ -3608,6 +3609,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             try {
                 sendResult = this.reportCaseNew(dto);
             } catch (Exception e) {
+                log.error("上报网格化平台接口失败:" + e.getMessage());
                 throw new RenException("上报网格化平台接口失败" + sendResult.getMessage());
             }
             if (!"0".equals(sendResult.getCode())) {

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -1365,23 +1365,23 @@
             closedTable.closedNum,
             noticeTable.noticeNum
         FROM (
-                       SELECT
-                           'ITEM_COUNT' AS keystr,
-                           COUNT( * ) AS pendingHandleNum
-                       FROM
-                           epdc_item item
-                           LEFT JOIN epdc_item_dept dept ON item.id = dept.ITEM_ID
-                           AND dept.DEL_FLAG = '0'
-                       WHERE
-                           item.DEL_FLAG = '0'
-                           AND item.ITEM_STATE = '0'
-                           AND dept.DEPT_ID IN
-                    <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
-                        #{deptIdItem}
-                    </foreach>
-                    <if test='deptId != null and deptId != ""'>
-                        AND dept.DEPT_ID = #{deptId}
-                    </if>
+            SELECT
+            'ITEM_COUNT' AS keystr,
+            COUNT( * ) AS pendingHandleNum
+            FROM
+            epdc_item item
+            LEFT JOIN epdc_item_dept dept ON item.id = dept.ITEM_ID
+            AND dept.DEL_FLAG = '0'
+            WHERE
+            item.DEL_FLAG = '0'
+            AND item.ITEM_STATE = '0'
+            AND dept.DEPT_ID IN
+            <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+                #{deptIdItem}
+            </foreach>
+            <if test='deptId != null and deptId != ""'>
+                AND dept.DEPT_ID = #{deptId}
+            </if>
 
 	    ) pendingTable
 	    INNER JOIN (