diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiCaseHandlingDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiCaseHandlingDao.java index dcdf6ab99..1af1e23be 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiCaseHandlingDao.java +++ b/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 { */ List getDuplicateData(CheckIsScoredFormDTO checkIsScoredFormDTO); + /** + * @describe: 查询需要修改组织机构信息事件 + * @author wangtong + * @date 2021/7/27 14:06 + * @params [toString] + * @return java.util.List + */ + List selectListOfOrganizationInfo(String deptId); + + /** + * @describe: 更新网格名称 + * @author wangtong + * @date 2021/7/27 14:13 + * @params [newDeptName, deptId] + * @return void + */ + void updateGridByDeptId(String newDeptName, Long deptId); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiCommunityBuildingDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiCommunityBuildingDao.java index 8dc09a8cb..91d82d246 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiCommunityBuildingDao.java +++ b/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 + */ + List selectListOfOrganizationInfo(String deptId); + + /** + * @describe: 更新网格名称 + * @author wangtong + * @date 2021/7/27 14:35 + * @params [newDeptName, deptId] + * @return void + */ + void updateGridByDeptId(String newDeptName, Long deptId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java index 09b8db840..d0c3c3db5 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java +++ b/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 { */ 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 + */ + List selectListOfOrganizationInfo(String deptId); + + /** + * @describe: 更新网格名称 + * @author wangtong + * @date 2021/7/27 15:02 + * @params [newDeptName, deptId] + * @return void + */ + void updateGridByDeptId(String newDeptName, Long deptId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMassEvaluationDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMassEvaluationDao.java index af0bc6d6e..4280c0f8a 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMassEvaluationDao.java +++ b/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 { * @return */ List getDuplicateData(CheckIsScoredByYearFormDTO checkIsScoredByYearFormDTO); + + /** + * @describe: 查询需要修改组织机构信息事件 + * @author wangtong + * @date 2021/7/27 15:22 + * @params [toString] + * @return java.util.List + */ + List selectListOfOrganizationInfo(String deptId); + + /** + * @describe: 更新网格名称 + * @author wangtong + * @date 2021/7/27 15:23 + * @params [newDeptName, deptId] + * @return void + */ + void updateGridByDeptId(String newDeptName, Long deptId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMattersResponseDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMattersResponseDao.java index b6745a887..13fc62803 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMattersResponseDao.java +++ b/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 * @return */ List getInfoPage(Map params); + + /** + * @describe: 查询需要修改组织机构信息事件 + * @author wangtong + * @date 2021/7/27 15:26 + * @params [toString] + * @return java.util.List + */ + List selectListOfOrganizationInfo(String deptId); + + /** + * @describe: 更新网格名称 + * @author wangtong + * @date 2021/7/27 15:28 + * @params [newDeptName, deptId] + * @return void + */ + void updateGridByDeptId(String newDeptName, Long deptId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPeopleEvaluateDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPeopleEvaluateDao.java index 164f7e755..796acac60 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPeopleEvaluateDao.java +++ b/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 { */ List getDuplicateData(CheckIsScoredByYearFormDTO checkIsScoredByYearFormDTO); + /** + * @describe: 查询需要修改组织机构信息事件 + * @author wangtong + * @date 2021/7/27 15:30 + * @params [toString] + * @return java.util.List + */ + List selectListOfOrganizationInfo(String deptId); + + /** + * @describe: 更新网格名称 + * @author wangtong + * @date 2021/7/27 15:31 + * @params [newDeptName, deptId] + * @return void + */ + void updateGridByDeptId(String newDeptName, Long deptId); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPublicOpinionDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPublicOpinionDao.java index 1a9b14d71..58e56db7b 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPublicOpinionDao.java +++ b/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 { * @return */ List getDuplicateData(CheckIsScoredFormDTO checkIsScoredFormDTO); + + /** + * @describe: 查询需要修改组织机构信息事件 + * @author wangtong + * @date 2021/7/27 15:33 + * @params [toString] + * @return java.util.List + */ + List selectListOfOrganizationInfo(String deptId); + + /** + * @describe: 更新网格名称 + * @author wangtong + * @date 2021/7/27 15:34 + * @params [newDeptName, deptId] + * @return void + */ + void updateGridByDeptId(String newDeptName, Long deptId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/ManualScoreDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/ManualScoreDao.java index 055a981d2..3c1badc6b 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/ManualScoreDao.java +++ b/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 { * @Date: 2020-04-21 */ List checkDeptWhetherManualScore(ManualScoreDTO dto); + + /** + * @describe: 查询需要修改组织机构信息事件 + * @author wangtong + * @date 2021/7/27 15:40 + * @params [toString] + * @return java.util.List + */ + List selectListOfOrganizationInfo(String deptId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckInfoDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckInfoDao.java index bc733e54a..dfd13ff63 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckInfoDao.java +++ b/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 */ List getSubPositionList(Map params); + + /** + * @describe: 查询需要修改组织机构信息事件 + * @author wangtong + * @date 2021/7/27 15:49 + * @params [toString] + * @return java.util.List + */ + List selectListOfOrganizationInfo(String deptId); + + /** + * @describe: 更新网格名称 + * @author wangtong + * @date 2021/7/27 15:50 + * @params [newDeptName, deptId] + * @return void + */ + void updateGridByDeptId(String newDeptName, Long deptId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/rocketmq/consumer/OrganizationModifyConsumer.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/rocketmq/consumer/OrganizationModifyConsumer.java index feae86255..143912358 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/rocketmq/consumer/OrganizationModifyConsumer.java +++ b/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 @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 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()); diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java index cee87f782..4849dd0ee 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiCaseHandlingService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiCaseHandlingService.java index aed0adbf2..d01ea329f 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiCaseHandlingService.java +++ b/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 { * @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); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMassEvaluationService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMassEvaluationService.java index 62220fb83..2a3ceb0d9 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMassEvaluationService.java +++ b/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 { * @Date: 2020-04-14 */ PageData listManualScoreResultDTO(Map params); + + /** + * + * 事件修改组织机构信息 + * + * @params [dto] + * @return void + * @author wangtong + * @since 2021/7/27 14:23 + */ + void modifyOrganizationInfo(OrganizationModifyDTO dto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckInfoService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckInfoService.java index f8ee6ee66..da3afcc85 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckInfoService.java +++ b/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 caseList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString()); + if (null != caseList && caseList.size() > 0) { + // 组织机构信息处理 + List entities = handleOrganizationInfo(dto, caseList); + // 更新事件组织机构信息 + updateBatchById(entities); + } + + // 更新网格名称 + baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId()); + } + + + private List handleOrganizationInfo(OrganizationModifyDTO dto, List caseList) { + List 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 allDeptIds = Arrays.asList(cases.getAllDeptIds().split(",")); + List 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 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java index 6e253487a..2e2c734b5 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java +++ b/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 communityList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString()); + if (null != communityList && communityList.size() > 0) { + // 组织机构信息处理 + List entities = handleOrganizationInfo(dto, communityList); + // 更新事件组织机构信息 + updateBatchById(entities); + } + // 更新网格名称 + baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId()); + } + + + private List handleOrganizationInfo(OrganizationModifyDTO dto, List communityList) { + List 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 allDeptIds = Arrays.asList(community.getAllDeptIds().split(",")); + List 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; + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java index 46d22fb7c..611e321da 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java +++ b/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 communityList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString()); + if (null != communityList && communityList.size() > 0) { + // 组织机构信息处理 + List entities = handleOrganizationInfo(dto, communityList); + // 更新事件组织机构信息 + updateBatchById(entities); + } + // 更新网格名称 + baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId()); + } + + private List handleOrganizationInfo(OrganizationModifyDTO dto, List communityList) { + List 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 allDeptIds = Arrays.asList(community.getAllDeptIds().split(",")); + List 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; + } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java index a44e1ff6a..3808aa2c6 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java +++ b/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 entities = new ArrayList<>(); for (KpiManualScoreDTO score: scoreList) { KpiManualScoreEntity entity = new KpiManualScoreEntity(); - if (StringUtils.isNotEmpty(score.getParentDeptIds()) && StringUtils.isNotEmpty(score.getParentDeptNames())) { - List parentDeptIds = Arrays.asList(score.getParentDeptIds().split(",")); - List 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 allDeptIds = Arrays.asList(score.getAllDeptIds().split(",")); List 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 parentDeptIds = Arrays.asList(score.getParentDeptIds().split(",")); +// List 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 allDeptIds = Arrays.asList(score.getAllDeptIds().split(",")); +// List 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); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMassEvaluationServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMassEvaluationServiceImpl.java index 248521384..e89564f9a 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMassEvaluationServiceImpl.java +++ b/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 massList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString()); + if (null != massList && massList.size() > 0) { + // 组织机构信息处理 + List entities = handleOrganizationInfo(dto, massList); + // 更新事件组织机构信息 + updateBatchById(entities); + } + // 更新网格名称 + baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId()); + } + + + private List handleOrganizationInfo(OrganizationModifyDTO dto, List massList) { + List 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 allDeptIds = Arrays.asList(mass.getAllDeptIds().split(",")); + List 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; + } + } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMattersResponseServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMattersResponseServiceImpl.java index 27991b3e7..b04f065fe 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMattersResponseServiceImpl.java +++ b/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 massList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString()); + if (null != massList && massList.size() > 0) { + // 组织机构信息处理 + List entities = handleOrganizationInfo(dto, massList); + // 更新事件组织机构信息 + updateBatchById(entities); + } + // 更新网格名称 + baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId()); + } + + + private List handleOrganizationInfo(OrganizationModifyDTO dto, List massList) { + List 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 allDeptIds = Arrays.asList(mass.getAllDeptIds().split(",")); + List 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; + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPeopleEvaluateServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPeopleEvaluateServiceImpl.java index ec4517ec0..926b61176 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPeopleEvaluateServiceImpl.java +++ b/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 peopleList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString()); + if (null != peopleList && peopleList.size() > 0) { + // 组织机构信息处理 + List entities = handleOrganizationInfo(dto, peopleList); + // 更新事件组织机构信息 + updateBatchById(entities); + } + // 更新网格名称 + baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId()); + } + + + private List handleOrganizationInfo(OrganizationModifyDTO dto, List peopleList) { + List 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 allDeptIds = Arrays.asList(people.getAllDeptIds().split(",")); + List 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; + } + } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPublicOpinionServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPublicOpinionServiceImpl.java index 4bc4e8d39..f20b5b353 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPublicOpinionServiceImpl.java +++ b/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 peopleList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString()); + if (null != peopleList && peopleList.size() > 0) { + // 组织机构信息处理 + List entities = handleOrganizationInfo(dto, peopleList); + // 更新事件组织机构信息 + updateBatchById(entities); + } + // 更新网格名称 + baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId()); + } + + + private List handleOrganizationInfo(OrganizationModifyDTO dto, List peopleList) { + List 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 allDeptIds = Arrays.asList(people.getAllDeptIds().split(",")); + List 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; + } + + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java index f1dd854c5..8306e0762 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java +++ b/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 entities = new ArrayList<>(); for (KpiResultGridDTO grid: gridList) { KpiResultGridEntity entity = new KpiResultGridEntity(); - if (StringUtils.isNotEmpty(grid.getParentDeptIds()) && StringUtils.isNotEmpty(grid.getParentDeptNames())) { - List parentDeptIds = Arrays.asList(grid.getParentDeptIds().split(",")); - List 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 allDeptIds = Arrays.asList(grid.getAllDeptIds().split(",")); List 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 parentDeptIds = Arrays.asList(grid.getParentDeptIds().split(",")); +// List 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 allDeptIds = Arrays.asList(grid.getAllDeptIds().split(",")); +// List 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); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultSuperiorServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultSuperiorServiceImpl.java index c5178b200..c8d5b0073 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultSuperiorServiceImpl.java +++ b/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 entities = new ArrayList<>(); for (KpiResultSuperiorDTO superior: superiorList) { KpiResultSuperiorEntity entity = new KpiResultSuperiorEntity(); - if (StringUtils.isNotEmpty(superior.getParentDeptIds()) && StringUtils.isNotEmpty(superior.getParentDeptNames())) { - List parentDeptIds = Arrays.asList(superior.getParentDeptIds().split(",")); - List 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 allDeptIds = Arrays.asList(superior.getAllDeptIds().split(",")); List 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 parentDeptIds = Arrays.asList(superior.getParentDeptIds().split(",")); +// List 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 allDeptIds = Arrays.asList(superior.getAllDeptIds().split(",")); +// List 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); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java index 7176df09b..7ad2aeb79 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java +++ b/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 scoreList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString()); + if (null != scoreList && scoreList.size() > 0) { + // 组织机构信息处理 + List entities = handleOrganizationInfo(dto, scoreList); + // 更新事件组织机构信息 + updateBatchById(entities); + } + } + + + private List handleOrganizationInfo(OrganizationModifyDTO dto, List scoreList) { + List 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 allDeptIds = Arrays.asList(score.getAllDeptIds().split(",")); + List 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; + } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java index 01182225c..fceaeb409 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java +++ b/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 checkList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString()); + if (null != checkList && checkList.size() > 0) { + // 组织机构信息处理 + List entities = handleOrganizationInfo(dto, checkList); + // 更新事件组织机构信息 + updateBatchById(entities); + } + // 更新网格名称 + baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId()); + } + + + private List handleOrganizationInfo(OrganizationModifyDTO dto, List checkList) { + List 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 allDeptIds = Arrays.asList(check.getAllDeptIds().split(",")); + List 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; + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCaseHandlingDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCaseHandlingDao.xml index 461048f54..d98acc8ae 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCaseHandlingDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCaseHandlingDao.xml @@ -87,6 +87,23 @@ and MONTH_YEAR = #{monthYear} + + + UPDATE epdc_kpi_case_handling + SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW() + WHERE DEPT_ID = #{deptId} + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCommunityBuildingDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCommunityBuildingDao.xml index 9be0d884e..f1934949c 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCommunityBuildingDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCommunityBuildingDao.xml @@ -134,6 +134,23 @@ #{item.delFlag}) + + + UPDATE epdc_kpi_community_building + SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW() + WHERE DEPT_ID = #{deptId} + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml index 53619415a..ba19176e8 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml +++ b/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 epdc_kpi_grid_entity + SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW() + WHERE DEPT_ID = #{deptId} + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMassEvaluationDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMassEvaluationDao.xml index ddbcd3c15..cd521ec0f 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMassEvaluationDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMassEvaluationDao.xml @@ -90,6 +90,23 @@ and YEAR = #{year} + + + UPDATE epdc_kpi_mass_evaluation + SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW() + WHERE DEPT_ID = #{deptId} + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMattersResponseDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMattersResponseDao.xml index 2f35bf776..38a37591b 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMattersResponseDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMattersResponseDao.xml @@ -58,6 +58,23 @@ order by UPDATED_TIME desc + + + UPDATE epdc_kpi_matters_response + SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW() + WHERE DEPT_ID = #{deptId} + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPeopleEvaluateDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPeopleEvaluateDao.xml index 8ef689a3b..868450a6a 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPeopleEvaluateDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPeopleEvaluateDao.xml @@ -86,6 +86,23 @@ and YEAR = #{year} + + + UPDATE epdc_kpi_people_evaluate + SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW() + WHERE DEPT_ID = #{deptId} + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPublicOpinionDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPublicOpinionDao.xml index 3731cb659..f0ed6516c 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPublicOpinionDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPublicOpinionDao.xml @@ -90,6 +90,23 @@ and MONTH_YEAR = #{monthYear} + + + UPDATE epdc_kpi_public_opinion + SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW() + WHERE DEPT_ID = #{deptId} + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/ManualScoreDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/ManualScoreDao.xml index 06b5e606d..b3abb364c 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/ManualScoreDao.xml +++ b/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} + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml index 449545f82..52369e348 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml @@ -57,6 +57,23 @@ order by CREATED_TIME desc + + + UPDATE epdc_sub_position_check_info + SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW() + WHERE DEPT_ID = #{deptId} + \ No newline at end of file