From e382326506252ebb4ae0628527cb90ac19b2bcad Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 18 Dec 2019 14:13:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E5=92=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/SysDeptController.java | 2 +- .../esua/epdc/service/SysDeptService.java | 2 +- .../epdc/service/impl/SysDeptServiceImpl.java | 2 +- .../esua/epdc/dto/KpiManualScoreDTO.java | 5 ++ .../elink/esua/epdc/dto/KpiResultGridDTO.java | 4 +- .../epdc/entity/KpiManualScoreEntity.java | 5 ++ .../esua/epdc/entity/KpiResultGridEntity.java | 4 +- .../esua/epdc/feign/AdminFeignClient.java | 24 +++++---- .../fallback/AdminFeignClientFallback.java | 20 +++----- .../impl/KpiManualScoreServiceImpl.java | 50 +++++++++---------- .../resources/mapper/KpiResultGridDao.xml | 23 --------- 11 files changed, 62 insertions(+), 79 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 1d4c0bbea..b54498637 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -238,7 +238,7 @@ public class SysDeptController { */ @GetMapping("getDeptInfoById/{deptId}/{leaderFlag}") public Result getDeptInfoById(@PathVariable("deptId") Long deptId, - @PathVariable("leaderFlag") Integer leaderFlag) { + @PathVariable("leaderFlag") String leaderFlag) { DeptLevelAndLeaderDTO dto = sysDeptService.getDeptInfoById(deptId, leaderFlag); return new Result().ok(dto); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index aa02c4d19..798a63021 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -201,5 +201,5 @@ public interface SysDeptService extends BaseService { * @author work@yujt.net.cn * @date 2019/12/18 11:05 */ - DeptLevelAndLeaderDTO getDeptInfoById(Long deptId, Integer leaderFlag); + DeptLevelAndLeaderDTO getDeptInfoById(Long deptId, String leaderFlag); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index aff0caf36..7708fecc0 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -523,7 +523,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl> queryUserSysDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO); - /** - * @param deptId - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 根据部门ID获取上级所有部门信息 - * @Date 2019/12/6 19:49 - **/ - @GetMapping("/sys/dept/getParentAndAllDept/{deptId}") - Result getParentAndAllDept(@PathVariable("deptId") String deptId); - /** * @param id * @return com.elink.esua.epdc.commons.tools.utils.Result @@ -81,4 +72,17 @@ public interface AdminFeignClient { Result> pageDeptIdByTypeKey(@PathVariable("typeKey") String typeKey, @PathVariable("pageSize") Integer pageSize, @PathVariable("pageIndex") Integer pageIndex); + + /** + * 根据部门id，获取部门层级关系，获取部门领导姓名 + * + * @param deptId 部门id + * @param leaderFlag 是否需要查询网格长姓名 0 否 、1 是 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/12/18 13:54 + */ + @GetMapping("/sys/dept/getDeptInfoById/{deptId}/{leaderFlag}") + Result getDeptInfoById(@PathVariable("deptId") Long deptId, + @PathVariable("leaderFlag") String leaderFlag); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index a62df24c6..e38fed3f1 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; @@ -31,18 +32,6 @@ public class AdminFeignClientFallback implements AdminFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "queryUserSysDeptInfo", userSysDeptInfoFormDTO); } - /** - * @param deptId - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 根据部门ID获取上级所有部门信息 - * @Date 2019/12/6 19:49 - **/ - @Override - public Result getParentAndAllDept(String deptId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId); - } - /** * @param id * @return com.elink.esua.epdc.commons.tools.utils.Result @@ -64,11 +53,16 @@ public class AdminFeignClientFallback implements AdminFeignClient { */ @Override public Result> listAllGridId() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listAllGridId", "1"); + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listAllGridId", ""); } @Override public Result> pageDeptIdByTypeKey(String typeKey, Integer pageSize, Integer pageIndex) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "pageDeptIdByTypeKey", typeKey, pageSize, pageIndex); } + + @Override + public Result getDeptInfoById(Long deptId, String leaderFlag) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptInfoById", deptId, leaderFlag); + } } 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 18eb6c410..b32fa2455 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 @@ -26,6 +26,7 @@ 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.StrConstant; +import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; @@ -38,10 +39,7 @@ import com.elink.esua.epdc.dao.KpiManualScoreDao; import com.elink.esua.epdc.dao.KpiManualScoreRuleDao; import com.elink.esua.epdc.dao.KpiResultGridDao; import com.elink.esua.epdc.dao.KpiRuleDao; -import com.elink.esua.epdc.dto.KpiManualScoreDTO; -import com.elink.esua.epdc.dto.KpiResultGridDTO; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.SysDeptDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; import com.elink.esua.epdc.dto.result.KpiManualScoreResultDTO; @@ -315,12 +313,12 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl map = new HashMap(); - map.put("deptId",kpiManualScoreEntity.getDeptId()); - map.put("scoreStartDate",kpiManualScoreEntity.getScoreStartDate()); - map.put("scoreEndDate",kpiManualScoreEntity.getScoreEndDate()); - KpiResultGridDTO kpiResultGridDto = kpiResultGridDao.selectManualScoringISExist(map); - if (!(kpiResultGridDto != null)) { //insert + Map map = new HashMap<>(); + map.put("deptId", kpiManualScoreEntity.getDeptId()); + map.put("scoreStartDate", kpiManualScoreEntity.getScoreStartDate()); + map.put("scoreEndDate", kpiManualScoreEntity.getScoreEndDate()); + KpiResultGridDTO kpiResultGridDto = kpiResultGridDao.selectManualScoringISExist(map); + if (null == kpiResultGridDto) { KpiResultGridEntity kpiResultGridEntity = ConvertUtils.sourceToTarget(kpiManualScoreEntity, KpiResultGridEntity.class); kpiResultGridEntity.setGridId(kpiManualScoreEntity.getDeptId()); kpiResultGridEntity.setManualScore(kpiManualScoreEntity.getScore()); @@ -330,7 +328,7 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId())); - if (!parentAndAllDeptDTOResult.success()) { - return new Result().error(parentAndAllDeptDTOResult.getMsg()); + Result adminResult = adminFeignClient.getDeptInfoById(dto.getDeptId(), YesOrNoEnum.YES.value()); + if (!adminResult.success()) { + return new Result().error(adminResult.getMsg()); } - dto.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); - dto.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds()); - dto.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames()); - dto.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds()); + DeptLevelAndLeaderDTO deptLevel = adminResult.getData(); + dto.setAllDeptNames(deptLevel.getAllDeptNames()); + dto.setAllDeptIds(deptLevel.getAllDeptIds()); + dto.setParentDeptNames(deptLevel.getParentDeptNames()); + dto.setParentDeptIds(deptLevel.getParentDeptIds()); + dto.setLeaderName(deptLevel.getLeaderName()); UserDetail user = SecurityUser.getUser(); dto.setCreatorDeptId(user.getDeptId()); dto.setCreatorDeptName(user.getDeptName()); @@ -456,18 +455,17 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl map = new HashMap(); - map.put("deptId",dto.getDeptId()); - map.put("scoreStartDate",dto.getScoreStartDate()); - map.put("scoreEndDate",dto.getScoreEndDate()); - KpiResultGridDTO kpiResultGridDto = kpiResultGridDao.selectManualScoringISExist(map); - if (kpiResultGridDto != null){ //update + Map map = new HashMap<>(); + map.put("deptId", dto.getDeptId()); + map.put("scoreStartDate", dto.getScoreStartDate()); + map.put("scoreEndDate", dto.getScoreEndDate()); + KpiResultGridDTO kpiResultGridDto = kpiResultGridDao.selectManualScoringISExist(map); + if (kpiResultGridDto != null) { //update KpiResultGridEntity kpiResultGridEntity = new KpiResultGridEntity(); kpiResultGridEntity.setId(kpiResultGridDto.getId()); kpiResultGridEntity.setManualScore(dto.getScore()); kpiResultGridDao.updateById(kpiResultGridEntity); } - return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml index 2bc70c7f0..126e29014 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml @@ -3,29 +3,6 @@ - - - - - - - - - - - - - - - - - - - - - - -