诉求处理及机构编码相关

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -1465,8 +1465,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     public SysDeptDTO getDept(CityCenterFromDTO formDTO) {
         SysDeptEntity entity = baseDao.selectById(formDTO.getDeptId());
-        if (NumConstant.ONE_STR.equals(formDTO.getType())) {
+        if ("grid_party".equals(entity.getTypeKey())) {
-            return ConvertUtils.sourceToTarget(baseDao.selectById(entity.getDisCenterZoningCode()), SysDeptDTO.class);
+            return ConvertUtils.sourceToTarget(baseDao.selectById(entity.getPid()), SysDeptDTO.class);
         }
         return ConvertUtils.sourceToTarget(entity, SysDeptDTO.class);
     }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingResultDTO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.List;
 
 @NoArgsConstructor
 @Data
@@ -26,12 +27,7 @@ public class AppealHandlingResultDTO {
     private String cznr;
     @JsonProperty("clzp")
     private String clzp;
-    @JsonProperty("hyjy")
+    private List<ClfjDTO> clfj;
-    private String hyjy;
-    @JsonProperty("zrfg")
-    private String zrfg;
-    @JsonProperty("bljd")
-    private String bljd;
 
     @NoArgsConstructor
     @Data
@@ -49,4 +45,40 @@ public class AppealHandlingResultDTO {
         @JsonProperty("ssbm")
         private String ssbm;
     }
+
+    @NoArgsConstructor
+    @Data
+    public static class ClfjDTO {
+        /**
+         * 会议纪要附件
+         */
+        @JsonProperty("hyjy")
+        private String hyjy;
+        /**
+         * 会议纪要说明
+         */
+        @JsonProperty("hyjysm")
+        private String hyjysm;
+        /**
+         * 责任分工附件
+         */
+        @JsonProperty("zrfg")
+        private String zrfg;
+        /**
+         * 责任分工说明
+         */
+        @JsonProperty("zrfgsm")
+        private String zrfgsm;
+        /**
+         * 办理进度附件
+         */
+        @JsonProperty("bljd")
+        private String bljd;
+        /**
+         * 办理进度说明
+         */
+        @JsonProperty("bljdsm")
+        private String bljdsm;
+
+    }
 }

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

@@ -509,7 +509,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         sqdjr.setSsbm(entity.getGrid());
         sqdjr.setSsbmbm(entity.getGridId().toString());
         sqdjr.setSsjg(entity.getGrid());
-        sqdjr.setSsjgbm(entity.getGridId().toString());
+        sqdjr.setSsjgbm(getJgbm(entity.getGridId()));
         data.setSqdjr(sqdjr);
         // todo jack照片格式调整为http
         List<ImgEntity> imageList = imgDao.selectListByRefeId(entity.getEventId() == null?entity.getId():entity.getEventId());
@@ -2872,7 +2872,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         sqdjr.setSsbm(entity.getGrid());
         sqdjr.setSsbmbm(entity.getGridId().toString());
         sqdjr.setSsjg(entity.getGrid());
-        sqdjr.setSsjgbm(entity.getGridId().toString());
+        sqdjr.setSsjgbm(getJgbm(entity.getGridId()));
         data.setSqdjr(sqdjr);
         // todo jack照片格式调整为http
         QueryWrapper<ImgEntity> wrapper = new QueryWrapper<>();
@@ -2937,7 +2937,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         sqdjr.setSsbm(entity.getGrid());
         sqdjr.setSsbmbm(entity.getGridId().toString());
         sqdjr.setSsjg(entity.getGrid());
-        sqdjr.setSsjgbm(entity.getGridId().toString());
+        sqdjr.setSsjgbm(getJgbm(entity.getGridId()));
         data.setSqdjr(sqdjr);
         // todo jack照片格式调整为http
         List<ImgEntity> imageList = imgDao.selectListByRefeId(entity.getEventId() == null?entity.getId():entity.getEventId());
@@ -3398,4 +3398,22 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
     }
 
+    /**
+     * 获取机构编码
+     * @Param peopleFlag
+     * @Param deptId
+     * @Return {@link String}
+     * @Author zhaoqifeng
+     * @Date 2022/9/23 16:58
+     */
+    private String getJgbm(Long deptId) {
+        CityCenterFromDTO formDTO = new CityCenterFromDTO();
+        formDTO.setDeptId(deptId);
+        Result<SysDeptDTO> dept = adminFeignClient.getDept(formDTO);
+        if (dept.success()) {
+            return dept.getData().getDisCenterZoningCode();
+        }
+        return "";
+    }
+
 }

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

@@ -235,7 +235,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         // 操作人员唯一标识
         czr.setId(item.getGridPartyid() + "001");
         // 所属机构Id
-        czr.setSsjgbm(item.getGridUnitid() + "002");
+        czr.setSsjgbm(getJgbm(item.getHandlerDeptId()));
         // 所属机构
         czr.setSsjg(item.getGridUnitname() + "机构111");
         //所属部门id
@@ -530,7 +530,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         // 操作人员唯一标识
         dto.setId(item.getGridPartyid() + "0001");
         // 所属机构id
-        dto.setSsjgbm(item.getGridUnitid() + "0002");
+        dto.setSsjgbm(getJgbm(item.getHandlerDeptId()));
         // 所属机构名称
         dto.setSsjg(item.getGridUnitname() + "机构222");
         // 所属部门id
