补充执法发展的alldeptid

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

@@ -508,6 +508,18 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         itemEntity.setDistributeTime(new Date());
         itemEntity.setGrid("执法诉求" + userDetail.getDeptName());
         itemEntity.setGridId(userDetail.getDeptId());
+
+        Result<SysDeptDTO> deptResult = adminFeignClient.getSysDeptInfo(userDetail.getDeptId());
+        if (deptResult.success()) {
+            // 因为是街道账号，所以上级一定是市北区委
+            Long pids = deptResult.getData().getId();
+            String pnames = deptResult.getData().getName();
+            itemEntity.setParentDeptIds(pids + "");
+            itemEntity.setParentDeptNames(pnames);
+            itemEntity.setAllDeptIds(pids + "," + userDetail.getDeptId());
+            itemEntity.setAllDeptNames(pnames + "-" + userDetail.getDeptName());
+        }
+
         itemEntity.setItemContent(formDto.getLawContent());
         itemEntity.setItemVoice(formDto.getItemVoice());
         itemEntity.setDuration(formDto.getDuration());
@@ -1272,12 +1284,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public List<ItemHandleProgressResultDTO> listOfItemHandleProgressByMobile(String itemId) {
         List<ItemHandleProgressResultDTO> list = baseDao.selectListOfItemHandleProgressByMobile(itemId);
         // 处理多次拼接处理人信息问题
-        for(ItemHandleProgressResultDTO dto : list){
+        for (ItemHandleProgressResultDTO dto : list) {
             String advice = dto.getAdvice();
             // 对包含【h_s】的数据进行重新组装
-            if(advice.contains("h_s")){
+            if (advice.contains("h_s")) {
-                String hsStr = advice.substring(advice.indexOf("h_s"),advice.length());
+                String hsStr = advice.substring(advice.indexOf("h_s"), advice.length());
-                String adviceOld = advice.substring(0,advice.indexOf("   办理人："));
+                String adviceOld = advice.substring(0, advice.indexOf("   办理人："));
                 String adviceNew = adviceOld + hsStr;
                 dto.setAdvice(adviceNew);
             }
@@ -2136,7 +2148,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      */
     private SendEventFormDto packageSendEventEntity(ItemEntity itemEntity, ItemHandleSubmitFormDTO dto) throws Exception {
         SendEventFormDto sendDto = new SendEventFormDto();
-        SendInputInfoFormDto formDto = new SendInputInfoFormDto();
+
         //推送类别（事件上报）
         sendDto.setSENDTYPE(CommonConstants.SEND_TYPE);
         //上报
@@ -2165,6 +2177,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             SysDeptDTO deptInfo = streetResult.getData();
             if (deptInfo == null) {
                 throw new RenException("根据街道ID获取对应的街道编码失败" + streetResult.getMsg());
+            } else {
+                // 因为是街道账号，所以上级一定是市北区委
+                Long pids = deptInfo.getId();
+                String pnames = deptInfo.getName();
+                itemEntity.setParentDeptIds(pids + "");
+                itemEntity.setParentDeptNames(pnames);
+                itemEntity.setAllDeptIds(pids + "," + itemEntity.getGridId());
+                itemEntity.setAllDeptNames(pnames + "-" + itemEntity.getGrid());
             }
             //所属街道
             sendDto.setSSJD(deptInfo.getAreaCode());