From 48c092ecebedf80fddc0a1b58dc4ff2da4fef52b Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Wed, 4 Dec 2019 14:12:47 +0800 Subject: [PATCH] =?UTF-8?q?epdc=5Fkpi=5Fmanual=5Fscore=E6=94=B9=E4=B8=BAep?= =?UTF-8?q?dc=5Fkpi=5Fmanual=5Fscore=5Frule?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...oreDTO.java => KpiManualScoreRuleDTO.java} | 2 +- ...java => KpiManualScoreRuleController.java} | 40 ++++++++-------- ...oreDao.java => KpiManualScoreRuleDao.java} | 4 +- ...ity.java => KpiManualScoreRuleEntity.java} | 4 +- ...xcel.java => KpiManualScoreRuleExcel.java} | 4 +- ...edis.java => KpiManualScoreRuleRedis.java} | 4 +- ...ce.java => KpiManualScoreRuleService.java} | 16 +++---- ...ava => KpiManualScoreRuleServiceImpl.java} | 46 +++++++++---------- ...ScoreDao.xml => KpiManualScoreRuleDao.xml} | 6 +-- .../src/main/resources/mapper/KpiRuleDao.xml | 4 +- 10 files changed, 65 insertions(+), 65 deletions(-) rename esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/{KpiManualScoreDTO.java => KpiManualScoreRuleDTO.java} (96%) rename esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/{KpiManualScoreController.java => KpiManualScoreRuleController.java} (69%) rename esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/{KpiManualScoreDao.java => KpiManualScoreRuleDao.java} (90%) rename esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/{KpiManualScoreEntity.java => KpiManualScoreRuleEntity.java} (93%) rename esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/{KpiManualScoreExcel.java => KpiManualScoreRuleExcel.java} (97%) rename esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/{KpiManualScoreRedis.java => KpiManualScoreRuleRedis.java} (96%) rename esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/{KpiManualScoreService.java => KpiManualScoreRuleService.java} (83%) rename esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/{KpiManualScoreServiceImpl.java => KpiManualScoreRuleServiceImpl.java} (72%) rename esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/{KpiManualScoreDao.xml => KpiManualScoreRuleDao.xml} (85%) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreRuleDTO.java similarity index 96% rename from esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreDTO.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreRuleDTO.java index d021af8cc..d37d96a28 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreDTO.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreRuleController.java similarity index 69% rename from esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreRuleController.java index d3f40f6aa..64386d001 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java +++ b/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.service.KpiManualScoreService; +import com.elink.esua.epdc.excel.KpiManualScoreRuleExcel; +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") -public class KpiManualScoreController { +@RequestMapping("kpimanualscorerule") +public class KpiManualScoreRuleController { @Autowired - private KpiManualScoreService kpiManualScoreService; + private KpiManualScoreRuleService kpiManualScoreRuleService; @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = kpiManualScoreService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = kpiManualScoreRuleService.page(params); + return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - KpiManualScoreDTO data = kpiManualScoreService.get(id); - return new Result().ok(data); + public Result get(@PathVariable("id") String id){ + KpiManualScoreRuleDTO data = kpiManualScoreRuleService.get(id); + return new Result().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 params, HttpServletResponse response) throws Exception { - List list = kpiManualScoreService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, KpiManualScoreExcel.class); + List list = kpiManualScoreRuleService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, KpiManualScoreRuleExcel.class); } /** @@ -99,6 +99,6 @@ public class KpiManualScoreController { **/ @GetMapping("getKpiManualScoreList") public Result> getKpiManualScoreList() { - return kpiManualScoreService.listKpiManualScoreDictListDTO(); + return kpiManualScoreRuleService.listKpiManualScoreDictListDTO(); } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiManualScoreDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiManualScoreRuleDao.java similarity index 90% rename from esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiManualScoreDao.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiManualScoreRuleDao.java index 4e1bfced0..1fcd3c605 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiManualScoreDao.java +++ b/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 { +public interface KpiManualScoreRuleDao extends BaseDao { /** * @param diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreRuleEntity.java similarity index 93% rename from esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreEntity.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreRuleEntity.java index 42965f3be..dd6565885 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreEntity.java +++ b/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") -public class KpiManualScoreEntity extends BaseEpdcEntity { +@TableName("epdc_kpi_manual_score_rule") +public class KpiManualScoreRuleEntity extends BaseEpdcEntity { private static final long serialVersionUID = 1L; diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiManualScoreExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiManualScoreRuleExcel.java similarity index 97% rename from esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiManualScoreExcel.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiManualScoreRuleExcel.java index b6a6acc1a..0c44b9abe 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiManualScoreExcel.java +++ b/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; @@ -66,4 +66,4 @@ public class KpiManualScoreExcel { private String delFlag; -} \ 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/redis/KpiManualScoreRedis.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiManualScoreRuleRedis.java similarity index 96% rename from esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiManualScoreRedis.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiManualScoreRuleRedis.java index 8ed48b197..62d38e9ef 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiManualScoreRedis.java +++ b/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; @@ -44,4 +44,4 @@ public class KpiManualScoreRedis { return null; } -} \ 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/KpiManualScoreService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreRuleService.java similarity index 83% rename from esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreRuleService.java index d5d2ddcfe..cae52d9de 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java +++ b/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 { +public interface KpiManualScoreRuleService extends BaseService { /** * 默认分页 @@ -43,7 +43,7 @@ public interface KpiManualScoreService extends BaseService * @author generator * @date 2019-12-02 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 @@ -53,7 +53,7 @@ public interface KpiManualScoreService extends BaseService * @author generator * @date 2019-12-02 */ - List list(Map params); + List list(Map params); /** * 单条查询 @@ -63,7 +63,7 @@ public interface KpiManualScoreService extends BaseService * @author generator * @date 2019-12-02 */ - KpiManualScoreDTO get(String id); + KpiManualScoreRuleDTO get(String id); /** * 默认保存 @@ -73,7 +73,7 @@ public interface KpiManualScoreService extends BaseService * @author generator * @date 2019-12-02 */ - void save(KpiManualScoreDTO dto); + void save(KpiManualScoreRuleDTO dto); /** * 默认更新 @@ -83,7 +83,7 @@ public interface KpiManualScoreService extends BaseService * @author generator * @date 2019-12-02 */ - Result update(KpiManualScoreDTO dto); + Result update(KpiManualScoreRuleDTO dto); /** * 批量删除 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/KpiManualScoreRuleServiceImpl.java similarity index 72% rename from esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreRuleServiceImpl.java index 531f5e953..24184f2a4 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/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.dto.KpiManualScoreDTO; +import com.elink.esua.epdc.dao.KpiManualScoreRuleDao; +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.service.KpiManualScoreService; +import com.elink.esua.epdc.redis.KpiManualScoreRuleRedis; +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 implements KpiManualScoreService { +public class KpiManualScoreRuleServiceImpl extends BaseServiceImpl implements KpiManualScoreRuleService { @Autowired - private KpiManualScoreRedis kpiManualScoreRedis; + private KpiManualScoreRuleRedis kpiManualScoreRuleRedis; @Autowired private KpiRuleService kpiRuleService; @Override - public PageData page(Map params) { + public PageData page(Map params) { String scoreName=params.containsKey("scoreName")?params.get("scoreName").toString():null; - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.like(StringUtils.isNotBlank(scoreName),"score_name",scoreName); - IPage page = baseDao.selectPage( + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), wrapper ); - return getPageData(page, KpiManualScoreDTO.class); + return getPageData(page, KpiManualScoreRuleDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, KpiManualScoreDTO.class); + return ConvertUtils.sourceToTarget(entityList, KpiManualScoreRuleDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public KpiManualScoreDTO get(String id) { - KpiManualScoreEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, KpiManualScoreDTO.class); + public KpiManualScoreRuleDTO get(String id) { + KpiManualScoreRuleEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, KpiManualScoreRuleDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(KpiManualScoreDTO dto) { - KpiManualScoreEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreEntity.class); + public void save(KpiManualScoreRuleDTO dto) { + KpiManualScoreRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreRuleEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public Result update(KpiManualScoreDTO dto) { - KpiManualScoreEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreEntity.class); + public Result update(KpiManualScoreRuleDTO dto) { + KpiManualScoreRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreRuleEntity.class); //根据id去查询epdc_kpi_rule表，如果存在记录,需要同步更新考核周期、考核部门 String referenceIds[] = new String[1]; referenceIds[0] = dto.getId(); diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreRuleDao.xml similarity index 85% rename from esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreDao.xml rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreRuleDao.xml index a77cf9631..6a75ea319 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreRuleDao.xml @@ -1,9 +1,9 @@ - + - + @@ -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 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleDao.xml index 935f81130..bf85fca2e 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleDao.xml +++ b/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