elink-star
/
esua-epdc-cloud
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改字段和调整代码

feature/dangjian
yujintao 6 years ago
parent
0d0e62c129
commit
e382326506
11 changed files with 62 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
  2. 2
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
  3. 2
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
  4. 5
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreDTO.java
  5. 4
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiResultGridDTO.java
  6. 5
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreEntity.java
  7. 4
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiResultGridEntity.java
  8. 24
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
  9. 20
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
  10. 50
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java
  11. 23
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml

2
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
View File

@ -238,7 +238,7 @@ public class SysDeptController {
*/
@GetMapping("getDeptInfoById/{deptId}/{leaderFlag}")
public Result<DeptLevelAndLeaderDTO> getDeptInfoById(@PathVariable("deptId") Long deptId,
@PathVariable("leaderFlag") Integer leaderFlag) {
@PathVariable("leaderFlag") String leaderFlag) {
DeptLevelAndLeaderDTO dto = sysDeptService.getDeptInfoById(deptId, leaderFlag);
return new Result<DeptLevelAndLeaderDTO>().ok(dto);
}

2
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
View File

@ -201,5 +201,5 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
* @author work@yujt.net.cn
* @date 2019/12/18 11:05
*/
DeptLevelAndLeaderDTO getDeptInfoById(Long deptId, Integer leaderFlag);
DeptLevelAndLeaderDTO getDeptInfoById(Long deptId, String leaderFlag);
}

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

@ -523,7 +523,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
}
@Override
public DeptLevelAndLeaderDTO getDeptInfoById(Long deptId, Integer leaderFlag) {
public DeptLevelAndLeaderDTO getDeptInfoById(Long deptId, String leaderFlag) {
if (null == deptId || null == leaderFlag) {
return null;
}

5
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreDTO.java
View File

@ -137,6 +137,11 @@ public class KpiManualScoreDTO implements Serializable {
*/
private Long creatorDeptId;
/**
* 被考核部门的网格长姓名
*/
private String leaderName;
/**
* 考核周期起始月
*/

4
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiResultGridDTO.java
View File

@ -75,9 +75,9 @@ public class KpiResultGridDTO implements Serializable {
private Date endDate;
/**
* 网格长名称
* 被考核部门的网格长姓名
*/
private String gridLeader;
private String leaderName;
/**
* 考核周期(字典值 代表月，季，年)

5
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreEntity.java
View File

@ -94,4 +94,9 @@ public class KpiManualScoreEntity extends BaseEpdcEntity {
*/
private Long creatorDeptId;
/**
* 被考核部门的网格长姓名
*/
private String leaderName;
}

4
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiResultGridEntity.java
View File

@ -75,9 +75,9 @@ public class KpiResultGridEntity extends BaseEpdcEntity {
private Date endDate;
/**
* 网格长名称
* 被考核部门的网格长姓名
*/
private String gridLeader;
private String leaderName;
/**
* 考核周期(字典值 代表月，季，年)

24
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
View File

@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
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;
@ -36,16 +37,6 @@ public interface AdminFeignClient {
@PostMapping(value = "sys/dept/queryUserSysDeptInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<UserSysDeptInfoResultDTO>> queryUserSysDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO);
/**
* @param deptId
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.ParentAndAllDeptDTO>
* @Author yinzuomei
* @Description 根据部门ID获取上级所有部门信息
* @Date 2019/12/6 19:49
**/
@GetMapping("/sys/dept/getParentAndAllDept/{deptId}")
Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") String deptId);
/**
* @param id
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.SysDeptDTO>
@ -81,4 +72,17 @@ public interface AdminFeignClient {
Result<List<Long>> 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<com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO>
* @author work@yujt.net.cn
* @date 2019/12/18 13:54
*/
@GetMapping("/sys/dept/getDeptInfoById/{deptId}/{leaderFlag}")
Result<DeptLevelAndLeaderDTO> getDeptInfoById(@PathVariable("deptId") Long deptId,
@PathVariable("leaderFlag") String leaderFlag);
}

20
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
View File

@ -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<com.elink.esua.epdc.dto.ParentAndAllDeptDTO>
* @Author yinzuomei
* @Description 根据部门ID获取上级所有部门信息
* @Date 2019/12/6 19:49
**/
@Override
public Result<ParentAndAllDeptDTO> getParentAndAllDept(String deptId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId);
}
/**
* @param id
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.SysDeptDTO>
@ -64,11 +53,16 @@ public class AdminFeignClientFallback implements AdminFeignClient {
*/
@Override
public Result<List<Long>> listAllGridId() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listAllGridId", "1");
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listAllGridId", "");
}
@Override
public Result<List<Long>> pageDeptIdByTypeKey(String typeKey, Integer pageSize, Integer pageIndex) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "pageDeptIdByTypeKey", typeKey, pageSize, pageIndex);
}
@Override
public Result<DeptLevelAndLeaderDTO> getDeptInfoById(Long deptId, String leaderFlag) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptInfoById", deptId, leaderFlag);
}
}

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

