From 68edb4b2cac1369886a9f0a2af95dfe91c4e0934 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 18 Dec 2019 09:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=89=93=E5=88=86=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=AF=BC=E5=85=A5=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=AF=B9=20?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E8=80=83=E6=A0=B8=E6=9C=80=E7=BB=88=E5=BE=97?= =?UTF-8?q?=E5=88=86=20=E8=A1=A8=E7=9A=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dao/KpiResultGridDao.java | 16 ++++++- .../impl/KpiManualScoreServiceImpl.java | 47 +++++++++++++++++-- .../resources/mapper/KpiResultGridDao.xml | 23 ++++++++- 3 files changed, 80 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultGridDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultGridDao.java index d99e6364c..b3a6370af 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultGridDao.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultGridDao.java @@ -18,9 +18,15 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.KpiResultGridDTO; import com.elink.esua.epdc.entity.KpiResultGridEntity; import org.apache.ibatis.annotations.Mapper; +import java.math.BigInteger; +import java.util.Date; +import java.util.List; +import java.util.Map; + /** * 网格考核最终得分 * @@ -29,5 +35,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface KpiResultGridDao extends BaseDao { - + + /** + * @Description: 查询网格考核最终得分表中，当前考核规则数据是否存在 + * @Param: [] + * @return: java.util.List + * @Author: zy + * @Date: 2019-12-17 + */ + KpiResultGridDTO selectManualScoringISExist(Map map); } \ 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/KpiManualScoreServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java index d9dce0d7a..18eb6c410 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 @@ -36,18 +36,18 @@ import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils; 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.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.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; import com.elink.esua.epdc.dto.result.KpiManualScoreResultDTO; import com.elink.esua.epdc.dto.result.KpiManualScoreTemplateResultDTO; -import com.elink.esua.epdc.entity.KpiManualScoreEntity; -import com.elink.esua.epdc.entity.KpiManualScoreRuleEntity; -import com.elink.esua.epdc.entity.KpiManualScoreTempEntity; -import com.elink.esua.epdc.entity.KpiRuleEntity; +import com.elink.esua.epdc.dto.result.KpiRuleQueryResultDTO; +import com.elink.esua.epdc.entity.*; import com.elink.esua.epdc.enums.KpiCycleEnum; import com.elink.esua.epdc.excel.KpiManualScoreTemplateExcel; import com.elink.esua.epdc.feign.AdminFeignClient; @@ -83,6 +83,8 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl page(Map params) { @@ -311,6 +313,30 @@ 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 + KpiResultGridEntity kpiResultGridEntity = ConvertUtils.sourceToTarget(kpiManualScoreEntity, KpiResultGridEntity.class); + kpiResultGridEntity.setGridId(kpiManualScoreEntity.getDeptId()); + kpiResultGridEntity.setManualScore(kpiManualScoreEntity.getScore()); + kpiResultGridEntity.setStartDate(kpiManualScoreEntity.getScoreStartDate()); + kpiResultGridEntity.setEndDate(kpiManualScoreEntity.getScoreEndDate()); + //查询考核部门类别 + KpiRuleQueryResultDTO kpiCycle = kpiRuleDao.queryDetailInfo(kpiManualScoreEntity.getRuleId()); + kpiResultGridEntity.setKpiCycle(kpiCycle.getKpiCycle()); + kpiResultGridDao.insert(kpiResultGridEntity); + }else { //update + //查询考核部门类别 + KpiResultGridEntity kpiResultGridEntity = new KpiResultGridEntity(); + kpiResultGridEntity.setId(kpiResultGridDto.getId()); + kpiResultGridEntity.setManualScore(kpiManualScoreEntity.getScore()); + kpiResultGridDao.updateById(kpiResultGridEntity); + } } //删除临时表数据 baseDao.deleteManualScoreTemp(SecurityUser.getUserId().toString(), @@ -429,6 +455,19 @@ 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 + 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 c41d3c8d7..2bc70c7f0 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 @@ -26,5 +26,26 @@ - + + \ No newline at end of file