@@ -571,17 +571,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         if(item.getPeopleFlag().equals(NumConstant.TWO_STR)) {
             // 诉求类型（未知）
             data.setSqlx(NumConstant.TWO_STR);
-            // 会议纪要（未知）
-            data.setHyjy(item.getLawContent());
-            // 责任分工处理
-            // 主办
-            String hostUnit = null == item.getHostUnit()?"":item.getHostUnit().trim().replaceAll("\\|",",");
-            // 协办
-            String assistUnit = null == item.getAssistUnit()?"":item.getAssistUnit().trim().replaceAll("\\|",",");
-            data.setZrfg(hostUnit + "," + assistUnit);
             //办理进度 诉求分类是执法的时候
             //获取taskID
-            String bljd = "";
             LambdaQueryWrapper<ItemGridPlatformEntity> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(ItemGridPlatformEntity::getReferenceId, processDTO.getItemId());
             ItemGridPlatformEntity platform = itemGridPlatformDao.selectOne(wrapper);
@@ -590,31 +581,41 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             String result = cityGridApi.getActReply(url);
             ActReplyResultDTO actReply = JSONObject.parseObject(result, ActReplyResultDTO.class);
             //数据拼接
-            List<String> fjList = new ArrayList<>();
+            List<AppealHandlingResultDTO.ClfjDTO> clfjList = new ArrayList<>();
             if (null != actReply) {
                 if (CollectionUtils.isNotEmpty(actReply.getLhzf())) {
                     actReply.getLhzf().forEach(bean -> {
+                        AppealHandlingResultDTO.ClfjDTO clfj = new AppealHandlingResultDTO.ClfjDTO();
+                        clfj.setHyjy("");
+                        clfj.setHyjysm(item.getLawContent());
+                        clfj.setZrfg("");
+                        clfj.setZrfgsm(bean.getRy());
+                        clfj.setBljdsm(bean.getYgqk());
                         if (StringUtils.isNotBlank(bean.getFj())) {
-                            List<String> list = Arrays.asList(bean.getFj().split(","));
+                            String bljd = "http://119.3.182.231:8080/sbwgh/doc/getFile.htm?fileId=" + bean.getFj();
-                            fjList.addAll(list);
+                            clfj.setBljd(bljd);
                         }
+                        clfjList.add(clfj);
                     });
                 }
                 if (CollectionUtils.isNotEmpty(actReply.getZjhy())) {
-                    actReply.getLhzf().forEach(bean -> {
+                    actReply.getZjhy().forEach(bean -> {
+                        AppealHandlingResultDTO.ClfjDTO clfj = new AppealHandlingResultDTO.ClfjDTO();
+                        clfj.setHyjy("");
+                        clfj.setHyjysm(item.getLawContent());
+                        clfj.setZrfg("");
+                        clfj.setZrfgsm(bean.getCjry());
+                        clfj.setBljdsm(bean.getYgqk());
                         if (StringUtils.isNotBlank(bean.getFj())) {
-                            List<String> list = Arrays.asList(bean.getFj().split(StrConstant.COMMA));
+                            String bljd = "http://119.3.182.231:8080/sbwgh/doc/getFile.htm?fileId=" + bean.getFj();
-                            fjList.addAll(list);
+                            clfj.setBljd(bljd);
                         }
+                        clfjList.add(clfj);
                     });
                 }
-                if (CollectionUtils.isNotEmpty(fjList)) {
-                    bljd = "http://119.3.182.231:8080/sbwgh/doc/getFile.htm?fileId=";
-                    bljd = bljd.concat(StringUtils.join(fjList, StrConstant.COMMA));
-                }
             }
             //办理进度
-            data.setBljd(bljd);
+            data.setClfj(clfjList);
         }
         // 处理时间
         data.setCzsj(item.getCreatedTime());
@@ -955,7 +956,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             czr.setXm(item.getNickName());
             czr.setSsbmbm(item.getGridId().toString());
             czr.setSsbm(item.getGrid());
-            czr.setSsjgbm(getJgbm(item.getPeopleFlag(), item.getGridId()));
+            czr.setSsjgbm(getJgbm(item.getGridId()));
             czr.setSsjg(item.getGrid());
             dto.setCzr(czr);
             // 组装好直接推送
@@ -1149,7 +1150,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         AppealAuditResultDTO.CzrDTO czr = new AppealAuditResultDTO.CzrDTO();
         czr.setId(entity.getGridPartyid());
         czr.setXm(entity.getGridPartyname());
-        czr.setSsjgbm(entity.getGridUnitid());
+        czr.setSsjgbm(getJgbm(entity.getHandlerDeptId()));
         czr.setSsjg(entity.getGridUnitname());
         czr.setSsbmbm(entity.getGridUnitid());
         czr.setSsbm(entity.getGridUnitname());
@@ -1183,14 +1184,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @Author zhaoqifeng
      * @Date 2022/9/23 16:58
      */
-    private String getJgbm(String peopleFlag, Long deptId) {
+    private String getJgbm(Long deptId) {
         CityCenterFromDTO formDTO = new CityCenterFromDTO();
         formDTO.setDeptId(deptId);
-        if (NumConstant.ZERO_STR.equals(peopleFlag)) {
-            formDTO.setType(NumConstant.ONE_STR);
-        }else {
-            formDTO.setType(NumConstant.ZERO_STR);
-        }
         Result<SysDeptDTO> dept = adminFeignClient.getDept(formDTO);
         if (dept.success()) {
             return dept.getData().getDisCenterZoningCode();