@ -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<KpiManualScoreDao
baseDao.insert(kpiManualScoreEntity);
//查询网格考核最终得分表:条件(deptId,scoreStartDate,scoreEndDate)
Map<String,Object> map = new HashMap<String, Object>();
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<String, Object> 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<KpiManualScoreDao
KpiRuleQueryResultDTO kpiCycle = kpiRuleDao.queryDetailInfo(kpiManualScoreEntity.getRuleId());
kpiResultGridEntity.setKpiCycle(kpiCycle.getKpiCycle());
kpiResultGridDao.insert(kpiResultGridEntity);
}else { //update
} else { //update
//查询考核部门类别
KpiResultGridEntity kpiResultGridEntity = new KpiResultGridEntity();
kpiResultGridEntity.setId(kpiResultGridDto.getId());
@ -424,15 +422,16 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
dto.setScoreEndDate(LocalDateUtils.localDateToDate(scoreStartMonth.plusMonths(NumConstant.ELEVEN).atEndOfMonth()));
}
//根据部门ID获取上级所有部门信息
Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
if (!parentAndAllDeptDTOResult.success()) {
return new Result().error(parentAndAllDeptDTOResult.getMsg());
Result<DeptLevelAndLeaderDTO> 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<KpiManualScoreDao
}
updateById(entity);
//查询网格考核最终得分表:条件(deptId,scoreStartDate,scoreEndDate)
Map<String,Object> map = new HashMap<String, Object>();
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<String, Object> 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();
}

23
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml
View File

@ -3,29 +3,6 @@
<mapper namespace="com.elink.esua.epdc.dao.KpiResultGridDao">
<resultMap type="com.elink.esua.epdc.entity.KpiResultGridEntity" id="kpiResultGridMap">
<result property="id" column="ID"/>
<result property="gridId" column="grid_id"/>
<result property="manualScore" column="manual_score"/>
<result property="workScore" column="work_score"/>
<result property="voteScore" column="vote_score"/>
<result property="finalScore" column="final_score"/>
<result property="startDate" column="start_date"/>
<result property="endDate" column="end_date"/>
<result property="gridLeader" column="grid_leader"/>
<result property="kpiCycle" column="kpi_cycle"/>
<result property="parentDeptIds" column="parent_dept_ids"/>
<result property="parentDeptNames" column="parent_dept_names"/>
<result property="allDeptIds" column="all_dept_ids"/>
<result property="allDeptNames" column="all_dept_names"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="delFlag" column="DEL_FLAG"/>
</resultMap>
<!-- 查询网格考核最终得分表中，当前考核规则数据是否存在 -->
<select id="selectManualScoringISExist" resultType="com.elink.esua.epdc.dto.KpiResultGridDTO">
SELECT

Write Preview
Loading…
Cancel
Save