Merge remote-tracking branch 'origin/feature_help' into feature_help

# Conflicts:
#	esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiCaseHandlingDao.java

@@ -49,4 +49,21 @@ public interface KpiCaseHandlingDao extends BaseDao<KpiCaseHandlingEntity> {
      */
     List<KpiCaseHandlingDTO> getDuplicateData(CheckIsScoredFormDTO checkIsScoredFormDTO);
 
+    /**
+    * @describe: 查询需要修改组织机构信息事件
+    * @author wangtong
+    * @date 2021/7/27 14:06
+    * @params [toString]
+    * @return java.util.List<com.elink.esua.epdc.dto.KpiCaseHandlingDTO>
+    */
+    List<KpiCaseHandlingDTO> selectListOfOrganizationInfo(String deptId);
+
+    /**
+    * @describe: 更新网格名称
+    * @author wangtong
+    * @date 2021/7/27 14:13
+    * @params [newDeptName, deptId]
+    * @return void
+    */
+    void updateGridByDeptId(String newDeptName, Long deptId);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiCommunityBuildingDao.java

@@ -55,4 +55,22 @@ public interface KpiCommunityBuildingDao extends BaseDao<KpiCommunityBuildingEnt
      * @param kpiCommunityBuildingEntities
      */
     void insertEntityList(@Param("kpiCommunityBuildingEntities")KpiCommunityBuildingEntity[] kpiCommunityBuildingEntities);
+
+    /**
+    * @describe: 查询需要修改组织机构信息事件
+    * @author wangtong
+    * @date 2021/7/27 14:30
+    * @params [toString]
+    * @return java.util.List<com.elink.esua.epdc.dto.KpiCommunityBuildingDTO>
+    */
+    List<KpiCommunityBuildingDTO> selectListOfOrganizationInfo(String deptId);
+
+    /**
+    * @describe: 更新网格名称
+    * @author wangtong
+    * @date 2021/7/27 14:35
+    * @params [newDeptName, deptId]
+    * @return void
+    */
+    void updateGridByDeptId(String newDeptName, Long deptId);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java

@@ -58,4 +58,21 @@ public interface KpiGridEntityDao extends BaseDao<KpiGridEntityEntity> {
     */
     void updateByDeptAndMonth(@Param("gridId") String gridId,@Param("monthYear") String monthYear);
 
+    /**
+    * @describe: 查询需要修改组织机构信息事件
+    * @author wangtong
+    * @date 2021/7/27 15:01
+    * @params [toString]
+    * @return java.util.List<com.elink.esua.epdc.dto.KpiGridEntityDTO>
+    */
+    List<KpiGridEntityDTO> selectListOfOrganizationInfo(String deptId);
+
+    /**
+    * @describe: 更新网格名称
+    * @author wangtong
+    * @date 2021/7/27 15:02
+    * @params [newDeptName, deptId]
+    * @return void
+    */
+    void updateGridByDeptId(String newDeptName, Long deptId);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMassEvaluationDao.java

@@ -47,4 +47,22 @@ public interface KpiMassEvaluationDao extends BaseDao<KpiMassEvaluationEntity> {
      * @return
      */
     List<KpiMassEvaluationDTO> getDuplicateData(CheckIsScoredByYearFormDTO checkIsScoredByYearFormDTO);
+
+    /**
+    * @describe: 查询需要修改组织机构信息事件
+    * @author wangtong
+    * @date 2021/7/27 15:22
+    * @params [toString]
+    * @return java.util.List<com.elink.esua.epdc.dto.KpiMassEvaluationDTO>
+    */
+    List<KpiMassEvaluationDTO> selectListOfOrganizationInfo(String deptId);
+
+    /**
+    * @describe: 更新网格名称
+    * @author wangtong
+    * @date 2021/7/27 15:23
+    * @params [newDeptName, deptId]
+    * @return void
+    */
+    void updateGridByDeptId(String newDeptName, Long deptId);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMattersResponseDao.java

@@ -39,4 +39,22 @@ public interface KpiMattersResponseDao extends BaseDao<KpiMattersResponseEntity>
      * @return
      */
     List<KpiMattersResponseDTO> getInfoPage(Map<String, Object> params);
+
+    /**
+    * @describe: 查询需要修改组织机构信息事件
+    * @author wangtong
+    * @date 2021/7/27 15:26
+    * @params [toString]
+    * @return java.util.List<com.elink.esua.epdc.dto.KpiMattersResponseDTO>
+    */
+    List<KpiMattersResponseDTO> selectListOfOrganizationInfo(String deptId);
+
+    /**
+    * @describe: 更新网格名称
+    * @author wangtong
+    * @date 2021/7/27 15:28
+    * @params [newDeptName, deptId]
+    * @return void
+    */
+    void updateGridByDeptId(String newDeptName, Long deptId);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPeopleEvaluateDao.java

@@ -18,10 +18,8 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.dto.KpiMassEvaluationDTO;
 import com.elink.esua.epdc.dto.KpiPeopleEvaluateDTO;
 import com.elink.esua.epdc.dto.form.CheckIsScoredByYearFormDTO;
-import com.elink.esua.epdc.dto.form.CheckIsScoredFormDTO;
 import com.elink.esua.epdc.entity.KpiPeopleEvaluateEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -51,4 +49,21 @@ public interface KpiPeopleEvaluateDao extends BaseDao<KpiPeopleEvaluateEntity> {
      */
     List<KpiPeopleEvaluateDTO> getDuplicateData(CheckIsScoredByYearFormDTO checkIsScoredByYearFormDTO);
 
+    /**
+    * @describe: 查询需要修改组织机构信息事件
+    * @author wangtong
+    * @date 2021/7/27 15:30
+    * @params [toString]
+    * @return java.util.List<com.elink.esua.epdc.dto.KpiPeopleEvaluateDTO>
+    */
+    List<KpiPeopleEvaluateDTO> selectListOfOrganizationInfo(String deptId);
+
+    /**
+    * @describe: 更新网格名称
+    * @author wangtong
+    * @date 2021/7/27 15:31
+    * @params [newDeptName, deptId]
+    * @return void
+    */
+    void updateGridByDeptId(String newDeptName, Long deptId);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPublicOpinionDao.java

@@ -47,4 +47,22 @@ public interface KpiPublicOpinionDao extends BaseDao<KpiPublicOpinionEntity> {
      * @return
      */
     List<KpiPublicOpinionDTO> getDuplicateData(CheckIsScoredFormDTO checkIsScoredFormDTO);
+
+    /**
+    * @describe: 查询需要修改组织机构信息事件
+    * @author wangtong
+    * @date 2021/7/27 15:33
+    * @params [toString]
+    * @return java.util.List<com.elink.esua.epdc.dto.KpiPublicOpinionDTO>
+    */
+    List<KpiPublicOpinionDTO> selectListOfOrganizationInfo(String deptId);
+
+    /**
+    * @describe: 更新网格名称
+    * @author wangtong
+    * @date 2021/7/27 15:34
+    * @params [newDeptName, deptId]
+    * @return void
+    */
+    void updateGridByDeptId(String newDeptName, Long deptId);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/ManualScoreDao.java

@@ -51,4 +51,13 @@ public interface ManualScoreDao extends BaseDao<ManualScoreEntity> {
      * @Date: 2020-04-21
      */
     List<ManualScoreDTO> checkDeptWhetherManualScore(ManualScoreDTO dto);
+
+    /**
+    * @describe: 查询需要修改组织机构信息事件
+    * @author wangtong
+    * @date 2021/7/27 15:40
+    * @params [toString]
+    * @return java.util.List<com.elink.esua.epdc.dto.ManualScoreDTO>
+    */
+    List<ManualScoreDTO> selectListOfOrganizationInfo(String deptId);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckInfoDao.java

@@ -42,4 +42,22 @@ public interface SubPositionCheckInfoDao extends BaseDao<SubPositionCheckInfoEnt
     * @return java.util.List<com.elink.esua.epdc.dto.SubPositionCheckInfoDTO>
     */
     List<SubPositionCheckInfoDTO> getSubPositionList(Map<String, Object> params);
+
+    /**
+    * @describe: 查询需要修改组织机构信息事件
+    * @author wangtong
+    * @date 2021/7/27 15:49
+    * @params [toString]
+    * @return java.util.List<com.elink.esua.epdc.dto.SubPositionCheckInfoDTO>
+    */
+    List<SubPositionCheckInfoDTO> selectListOfOrganizationInfo(String deptId);
+
+    /**
+    * @describe: 更新网格名称
+    * @author wangtong
+    * @date 2021/7/27 15:50
+    * @params [newDeptName, deptId]
+    * @return void
+    */
+    void updateGridByDeptId(String newDeptName, Long deptId);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/rocketmq/consumer/OrganizationModifyConsumer.java

@@ -3,9 +3,7 @@ package com.elink.esua.epdc.rocketmq.consumer;
 import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant;
 import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
-import com.elink.esua.epdc.service.KpiManualScoreService;
-import com.elink.esua.epdc.service.KpiResultGridService;
-import com.elink.esua.epdc.service.KpiResultSuperiorService;
+import com.elink.esua.epdc.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.spring.annotation.MessageModel;
@@ -35,6 +33,35 @@ public class OrganizationModifyConsumer implements RocketMQListener<MessageExt>
     @Autowired
     private KpiResultSuperiorService kpiResultSuperiorService;
 
+    @Autowired
+    private KpiCaseHandlingService kpiCaseHandlingService;
+
+    @Autowired
+    private KpiCommunityBuildingService kpiCommunityBuildingService;
+
+    @Autowired
+    private KpiGridEntityService kpiGridEntityService;
+
+    @Autowired
+    private KpiMassEvaluationService kpiMassEvaluationService;
+
+    @Autowired
+    private KpiMattersResponseService kpiMattersResponseService;
+
+    @Autowired
+    private KpiPeopleEvaluateService kpiPeopleEvaluateService;
+
+    @Autowired
+    private KpiPublicOpinionService kpiPublicOpinionService;
+
+    @Autowired
+    private ManualScoreService manualScoreService;
+
+    @Autowired
+    private SubPositionCheckInfoService subPositionCheckInfoService;
+
+
+
     @Override
     public void onMessage(MessageExt messageExt) {
         log.info("EPDC-KPI-SERVER消费消息START：{topic:{}, msgId:{}}", RocketMqConstant.MQ_TOPIC_ORGANIZATION, messageExt.getMsgId());
@@ -48,6 +75,26 @@ public class OrganizationModifyConsumer implements RocketMQListener<MessageExt>
             kpiResultGridService.modifyOrganizationInfo(dto);
             // 街道或区直绩效考核最终得分表修改组织机构信息
             kpiResultSuperiorService.modifyOrganizationInfo(dto);
+
+            //网格化平台案件处置情况打分表 修改组织机构信息
+            kpiCaseHandlingService.modifyOrganizationInfo(dto);
+            //网格建设打分表   修改组织机构信息
+            kpiCommunityBuildingService.modifyOrganizationInfo(dto);
+            //  修改组织机构信息
+            kpiGridEntityService.modifyOrganizationInfo(dto);
+            // 群众评价打分表  修改组织机构信息
+            kpiMassEvaluationService.modifyOrganizationInfo(dto);
+            //响应率打分表   修改组织机构信息
+            kpiMattersResponseService.modifyOrganizationInfo(dto);
+            //民生评价打分表   修改组织机构信息
+            kpiPeopleEvaluateService.modifyOrganizationInfo(dto);
+            // 舆论监督打分表  修改组织机构信息
+            kpiPublicOpinionService.modifyOrganizationInfo(dto);
+            // 手动打分表 修改组织机构信息
+            manualScoreService.modifyOrganizationInfo(dto);
+            //阵地建设考核内容提报信息表   修改组织机构信息
+            subPositionCheckInfoService.modifyOrganizationInfo(dto);
+
             log.info("EPDC-KPI-SERVER消费消息END：{topic:{}, msgId:{}, body:{}}", RocketMqConstant.MQ_TOPIC_ORGANIZATION, messageExt.getMsgId(), body);
         } catch (Exception e) {
             log.info("EPDC-KPI-SERVER消费消息失败：msgId:{}", messageExt.getMsgId());

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java

@@ -34,4 +34,21 @@ public class OrganizationModifyDTO implements Serializable {
      * 部门类型
      */
     private String typeKey;
+
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiCaseHandlingService.java

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.KpiCaseHandlingDTO;
 import com.elink.esua.epdc.entity.KpiCaseHandlingEntity;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -121,4 +122,15 @@ public interface KpiCaseHandlingService extends BaseService<KpiCaseHandlingEntit
      * @date 2020-12-21
      */
     Result importManualScoreExcel(MultipartFile file);
+
+    /**
+     *
+     * 事件修改组织机构信息
+     *
+     * @params [dto]
+     * @return void
+     * @author wangtong
+     * @since 2021/7/27 14:23
+     */
+    void modifyOrganizationInfo(OrganizationModifyDTO dto);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiCommunityBuildingService.java

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.KpiCommunityBuildingDTO;
 import com.elink.esua.epdc.entity.KpiCommunityBuildingEntity;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -121,4 +122,15 @@ public interface KpiCommunityBuildingService extends BaseService<KpiCommunityBui
      * @date 2020-06-15
      */
     Result importManualScoreExcel(MultipartFile file);
+
+    /**
+     *
+     * 事件修改组织机构信息
+     *
+     * @params [dto]
+     * @return void
+     * @author wangtong
+     * @since 2021/7/27 14:23
+     */
+    void modifyOrganizationInfo(OrganizationModifyDTO dto);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiGridEntityService.java

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.KpiGridEntityDTO;
 import com.elink.esua.epdc.entity.KpiGridEntityEntity;
 import com.elink.esua.epdc.entity.SubInfoGridRelationEntity;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -131,4 +132,15 @@ public interface KpiGridEntityService extends BaseService<KpiGridEntityEntity> {
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     Result insertFullMarks(SubInfoGridRelationEntity sir);
+
+    /**
+     *
+     * 事件修改组织机构信息
+     *
+     * @params [dto]
+     * @return void
+     * @author wangtong
+     * @since 2021/7/27 14:23
+     */
+    void modifyOrganizationInfo(OrganizationModifyDTO dto);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMassEvaluationService.java

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.KpiMassEvaluationDTO;
 import com.elink.esua.epdc.entity.KpiMassEvaluationEntity;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -121,4 +122,15 @@ public interface KpiMassEvaluationService extends BaseService<KpiMassEvaluationE
      * @date 2020-06-17
      */
     Result importManualScoreExcel(MultipartFile file);
+
+    /**
+     *
+     * 事件修改组织机构信息
+     *
+     * @params [dto]
+     * @return void
+     * @author wangtong
+     * @since 2021/7/27 14:23
+     */
+    void modifyOrganizationInfo(OrganizationModifyDTO dto);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMattersResponseService.java

@@ -19,9 +19,9 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.dto.KpiCommunityBuildingDTO;
 import com.elink.esua.epdc.dto.KpiMattersResponseDTO;
 import com.elink.esua.epdc.entity.KpiMattersResponseEntity;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -100,4 +100,15 @@ public interface KpiMattersResponseService extends BaseService<KpiMattersRespons
      * @date 2020-06-16
      */
     void delete(String[] ids);
+
+    /**
+     *
+     * 事件修改组织机构信息
+     *
+     * @params [dto]
+     * @return void
+     * @author wangtong
+     * @since 2021/7/27 14:23
+     */
+    void modifyOrganizationInfo(OrganizationModifyDTO dto);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiPeopleEvaluateService.java

@@ -20,9 +20,9 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.KpiCaseHandlingDTO;
 import com.elink.esua.epdc.dto.KpiPeopleEvaluateDTO;
 import com.elink.esua.epdc.entity.KpiPeopleEvaluateEntity;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -122,4 +122,15 @@ public interface KpiPeopleEvaluateService extends BaseService<KpiPeopleEvaluateE
      * @date 2020-12-22
      */
     Result importManualScoreExcel(MultipartFile file);
+
+    /**
+     *
+     * 事件修改组织机构信息
+     *
+     * @params [dto]
+     * @return void
+     * @author wangtong
+     * @since 2021/7/27 14:23
+     */
+    void modifyOrganizationInfo(OrganizationModifyDTO dto);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiPublicOpinionService.java

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.KpiPublicOpinionDTO;
 import com.elink.esua.epdc.entity.KpiPublicOpinionEntity;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -121,4 +122,15 @@ public interface KpiPublicOpinionService extends BaseService<KpiPublicOpinionEnt
      * @date 2020-06-17
      */
     Result importManualScoreExcel(MultipartFile file);
+
+    /**
+     *
+     * 事件修改组织机构信息
+     *
+     * @params [dto]
+     * @return void
+     * @author wangtong
+     * @since 2021/7/27 14:23
+     */
+    void modifyOrganizationInfo(OrganizationModifyDTO dto);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/ManualScoreService.java

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ManualScoreDTO;
 import com.elink.esua.epdc.entity.ManualScoreEntity;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -121,4 +122,15 @@ public interface ManualScoreService extends BaseService<ManualScoreEntity> {
      * @Date: 2020-04-14 
      */ 
     PageData<ManualScoreDTO> listManualScoreResultDTO(Map<String, Object> params);
+
+    /**
+     *
+     * 事件修改组织机构信息
+     *
+     * @params [dto]
+     * @return void
+     * @author wangtong
+     * @since 2021/7/27 14:23
+     */
+    void modifyOrganizationInfo(OrganizationModifyDTO dto);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckInfoService.java

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.SubPositionCheckInfoDTO;
 import com.elink.esua.epdc.dto.form.FirstTrialFormDTO;
 import com.elink.esua.epdc.entity.SubPositionCheckInfoEntity;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 
 import java.util.Date;
 import java.util.List;
@@ -123,4 +124,14 @@ public interface SubPositionCheckInfoService extends BaseService<SubPositionChec
     */
     Result acceptance(FirstTrialFormDTO dto);
 
+    /**
+     *
+     * 事件修改组织机构信息
+     *
+     * @params [dto]
+     * @return void
+     * @author wangtong
+     * @since 2021/7/27 14:23
+     */
+    void modifyOrganizationInfo(OrganizationModifyDTO dto);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCaseHandlingServiceImpl.java

@@ -45,6 +45,7 @@ import com.elink.esua.epdc.entity.KpiCaseHandlingEntity;
 import com.elink.esua.epdc.excel.KpiCaseHandlingExcel;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.KpiCaseHandlingRedis;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.KpiCaseHandlingService;
 import com.elink.esua.epdc.utils.DeptUtils;
 import com.elink.esua.epdc.utils.StreamUtils;
@@ -280,6 +281,54 @@ public class KpiCaseHandlingServiceImpl extends BaseServiceImpl<KpiCaseHandlingD
         return new Result();
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void modifyOrganizationInfo(OrganizationModifyDTO dto) {
+        // 查询需要修改组织机构信息事件
+        List<KpiCaseHandlingDTO> caseList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString());
+        if (null != caseList && caseList.size() > 0) {
+            // 组织机构信息处理
+            List<KpiCaseHandlingEntity> entities = handleOrganizationInfo(dto, caseList);
+            // 更新事件组织机构信息
+            updateBatchById(entities);
+        }
+
+        // 更新网格名称
+        baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
+    }
+
+
+    private List<KpiCaseHandlingEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<KpiCaseHandlingDTO> caseList) {
+        List<KpiCaseHandlingEntity> entities = new ArrayList<>();
+        for (KpiCaseHandlingDTO cases : caseList) {
+            KpiCaseHandlingEntity entity = new KpiCaseHandlingEntity();
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(cases.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
+            }
+            if("community_party".equals(dto.getTypeKey())) {
+                List<String> allDeptIds = Arrays.asList(cases.getAllDeptIds().split(","));
+                List<String> allDeptNames = Arrays.asList(cases.getAllDeptNames().split("-"));
+                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(cases.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
+            }
+            entities.add(entity);
+        }
+        return entities;
+    }
+
+
+
     /**
      * 拼接案件处置情况打分实体
      * @param kpiCaseHandlingExcel

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java

@@ -45,6 +45,7 @@ import com.elink.esua.epdc.entity.KpiCommunityBuildingEntity;
 import com.elink.esua.epdc.excel.KpiCommunityBuildingExcel;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.KpiCommunityBuildingRedis;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.KpiCommunityBuildingService;
 import com.elink.esua.epdc.utils.DeptUtils;
 import com.elink.esua.epdc.utils.StreamUtils;
@@ -392,4 +393,49 @@ public class KpiCommunityBuildingServiceImpl extends BaseServiceImpl<KpiCommunit
         return entity;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void modifyOrganizationInfo(OrganizationModifyDTO dto) {
+        // 查询需要修改组织机构信息事件
+        List<KpiCommunityBuildingDTO> communityList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString());
+        if (null != communityList && communityList.size() > 0) {
+            // 组织机构信息处理
+            List<KpiCommunityBuildingEntity> entities = handleOrganizationInfo(dto, communityList);
+            // 更新事件组织机构信息
+            updateBatchById(entities);
+        }
+        // 更新网格名称
+        baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
+    }
+
+
+    private List<KpiCommunityBuildingEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<KpiCommunityBuildingDTO> communityList) {
+        List<KpiCommunityBuildingEntity> entities = new ArrayList<>();
+        for (KpiCommunityBuildingDTO community : communityList) {
+            KpiCommunityBuildingEntity entity = new KpiCommunityBuildingEntity();
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(community.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
+            }
+            if("community_party".equals(dto.getTypeKey())) {
+                List<String> allDeptIds = Arrays.asList(community.getAllDeptIds().split(","));
+                List<String> allDeptNames = Arrays.asList(community.getAllDeptNames().split("-"));
+                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(community.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
+            }
+            entities.add(entity);
+        }
+        return entities;
+    }
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java

@@ -47,6 +47,7 @@ import com.elink.esua.epdc.entity.SubInfoGridRelationEntity;
 import com.elink.esua.epdc.excel.KpiGridEntityExcel;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.KpiGridEntityRedis;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.KpiGridEntityService;
 import com.elink.esua.epdc.utils.DeptUtils;
 import com.elink.esua.epdc.utils.StreamUtils;
@@ -512,6 +513,49 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl<KpiGridEntityDao,
         return new Result();
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void modifyOrganizationInfo(OrganizationModifyDTO dto) {
+        // 查询需要修改组织机构信息事件
+        List<KpiGridEntityDTO> communityList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString());
+        if (null != communityList && communityList.size() > 0) {
+            // 组织机构信息处理
+            List<KpiGridEntityEntity> entities = handleOrganizationInfo(dto, communityList);
+            // 更新事件组织机构信息
+            updateBatchById(entities);
+        }
+        // 更新网格名称
+        baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
+    }
+
 
+    private List<KpiGridEntityEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<KpiGridEntityDTO> communityList) {
+        List<KpiGridEntityEntity> entities = new ArrayList<>();
+        for (KpiGridEntityDTO community : communityList) {
+            KpiGridEntityEntity entity = new KpiGridEntityEntity();
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(community.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
+            }
+            if("community_party".equals(dto.getTypeKey())) {
+                List<String> allDeptIds = Arrays.asList(community.getAllDeptIds().split(","));
+                List<String> allDeptNames = Arrays.asList(community.getAllDeptNames().split("-"));
+                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(community.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
+            }
+            entities.add(entity);
+        }
+        return entities;
+    }
 
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java

@@ -865,27 +865,47 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
         List<KpiManualScoreEntity> entities = new ArrayList<>();
         for (KpiManualScoreDTO score: scoreList) {
             KpiManualScoreEntity entity = new KpiManualScoreEntity();
-            if (StringUtils.isNotEmpty(score.getParentDeptIds()) && StringUtils.isNotEmpty(score.getParentDeptNames())) {
-                List<String> parentDeptIds = Arrays.asList(score.getParentDeptIds().split(","));
-                List<String> parentDeptNames = Arrays.asList(score.getParentDeptNames().split("-"));
-                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && parentDeptNames.size() > index) {
-                    parentDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(score.getId());
-                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
-                }
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(score.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
             }
-
-            if (StringUtils.isNotEmpty(score.getAllDeptIds()) && StringUtils.isNotEmpty(score.getAllDeptNames())) {
+            if("community_party".equals(dto.getTypeKey())) {
                 List<String> allDeptIds = Arrays.asList(score.getAllDeptIds().split(","));
                 List<String> allDeptNames = Arrays.asList(score.getAllDeptNames().split("-"));
                 int index = allDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && allDeptNames.size() > index) {
-                    allDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(score.getId());
-                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
-                }
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(score.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
             }
+//            if (StringUtils.isNotEmpty(score.getParentDeptIds()) && StringUtils.isNotEmpty(score.getParentDeptNames())) {
+//                List<String> parentDeptIds = Arrays.asList(score.getParentDeptIds().split(","));
+//                List<String> parentDeptNames = Arrays.asList(score.getParentDeptNames().split("-"));
+//                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && parentDeptNames.size() > index) {
+//                    parentDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(score.getId());
+//                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
+//                }
+//            }
+//
+//            if (StringUtils.isNotEmpty(score.getAllDeptIds()) && StringUtils.isNotEmpty(score.getAllDeptNames())) {
+//                List<String> allDeptIds = Arrays.asList(score.getAllDeptIds().split(","));
+//                List<String> allDeptNames = Arrays.asList(score.getAllDeptNames().split("-"));
+//                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && allDeptNames.size() > index) {
+//                    allDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(score.getId());
+//                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
+//                }
+//            }
 
             entities.add(entity);
         }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMassEvaluationServiceImpl.java

@@ -45,6 +45,7 @@ import com.elink.esua.epdc.entity.KpiMassEvaluationEntity;
 import com.elink.esua.epdc.excel.KpiMassEvaluationExcel;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.KpiMassEvaluationRedis;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.KpiMassEvaluationService;
 import com.elink.esua.epdc.utils.DeptUtils;
 import com.elink.esua.epdc.utils.StreamUtils;
@@ -372,4 +373,49 @@ public class KpiMassEvaluationServiceImpl extends BaseServiceImpl<KpiMassEvaluat
         return entity;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void modifyOrganizationInfo(OrganizationModifyDTO dto) {
+        // 查询需要修改组织机构信息事件
+        List<KpiMassEvaluationDTO> massList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString());
+        if (null != massList && massList.size() > 0) {
+            // 组织机构信息处理
+            List<KpiMassEvaluationEntity> entities = handleOrganizationInfo(dto, massList);
+            // 更新事件组织机构信息
+            updateBatchById(entities);
+        }
+        // 更新网格名称
+        baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
+    }
+
+
+    private List<KpiMassEvaluationEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<KpiMassEvaluationDTO> massList) {
+        List<KpiMassEvaluationEntity> entities = new ArrayList<>();
+        for (KpiMassEvaluationDTO mass : massList) {
+            KpiMassEvaluationEntity entity = new KpiMassEvaluationEntity();
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(mass.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
+            }
+            if("community_party".equals(dto.getTypeKey())) {
+                List<String> allDeptIds = Arrays.asList(mass.getAllDeptIds().split(","));
+                List<String> allDeptNames = Arrays.asList(mass.getAllDeptNames().split("-"));
+                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(mass.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
+            }
+            entities.add(entity);
+        }
+        return entities;
+    }
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMattersResponseServiceImpl.java

@@ -32,6 +32,7 @@ import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.entity.KpiMattersResponseEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.KpiMattersResponseRedis;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.KpiMattersResponseService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -134,4 +135,48 @@ public class KpiMattersResponseServiceImpl extends BaseServiceImpl<KpiMattersRes
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void modifyOrganizationInfo(OrganizationModifyDTO dto) {
+        // 查询需要修改组织机构信息事件
+        List<KpiMattersResponseDTO> massList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString());
+        if (null != massList && massList.size() > 0) {
+            // 组织机构信息处理
+            List<KpiMattersResponseEntity> entities = handleOrganizationInfo(dto, massList);
+            // 更新事件组织机构信息
+            updateBatchById(entities);
+        }
+        // 更新网格名称
+        baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
+    }
+
+
+    private List<KpiMattersResponseEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<KpiMattersResponseDTO> massList) {
+        List<KpiMattersResponseEntity> entities = new ArrayList<>();
+        for (KpiMattersResponseDTO mass : massList) {
+            KpiMattersResponseEntity entity = new KpiMattersResponseEntity();
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(mass.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
+            }
+            if("community_party".equals(dto.getTypeKey())) {
+                List<String> allDeptIds = Arrays.asList(mass.getAllDeptIds().split(","));
+                List<String> allDeptNames = Arrays.asList(mass.getAllDeptNames().split("-"));
+                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(mass.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
+            }
+            entities.add(entity);
+        }
+        return entities;
+    }
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPeopleEvaluateServiceImpl.java

@@ -23,6 +23,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.StrConstant;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
@@ -30,20 +31,21 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.KpiPeopleEvaluateDao;
-import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
+import com.elink.esua.epdc.dto.KpiPeopleEvaluateDTO;
+import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
 import com.elink.esua.epdc.dto.form.CheckIsScoredByYearFormDTO;
-import com.elink.esua.epdc.entity.KpiCaseHandlingEntity;
 import com.elink.esua.epdc.entity.KpiPeopleEvaluateEntity;
 import com.elink.esua.epdc.excel.KpiPeopleEvaluateExcel;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.KpiPeopleEvaluateRedis;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.KpiPeopleEvaluateService;
 import com.elink.esua.epdc.utils.DeptUtils;
 import com.elink.esua.epdc.utils.StreamUtils;
@@ -375,4 +377,49 @@ public class KpiPeopleEvaluateServiceImpl extends BaseServiceImpl<KpiPeopleEvalu
         return false;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void modifyOrganizationInfo(OrganizationModifyDTO dto) {
+        // 查询需要修改组织机构信息事件
+        List<KpiPeopleEvaluateDTO> peopleList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString());
+        if (null != peopleList && peopleList.size() > 0) {
+            // 组织机构信息处理
+            List<KpiPeopleEvaluateEntity> entities = handleOrganizationInfo(dto, peopleList);
+            // 更新事件组织机构信息
+            updateBatchById(entities);
+        }
+        // 更新网格名称
+        baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
+    }
+
+
+    private List<KpiPeopleEvaluateEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<KpiPeopleEvaluateDTO> peopleList) {
+        List<KpiPeopleEvaluateEntity> entities = new ArrayList<>();
+        for (KpiPeopleEvaluateDTO people : peopleList) {
+            KpiPeopleEvaluateEntity entity = new KpiPeopleEvaluateEntity();
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(people.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
+            }
+            if("community_party".equals(dto.getTypeKey())) {
+                List<String> allDeptIds = Arrays.asList(people.getAllDeptIds().split(","));
+                List<String> allDeptNames = Arrays.asList(people.getAllDeptNames().split("-"));
+                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(people.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
+            }
+            entities.add(entity);
+        }
+        return entities;
+    }
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPublicOpinionServiceImpl.java

@@ -45,6 +45,7 @@ import com.elink.esua.epdc.entity.KpiPublicOpinionEntity;
 import com.elink.esua.epdc.excel.KpiPublicOpinionExcel;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.KpiPublicOpinionRedis;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.KpiPublicOpinionService;
 import com.elink.esua.epdc.utils.DeptUtils;
 import com.elink.esua.epdc.utils.StreamUtils;
@@ -374,4 +375,50 @@ public class KpiPublicOpinionServiceImpl extends BaseServiceImpl<KpiPublicOpinio
         return entity;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void modifyOrganizationInfo(OrganizationModifyDTO dto) {
+        // 查询需要修改组织机构信息事件
+        List<KpiPublicOpinionDTO> peopleList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString());
+        if (null != peopleList && peopleList.size() > 0) {
+            // 组织机构信息处理
+            List<KpiPublicOpinionEntity> entities = handleOrganizationInfo(dto, peopleList);
+            // 更新事件组织机构信息
+            updateBatchById(entities);
+        }
+        // 更新网格名称
+        baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
+    }
+
+
+    private List<KpiPublicOpinionEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<KpiPublicOpinionDTO> peopleList) {
+        List<KpiPublicOpinionEntity> entities = new ArrayList<>();
+        for (KpiPublicOpinionDTO people : peopleList) {
+            KpiPublicOpinionEntity entity = new KpiPublicOpinionEntity();
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(people.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
+            }
+            if("community_party".equals(dto.getTypeKey())) {
+                List<String> allDeptIds = Arrays.asList(people.getAllDeptIds().split(","));
+                List<String> allDeptNames = Arrays.asList(people.getAllDeptNames().split("-"));
+                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(people.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
+            }
+            entities.add(entity);
+        }
+        return entities;
+    }
+
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java

@@ -18,11 +18,10 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.dao.KpiMetaDataDao;
 import com.elink.esua.epdc.dao.KpiResultGridDao;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
@@ -276,27 +275,47 @@ public class KpiResultGridServiceImpl extends BaseServiceImpl<KpiResultGridDao,
         List<KpiResultGridEntity> entities = new ArrayList<>();
         for (KpiResultGridDTO grid: gridList) {
             KpiResultGridEntity entity = new KpiResultGridEntity();
-            if (StringUtils.isNotEmpty(grid.getParentDeptIds()) && StringUtils.isNotEmpty(grid.getParentDeptNames())) {
-                List<String> parentDeptIds = Arrays.asList(grid.getParentDeptIds().split(","));
-                List<String> parentDeptNames = Arrays.asList(grid.getParentDeptNames().split("-"));
-                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && parentDeptNames.size() > index) {
-                    parentDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(grid.getId());
-                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
-                }
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(grid.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
             }
-
-            if (StringUtils.isNotEmpty(grid.getAllDeptIds()) && StringUtils.isNotEmpty(grid.getAllDeptNames())) {
+            if("community_party".equals(dto.getTypeKey())) {
                 List<String> allDeptIds = Arrays.asList(grid.getAllDeptIds().split(","));
                 List<String> allDeptNames = Arrays.asList(grid.getAllDeptNames().split("-"));
                 int index = allDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && allDeptNames.size() > index) {
-                    allDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(grid.getId());
-                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
-                }
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(grid.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
             }
+//            if (StringUtils.isNotEmpty(grid.getParentDeptIds()) && StringUtils.isNotEmpty(grid.getParentDeptNames())) {
+//                List<String> parentDeptIds = Arrays.asList(grid.getParentDeptIds().split(","));
+//                List<String> parentDeptNames = Arrays.asList(grid.getParentDeptNames().split("-"));
+//                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && parentDeptNames.size() > index) {
+//                    parentDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(grid.getId());
+//                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
+//                }
+//            }
+//
+//            if (StringUtils.isNotEmpty(grid.getAllDeptIds()) && StringUtils.isNotEmpty(grid.getAllDeptNames())) {
+//                List<String> allDeptIds = Arrays.asList(grid.getAllDeptIds().split(","));
+//                List<String> allDeptNames = Arrays.asList(grid.getAllDeptNames().split("-"));
+//                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && allDeptNames.size() > index) {
+//                    allDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(grid.getId());
+//                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
+//                }
+//            }
 
             entities.add(entity);
         }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultSuperiorServiceImpl.java

@@ -19,9 +19,9 @@ package com.elink.esua.epdc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.dao.KpiMetaDataDao;
 import com.elink.esua.epdc.dao.KpiResultSuperiorDao;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
@@ -32,14 +32,15 @@ import com.elink.esua.epdc.enums.KpiMetaDataEnum;
 import com.elink.esua.epdc.redis.KpiResultSuperiorRedis;
 import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.KpiResultSuperiorService;
-import com.sun.org.apache.bcel.internal.generic.NEW;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 街道或区直绩效考核最终得分
@@ -194,27 +195,47 @@ public class KpiResultSuperiorServiceImpl extends BaseServiceImpl<KpiResultSuper
         List<KpiResultSuperiorEntity> entities = new ArrayList<>();
         for (KpiResultSuperiorDTO superior: superiorList) {
             KpiResultSuperiorEntity entity = new KpiResultSuperiorEntity();
-            if (StringUtils.isNotEmpty(superior.getParentDeptIds()) && StringUtils.isNotEmpty(superior.getParentDeptNames())) {
-                List<String> parentDeptIds = Arrays.asList(superior.getParentDeptIds().split(","));
-                List<String> parentDeptNames = Arrays.asList(superior.getParentDeptNames().split("-"));
-                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && parentDeptNames.size() > index) {
-                    parentDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(superior.getId());
-                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
-                }
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(superior.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
             }
-
-            if (StringUtils.isNotEmpty(superior.getAllDeptIds()) && StringUtils.isNotEmpty(superior.getAllDeptNames())) {
+            if("community_party".equals(dto.getTypeKey())) {
                 List<String> allDeptIds = Arrays.asList(superior.getAllDeptIds().split(","));
                 List<String> allDeptNames = Arrays.asList(superior.getAllDeptNames().split("-"));
                 int index = allDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && allDeptNames.size() > index) {
-                    allDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(superior.getId());
-                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
-                }
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(superior.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
             }
+//            if (StringUtils.isNotEmpty(superior.getParentDeptIds()) && StringUtils.isNotEmpty(superior.getParentDeptNames())) {
+//                List<String> parentDeptIds = Arrays.asList(superior.getParentDeptIds().split(","));
+//                List<String> parentDeptNames = Arrays.asList(superior.getParentDeptNames().split("-"));
+//                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && parentDeptNames.size() > index) {
+//                    parentDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(superior.getId());
+//                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
+//                }
+//            }
+//
+//            if (StringUtils.isNotEmpty(superior.getAllDeptIds()) && StringUtils.isNotEmpty(superior.getAllDeptNames())) {
+//                List<String> allDeptIds = Arrays.asList(superior.getAllDeptIds().split(","));
+//                List<String> allDeptNames = Arrays.asList(superior.getAllDeptNames().split("-"));
+//                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && allDeptNames.size() > index) {
+//                    allDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(superior.getId());
+//                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
+//                }
+//            }
 
             entities.add(entity);
         }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java

@@ -23,6 +23,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
 import com.elink.esua.epdc.commons.tools.constant.StrConstant;
@@ -31,7 +32,6 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.ManualScoreDao;
@@ -43,12 +43,14 @@ import com.elink.esua.epdc.entity.ManualScoreEntity;
 import com.elink.esua.epdc.excel.ManualScoreExcel;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.ManualScoreRedis;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.ManualScoreService;
 import com.elink.esua.epdc.utils.DeptUtils;
 import com.elink.esua.epdc.utils.StreamUtils;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.hssf.usermodel.DVConstraint;
+import org.apache.poi.hssf.usermodel.HSSFDataValidation;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddressList;
@@ -61,7 +63,10 @@ import java.io.File;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.YearMonth;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 手动打分表
@@ -407,4 +412,47 @@ public class ManualScoreServiceImpl extends BaseServiceImpl<ManualScoreDao, Manu
         }
         return big;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void modifyOrganizationInfo(OrganizationModifyDTO dto) {
+        // 查询需要修改组织机构信息事件
+        List<ManualScoreDTO> scoreList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString());
+        if (null != scoreList && scoreList.size() > 0) {
+            // 组织机构信息处理
+            List<ManualScoreEntity> entities = handleOrganizationInfo(dto, scoreList);
+            // 更新事件组织机构信息
+            updateBatchById(entities);
+        }
+    }
+
+
+    private List<ManualScoreEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<ManualScoreDTO> scoreList) {
+        List<ManualScoreEntity> entities = new ArrayList<>();
+        for (ManualScoreDTO score : scoreList) {
+            ManualScoreEntity entity = new ManualScoreEntity();
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(score.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
+            }
+            if("community_party".equals(dto.getTypeKey())) {
+                List<String> allDeptIds = Arrays.asList(score.getAllDeptIds().split(","));
+                List<String> allDeptNames = Arrays.asList(score.getAllDeptNames().split("-"));
+                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(score.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
+            }
+            entities.add(entity);
+        }
+        return entities;
+    }
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java

@@ -32,6 +32,7 @@ import com.elink.esua.epdc.dto.form.FirstTrialFormDTO;
 import com.elink.esua.epdc.entity.SubInfoGridRelationEntity;
 import com.elink.esua.epdc.entity.SubPositionCheckInfoEntity;
 import com.elink.esua.epdc.redis.SubPositionCheckInfoRedis;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.KpiGridEntityService;
 import com.elink.esua.epdc.service.SubAuditRecordsLogService;
 import com.elink.esua.epdc.service.SubInfoGridRelationService;
@@ -43,10 +44,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 阵地建设考核内容提报信息表 
@@ -183,4 +181,49 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl<SubPosition
         return new Result();
     }
 
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void modifyOrganizationInfo(OrganizationModifyDTO dto) {
+        // 查询需要修改组织机构信息事件
+        List<SubPositionCheckInfoDTO> checkList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString());
+        if (null != checkList && checkList.size() > 0) {
+            // 组织机构信息处理
+            List<SubPositionCheckInfoEntity> entities = handleOrganizationInfo(dto, checkList);
+            // 更新事件组织机构信息
+            updateBatchById(entities);
+        }
+        // 更新网格名称
+        baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
+    }
+
+
+    private List<SubPositionCheckInfoEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<SubPositionCheckInfoDTO> checkList) {
+        List<SubPositionCheckInfoEntity> entities = new ArrayList<>();
+        for (SubPositionCheckInfoDTO check : checkList) {
+            SubPositionCheckInfoEntity entity = new SubPositionCheckInfoEntity();
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(check.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
+            }
+            if("community_party".equals(dto.getTypeKey())) {
+                List<String> allDeptIds = Arrays.asList(check.getAllDeptIds().split(","));
+                List<String> allDeptNames = Arrays.asList(check.getAllDeptNames().split("-"));
+                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(check.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
+            }
+            entities.add(entity);
+        }
+        return entities;
+    }
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCaseHandlingDao.xml

@@ -87,6 +87,23 @@
             and MONTH_YEAR = #{monthYear}
         </if>
     </select>
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.KpiCaseHandlingDTO">
+        SELECT
+                ID,
+                PARENT_DEPT_IDS,
+                PARENT_DEPT_NAMES,
+                ALL_DEPT_IDS,
+                ALL_DEPT_NAMES
+            FROM
+                epdc_kpi_case_handling
+            WHERE
+                FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+    </select>
+    <update id="updateGridByDeptId">
+        UPDATE epdc_kpi_case_handling
+            SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW()
+            WHERE DEPT_ID = #{deptId}
+    </update>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCommunityBuildingDao.xml

@@ -134,6 +134,23 @@
             #{item.delFlag})
         </foreach>
     </insert>
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.KpiCommunityBuildingDTO">
+         SELECT
+                ID,
+                PARENT_DEPT_IDS,
+                PARENT_DEPT_NAMES,
+                ALL_DEPT_IDS,
+                ALL_DEPT_NAMES
+            FROM
+                epdc_kpi_community_building
+            WHERE
+                FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+    </select>
+    <update id="updateGridByDeptId">
+        UPDATE epdc_kpi_community_building
+            SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW()
+            WHERE DEPT_ID = #{deptId}
+    </update>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml

@@ -97,6 +97,23 @@
         where DEPT_ID=#{gridId}
                     AND MONTH_YEAR=#{monthYear}
     </update>
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.KpiGridEntityDTO">
+        SELECT
+                ID,
+                PARENT_DEPT_IDS,
+                PARENT_DEPT_NAMES,
+                ALL_DEPT_IDS,
+                ALL_DEPT_NAMES
+            FROM
+                epdc_kpi_grid_entity
+            WHERE
+                FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+    </select>
+    <update id="updateGridByDeptId">
+        UPDATE epdc_kpi_grid_entity
+            SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW()
+            WHERE DEPT_ID = #{deptId}
+    </update>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMassEvaluationDao.xml

@@ -90,6 +90,23 @@
             and YEAR = #{year}
         </if>
     </select>
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.KpiMassEvaluationDTO">
+        SELECT
+                ID,
+                PARENT_DEPT_IDS,
+                PARENT_DEPT_NAMES,
+                ALL_DEPT_IDS,
+                ALL_DEPT_NAMES
+            FROM
+                epdc_kpi_mass_evaluation
+            WHERE
+                FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+    </select>
+    <update id="updateGridByDeptId">
+        UPDATE epdc_kpi_mass_evaluation
+            SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW()
+            WHERE DEPT_ID = #{deptId}
+    </update>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMattersResponseDao.xml

@@ -58,6 +58,23 @@
         </if>
         order by UPDATED_TIME desc
     </select>
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.KpiMattersResponseDTO">
+        SELECT
+                ID,
+                PARENT_DEPT_IDS,
+                PARENT_DEPT_NAMES,
+                ALL_DEPT_IDS,
+                ALL_DEPT_NAMES
+            FROM
+                epdc_kpi_matters_response
+            WHERE
+                FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+    </select>
+    <update id="updateGridByDeptId">
+        UPDATE epdc_kpi_matters_response
+            SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW()
+            WHERE DEPT_ID = #{deptId}
+    </update>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPeopleEvaluateDao.xml

@@ -86,6 +86,23 @@
             and YEAR = #{year}
         </if>
     </select>
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.KpiPeopleEvaluateDTO">
+        SELECT
+                ID,
+                PARENT_DEPT_IDS,
+                PARENT_DEPT_NAMES,
+                ALL_DEPT_IDS,
+                ALL_DEPT_NAMES
+            FROM
+                epdc_kpi_people_evaluate
+            WHERE
+                FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+    </select>
+    <update id="updateGridByDeptId">
+        UPDATE epdc_kpi_people_evaluate
+            SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW()
+            WHERE DEPT_ID = #{deptId}
+    </update>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPublicOpinionDao.xml

@@ -90,6 +90,23 @@
             and MONTH_YEAR = #{monthYear}
         </if>
     </select>
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.KpiPublicOpinionDTO">
+        SELECT
+                ID,
+                PARENT_DEPT_IDS,
+                PARENT_DEPT_NAMES,
+                ALL_DEPT_IDS,
+                ALL_DEPT_NAMES
+            FROM
+                epdc_kpi_public_opinion
+            WHERE
+                FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+    </select>
+    <update id="updateGridByDeptId">
+        UPDATE epdc_kpi_public_opinion
+            SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW()
+            WHERE DEPT_ID = #{deptId}
+    </update>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/ManualScoreDao.xml

@@ -63,4 +63,16 @@
             left(m.`MONTH`, 7)= #{monthString}
             AND m.DEPT_ID = #{deptId}
     </select>
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.ManualScoreDTO">
+        SELECT
+                ID,
+                PARENT_DEPT_IDS,
+                PARENT_DEPT_NAMES,
+                ALL_DEPT_IDS,
+                ALL_DEPT_NAMES
+            FROM
+                epdc_manual_score
+            WHERE
+                FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+    </select>
 </mapper>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml

@@ -57,6 +57,23 @@
               </if>
         order by CREATED_TIME desc
     </select>
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.SubPositionCheckInfoDTO">
+        SELECT
+                ID,
+                PARENT_DEPT_IDS,
+                PARENT_DEPT_NAMES,
+                ALL_DEPT_IDS,
+                ALL_DEPT_NAMES
+            FROM
+                epdc_sub_position_check_info
+            WHERE
+                FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+    </select>
+    <update id="updateGridByDeptId">
+        UPDATE epdc_sub_position_check_info
+            SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW()
+            WHERE DEPT_ID = #{deptId}
+    </update>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java

@@ -34,4 +34,21 @@ public class OrganizationModifyDTO implements Serializable {
      * 部门类型
      */
     private String typeKey;
+
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java

@@ -17,10 +17,10 @@
 
 package com.elink.esua.epdc.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
@@ -28,11 +28,9 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.BannerDao;
 import com.elink.esua.epdc.dto.BannerDTO;
-import com.elink.esua.epdc.dto.NewsUserAttitudeDTO;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
@@ -42,7 +40,6 @@ import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.BannerDepartmentService;
 import com.elink.esua.epdc.service.BannerService;
 import com.elink.esua.epdc.util.NewsUtils;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -218,27 +215,47 @@ public class BannerServiceImpl extends BaseServiceImpl<BannerDao, BannerEntity>
         List<BannerEntity> entities = new ArrayList<>();
         for (BannerDTO banner: bannerList) {
             BannerEntity entity = new BannerEntity();
-            if (StringUtils.isNotEmpty(banner.getParentDeptIds()) && StringUtils.isNotEmpty(banner.getParentDeptNames())) {
-                List<String> parentDeptIds = Arrays.asList(banner.getParentDeptIds().split(","));
-                List<String> parentDeptNames = Arrays.asList(banner.getParentDeptNames().split("-"));
-                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && parentDeptNames.size() > index) {
-                    parentDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(banner.getId());
-                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
-                }
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(banner.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
             }
-
-            if (StringUtils.isNotEmpty(banner.getAllDeptIds()) && StringUtils.isNotEmpty(banner.getAllDeptNames())) {
+            if("community_party".equals(dto.getTypeKey())) {
                 List<String> allDeptIds = Arrays.asList(banner.getAllDeptIds().split(","));
                 List<String> allDeptNames = Arrays.asList(banner.getAllDeptNames().split("-"));
                 int index = allDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && allDeptNames.size() > index) {
-                    allDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(banner.getId());
-                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
-                }
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(banner.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
             }
+//            if (StringUtils.isNotEmpty(banner.getParentDeptIds()) && StringUtils.isNotEmpty(banner.getParentDeptNames())) {
+//                List<String> parentDeptIds = Arrays.asList(banner.getParentDeptIds().split(","));
+//                List<String> parentDeptNames = Arrays.asList(banner.getParentDeptNames().split("-"));
+//                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && parentDeptNames.size() > index) {
+//                    parentDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(banner.getId());
+//                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
+//                }
+//            }
+//
+//            if (StringUtils.isNotEmpty(banner.getAllDeptIds()) && StringUtils.isNotEmpty(banner.getAllDeptNames())) {
+//                List<String> allDeptIds = Arrays.asList(banner.getAllDeptIds().split(","));
+//                List<String> allDeptNames = Arrays.asList(banner.getAllDeptNames().split("-"));
+//                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && allDeptNames.size() > index) {
+//                    allDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(banner.getId());
+//                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
+//                }
+//            }
 
             entities.add(entity);
         }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@@ -515,27 +515,47 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         List<NewsEntity> entities = new ArrayList<>();
         for (NewsDTO news: newsList) {
             NewsEntity entity = new NewsEntity();
-            if (StringUtils.isNotEmpty(news.getParentDeptIds()) && StringUtils.isNotEmpty(news.getParentDeptNames())) {
-                List<String> parentDeptIds = Arrays.asList(news.getParentDeptIds().split(","));
-                List<String> parentDeptNames = Arrays.asList(news.getParentDeptNames().split("-"));
-                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && parentDeptNames.size() > index) {
-                    parentDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(news.getId());
-                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
-                }
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(news.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
             }
-
-            if (StringUtils.isNotEmpty(news.getAllDeptIds()) && StringUtils.isNotEmpty(news.getAllDeptNames())) {
+            if("community_party".equals(dto.getTypeKey())) {
                 List<String> allDeptIds = Arrays.asList(news.getAllDeptIds().split(","));
                 List<String> allDeptNames = Arrays.asList(news.getAllDeptNames().split("-"));
                 int index = allDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && allDeptNames.size() > index) {
-                    allDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(news.getId());
-                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
-                }
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(news.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
             }
+//            if (StringUtils.isNotEmpty(news.getParentDeptIds()) && StringUtils.isNotEmpty(news.getParentDeptNames())) {
+//                List<String> parentDeptIds = Arrays.asList(news.getParentDeptIds().split(","));
+//                List<String> parentDeptNames = Arrays.asList(news.getParentDeptNames().split("-"));
+//                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && parentDeptNames.size() > index) {
+//                    parentDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(news.getId());
+//                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
+//                }
+//            }
+//
+//            if (StringUtils.isNotEmpty(news.getAllDeptIds()) && StringUtils.isNotEmpty(news.getAllDeptNames())) {
+//                List<String> allDeptIds = Arrays.asList(news.getAllDeptIds().split(","));
+//                List<String> allDeptNames = Arrays.asList(news.getAllDeptNames().split("-"));
+//                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && allDeptNames.size() > index) {
+//                    allDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(news.getId());
+//                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
+//                }
+//            }
 
             entities.add(entity);
         }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java

@@ -17,10 +17,10 @@
 
 package com.elink.esua.epdc.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
@@ -28,7 +28,6 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.NoticeDao;
 import com.elink.esua.epdc.dto.NoticeDTO;
@@ -44,7 +43,6 @@ import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.NoticeDepartmentService;
 import com.elink.esua.epdc.service.NoticeService;
 import com.elink.esua.epdc.util.NewsUtils;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -259,27 +257,47 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
         List<NoticeEntity> entities = new ArrayList<>();
         for (NoticeDTO notice: noticeList) {
             NoticeEntity entity = new NoticeEntity();
-            if (StringUtils.isNotEmpty(notice.getParentDeptIds()) && StringUtils.isNotEmpty(notice.getParentDeptNames())) {
-                List<String> parentDeptIds = Arrays.asList(notice.getParentDeptIds().split(","));
-                List<String> parentDeptNames = Arrays.asList(notice.getParentDeptNames().split("-"));
-                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && parentDeptNames.size() > index) {
-                    parentDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(notice.getId());
-                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
-                }
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(notice.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
             }
-
-            if (StringUtils.isNotEmpty(notice.getAllDeptIds()) && StringUtils.isNotEmpty(notice.getAllDeptNames())) {
+            if("community_party".equals(dto.getTypeKey())) {
                 List<String> allDeptIds = Arrays.asList(notice.getAllDeptIds().split(","));
                 List<String> allDeptNames = Arrays.asList(notice.getAllDeptNames().split("-"));
                 int index = allDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && allDeptNames.size() > index) {
-                    allDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(notice.getId());
-                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
-                }
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(notice.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
             }
+//            if (StringUtils.isNotEmpty(notice.getParentDeptIds()) && StringUtils.isNotEmpty(notice.getParentDeptNames())) {
+//                List<String> parentDeptIds = Arrays.asList(notice.getParentDeptIds().split(","));
+//                List<String> parentDeptNames = Arrays.asList(notice.getParentDeptNames().split("-"));
+//                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && parentDeptNames.size() > index) {
+//                    parentDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(notice.getId());
+//                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
+//                }
+//            }
+//
+//            if (StringUtils.isNotEmpty(notice.getAllDeptIds()) && StringUtils.isNotEmpty(notice.getAllDeptNames())) {
+//                List<String> allDeptIds = Arrays.asList(notice.getAllDeptIds().split(","));
+//                List<String> allDeptNames = Arrays.asList(notice.getAllDeptNames().split("-"));
+//                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && allDeptNames.size() > index) {
+//                    allDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(notice.getId());
+//                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
+//                }
+//            }
 
             entities.add(entity);
         }