epdc_kpi_manual_score改为epdc_kpi_manual_score_rule

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreDTO.java → esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreRuleDTO.java

@@ -30,7 +30,7 @@ import java.math.BigDecimal;
  * @since v1.0.0 2019-12-02
  */
 @Data
-public class KpiManualScoreDTO implements Serializable {
+public class KpiManualScoreRuleDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java → esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreRuleController.java

@@ -25,10 +25,10 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.KpiManualScoreDTO;
+import com.elink.esua.epdc.dto.KpiManualScoreRuleDTO;
 import com.elink.esua.epdc.dto.result.KpiManualScoreDictResultDTO;
-import com.elink.esua.epdc.excel.KpiManualScoreExcel;
+import com.elink.esua.epdc.excel.KpiManualScoreRuleExcel;
-import com.elink.esua.epdc.service.KpiManualScoreService;
+import com.elink.esua.epdc.service.KpiManualScoreRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,50 +44,50 @@ import java.util.Map;
  * @since v1.0.0 2019-12-02
  */
 @RestController
-@RequestMapping("kpimanualscore")
+@RequestMapping("kpimanualscorerule")
-public class KpiManualScoreController {
+public class KpiManualScoreRuleController {
 
     @Autowired
-    private KpiManualScoreService kpiManualScoreService;
+    private KpiManualScoreRuleService kpiManualScoreRuleService;
 
     @GetMapping("page")
-    public Result<PageData<KpiManualScoreDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<KpiManualScoreRuleDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<KpiManualScoreDTO> page = kpiManualScoreService.page(params);
+        PageData<KpiManualScoreRuleDTO> page = kpiManualScoreRuleService.page(params);
-        return new Result<PageData<KpiManualScoreDTO>>().ok(page);
+        return new Result<PageData<KpiManualScoreRuleDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<KpiManualScoreDTO> get(@PathVariable("id") String id){
+    public Result<KpiManualScoreRuleDTO> get(@PathVariable("id") String id){
-        KpiManualScoreDTO data = kpiManualScoreService.get(id);
+        KpiManualScoreRuleDTO data = kpiManualScoreRuleService.get(id);
-        return new Result<KpiManualScoreDTO>().ok(data);
+        return new Result<KpiManualScoreRuleDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody KpiManualScoreDTO dto){
+    public Result save(@RequestBody KpiManualScoreRuleDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        kpiManualScoreService.save(dto);
+	    kpiManualScoreRuleService.save(dto);
         return new Result();
     }
 
     @PutMapping
-    public Result update(@RequestBody KpiManualScoreDTO dto){
+    public Result update(@RequestBody KpiManualScoreRuleDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        return kpiManualScoreService.update(dto);
+        return kpiManualScoreRuleService.update(dto);
     }
 
     @DeleteMapping
     public Result delete(@RequestBody String[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
-        return kpiManualScoreService.delete(ids);
+        return kpiManualScoreRuleService.delete(ids);
     }
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<KpiManualScoreDTO> list = kpiManualScoreService.list(params);
+        List<KpiManualScoreRuleDTO> list = kpiManualScoreRuleService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, KpiManualScoreExcel.class);
+        ExcelUtils.exportExcelToTarget(response, null, list, KpiManualScoreRuleExcel.class);
     }
 
     /**
@@ -99,6 +99,6 @@ public class KpiManualScoreController {
      **/
     @GetMapping("getKpiManualScoreList")
     public Result<List<KpiManualScoreDictResultDTO>> getKpiManualScoreList() {
-        return kpiManualScoreService.listKpiManualScoreDictListDTO();
+        return kpiManualScoreRuleService.listKpiManualScoreDictListDTO();
     }
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiManualScoreDao.java → esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiManualScoreRuleDao.java

@@ -19,7 +19,7 @@ package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.result.KpiManualScoreDictResultDTO;
-import com.elink.esua.epdc.entity.KpiManualScoreEntity;
+import com.elink.esua.epdc.entity.KpiManualScoreRuleEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -31,7 +31,7 @@ import java.util.List;
  * @since v1.0.0 2019-12-02
  */
 @Mapper
-public interface KpiManualScoreDao extends BaseDao<KpiManualScoreEntity> {
+public interface KpiManualScoreRuleDao extends BaseDao<KpiManualScoreRuleEntity> {
 
 	/**
 	 * @param

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreEntity.java → esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreRuleEntity.java

@@ -34,8 +34,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("epdc_kpi_manual_score")
+@TableName("epdc_kpi_manual_score_rule")
-public class KpiManualScoreEntity extends BaseEpdcEntity {
+public class KpiManualScoreRuleEntity extends BaseEpdcEntity {
 
 	private static final long serialVersionUID = 1L;
 

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiManualScoreExcel.java → esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiManualScoreRuleExcel.java

@@ -30,7 +30,7 @@ import java.util.Date;
  * @since v1.0.0 2019-12-02
  */
 @Data
-public class KpiManualScoreExcel {
+public class KpiManualScoreRuleExcel {
 
     @Excel(name = "主键")
     private String id;

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiManualScoreRedis.java → esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiManualScoreRuleRedis.java

@@ -28,7 +28,7 @@ import org.springframework.stereotype.Component;
  * @since v1.0.0 2019-12-02
  */
 @Component
-public class KpiManualScoreRedis {
+public class KpiManualScoreRuleRedis {
     @Autowired
     private RedisUtils redisUtils;
 

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java → esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreRuleService.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.KpiManualScoreDTO;
+import com.elink.esua.epdc.dto.KpiManualScoreRuleDTO;
 import com.elink.esua.epdc.dto.result.KpiManualScoreDictResultDTO;
-import com.elink.esua.epdc.entity.KpiManualScoreEntity;
+import com.elink.esua.epdc.entity.KpiManualScoreRuleEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -33,7 +33,7 @@ import java.util.Map;
  * @author qu qu@elink-cn.com
  * @since v1.0.0 2019-12-02
  */
-public interface KpiManualScoreService extends BaseService<KpiManualScoreEntity> {
+public interface KpiManualScoreRuleService extends BaseService<KpiManualScoreRuleEntity> {
 
     /**
      * 默认分页
@@ -43,7 +43,7 @@ public interface KpiManualScoreService extends BaseService<KpiManualScoreEntity>
      * @author generator
      * @date 2019-12-02
      */
-    PageData<KpiManualScoreDTO> page(Map<String, Object> params);
+    PageData<KpiManualScoreRuleDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询
@@ -53,7 +53,7 @@ public interface KpiManualScoreService extends BaseService<KpiManualScoreEntity>
      * @author generator
      * @date 2019-12-02
      */
-    List<KpiManualScoreDTO> list(Map<String, Object> params);
+    List<KpiManualScoreRuleDTO> list(Map<String, Object> params);
 
     /**
      * 单条查询
@@ -63,7 +63,7 @@ public interface KpiManualScoreService extends BaseService<KpiManualScoreEntity>
      * @author generator
      * @date 2019-12-02
      */
-    KpiManualScoreDTO get(String id);
+    KpiManualScoreRuleDTO get(String id);
 
     /**
      * 默认保存
@@ -73,7 +73,7 @@ public interface KpiManualScoreService extends BaseService<KpiManualScoreEntity>
      * @author generator
      * @date 2019-12-02
      */
-    void save(KpiManualScoreDTO dto);
+    void save(KpiManualScoreRuleDTO dto);
 
     /**
      * 默认更新
@@ -83,7 +83,7 @@ public interface KpiManualScoreService extends BaseService<KpiManualScoreEntity>
      * @author generator
      * @date 2019-12-02
      */
-    Result update(KpiManualScoreDTO dto);
+    Result update(KpiManualScoreRuleDTO dto);
 
     /**
      * 批量删除

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

@@ -24,13 +24,13 @@ 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.commons.tools.utils.Result;
-import com.elink.esua.epdc.dao.KpiManualScoreDao;
+import com.elink.esua.epdc.dao.KpiManualScoreRuleDao;
-import com.elink.esua.epdc.dto.KpiManualScoreDTO;
+import com.elink.esua.epdc.dto.KpiManualScoreRuleDTO;
 import com.elink.esua.epdc.dto.result.KpiManualScoreDictResultDTO;
-import com.elink.esua.epdc.entity.KpiManualScoreEntity;
+import com.elink.esua.epdc.entity.KpiManualScoreRuleEntity;
 import com.elink.esua.epdc.entity.KpiRuleEntity;
-import com.elink.esua.epdc.redis.KpiManualScoreRedis;
+import com.elink.esua.epdc.redis.KpiManualScoreRuleRedis;
-import com.elink.esua.epdc.service.KpiManualScoreService;
+import com.elink.esua.epdc.service.KpiManualScoreRuleService;
 import com.elink.esua.epdc.service.KpiRuleService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,57 +48,57 @@ import java.util.Map;
  * @since v1.0.0 2019-12-02
  */
 @Service
-public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao, KpiManualScoreEntity> implements KpiManualScoreService {
+public class KpiManualScoreRuleServiceImpl extends BaseServiceImpl<KpiManualScoreRuleDao, KpiManualScoreRuleEntity> implements KpiManualScoreRuleService {
 
     @Autowired
-    private KpiManualScoreRedis kpiManualScoreRedis;
+    private KpiManualScoreRuleRedis kpiManualScoreRuleRedis;
     @Autowired
     private KpiRuleService kpiRuleService;
     @Override
-    public PageData<KpiManualScoreDTO> page(Map<String, Object> params) {
+    public PageData<KpiManualScoreRuleDTO> page(Map<String, Object> params) {
         String scoreName=params.containsKey("scoreName")?params.get("scoreName").toString():null;
-        QueryWrapper<KpiManualScoreEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<KpiManualScoreRuleEntity> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(scoreName),"score_name",scoreName);
-        IPage<KpiManualScoreEntity> page = baseDao.selectPage(
+        IPage<KpiManualScoreRuleEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 wrapper
         );
-        return getPageData(page, KpiManualScoreDTO.class);
+        return getPageData(page, KpiManualScoreRuleDTO.class);
     }
 
     @Override
-    public List<KpiManualScoreDTO> list(Map<String, Object> params) {
+    public List<KpiManualScoreRuleDTO> list(Map<String, Object> params) {
-        List<KpiManualScoreEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<KpiManualScoreRuleEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, KpiManualScoreDTO.class);
+        return ConvertUtils.sourceToTarget(entityList, KpiManualScoreRuleDTO.class);
     }
 
-    private QueryWrapper<KpiManualScoreEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<KpiManualScoreRuleEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
-        QueryWrapper<KpiManualScoreEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<KpiManualScoreRuleEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
         return wrapper;
     }
 
     @Override
-    public KpiManualScoreDTO get(String id) {
+    public KpiManualScoreRuleDTO get(String id) {
-        KpiManualScoreEntity entity = baseDao.selectById(id);
+        KpiManualScoreRuleEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, KpiManualScoreDTO.class);
+        return ConvertUtils.sourceToTarget(entity, KpiManualScoreRuleDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(KpiManualScoreDTO dto) {
+    public void save(KpiManualScoreRuleDTO dto) {
-        KpiManualScoreEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreEntity.class);
+        KpiManualScoreRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreRuleEntity.class);
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result update(KpiManualScoreDTO dto) {
+    public Result update(KpiManualScoreRuleDTO dto) {
-        KpiManualScoreEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreEntity.class);
+        KpiManualScoreRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreRuleEntity.class);
         //根据id去查询epdc_kpi_rule表，如果存在记录,需要同步更新考核周期、考核部门
         String referenceIds[] = new String[1];
         referenceIds[0] = dto.getId();

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreDao.xml → esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreRuleDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.KpiManualScoreDao">
+<mapper namespace="com.elink.esua.epdc.dao.KpiManualScoreRuleDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.KpiManualScoreEntity" id="kpiManualScoreMap">
+    <resultMap type="com.elink.esua.epdc.entity.KpiManualScoreRuleEntity" id="kpiManualScoreMap">
         <result property="id" column="ID"/>
         <result property="scoreName" column="score_name"/>
         <result property="deptTypeKey" column="dept_type_key"/>
@@ -24,7 +24,7 @@
             dept_type_key AS deptTypeKey,
             score_cycle AS scoreCycle
         FROM
-            epdc_kpi_manual_score
+            epdc_kpi_manual_score_rule
         WHERE
             DEL_FLAG = '0'
         ORDER BY

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

@@ -36,7 +36,7 @@
             ekr.DEL_FLAG as delFlag,
             (case rule_mode
             when '0' then (select ekf.name from epdc_kpi_formula ekf where ekf.ID=ekr.reference_id)
-            when '1' then (select kmc.score_name from epdc_kpi_manual_score kmc where kmc.ID=ekr.reference_id)
+            when '1' then (select kmc.score_name from epdc_kpi_manual_score_rule kmc where kmc.ID=ekr.reference_id)
             else null
             end)as referenceName
         FROM
@@ -119,7 +119,7 @@
             ekr.DEL_FLAG,
             (case rule_mode
             when '0' then (select ekf.name from epdc_kpi_formula ekf where ekf.ID=ekr.reference_id)
-            when '1' then (select kmc.score_name from epdc_kpi_manual_score kmc where kmc.ID=ekr.reference_id)
+            when '1' then (select kmc.score_name from epdc_kpi_manual_score_rule kmc where kmc.ID=ekr.reference_id)
             else null
             end)as reference_name
         FROM