From 0325a474a9a5f1ed74f2dd8fe2bf5215f79d0ecc Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Wed, 25 Dec 2019 19:04:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=80=83=E6=A0=B8=E7=BB=93=E6=9E=9C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dao/KpiResultSuperiorDao.java   | 16 ++++++++++++++
 .../service/impl/KpiMetaDataServiceImpl.java  | 12 +++++-----
 .../epdc/service/impl/KpiRuleServiceImpl.java | 20 +----------------
 .../resources/mapper/KpiResultSuperiorDao.xml | 22 +++----------------
 4 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultSuperiorDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultSuperiorDao.java
index aaa78b0e8..27d732f42 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultSuperiorDao.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultSuperiorDao.java
@@ -22,7 +22,9 @@ import com.elink.esua.epdc.dto.KpiResultGridDTO;
 import com.elink.esua.epdc.dto.KpiResultSuperiorDTO;
 import com.elink.esua.epdc.entity.KpiResultSuperiorEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -62,4 +64,18 @@ public interface KpiResultSuperiorDao extends BaseDao<KpiResultSuperiorEntity> {
      * @date 2019-12-17
      */
     List<KpiResultSuperiorDTO> exportSuperiorList(Map<String, Object> params);
+
+    /**
+     * 根据部门id与考核周期 删除
+     *
+     * @param deptId
+     * @param startDate
+     * @param endDate
+     * @return void
+     * @author work@yujt.net.cn
+     * @date 2019/12/25 18:56
+     */
+    int deleteByDeptIdAndKpiDate(@Param("deptId") Long deptId,
+                                 @Param("startDate") Date startDate,
+                                 @Param("endDate") Date endDate);
 }
\ 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/KpiMetaDataServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java
index a0436433f..047e3017c 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java
@@ -345,13 +345,13 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
     @Override
     public void statItemHandleAmount() {
         statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_MONTH.getValue(), OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT);
-        statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_MONTH.getValue(), OrganizationTypeConstant.ORG_TYPE_STREET_DEPT);
+        statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_MONTH.getValue(), OrganizationTypeConstant.ORG_TYPE_STREET_PARTY);
 
         statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue(), OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT);
-        statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue(), OrganizationTypeConstant.ORG_TYPE_STREET_DEPT);
+        statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue(), OrganizationTypeConstant.ORG_TYPE_STREET_PARTY);
 
         statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_YEAR.getValue(), OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT);
-        statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_YEAR.getValue(), OrganizationTypeConstant.ORG_TYPE_STREET_DEPT);
+        statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_YEAR.getValue(), OrganizationTypeConstant.ORG_TYPE_STREET_PARTY);
     }
 
     /**
@@ -447,13 +447,13 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
     @Override
     public void statGridEvaluation() {
         statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_MONTH.getValue(), OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT);
-        statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_MONTH.getValue(), OrganizationTypeConstant.ORG_TYPE_STREET_DEPT);
+        statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_MONTH.getValue(), OrganizationTypeConstant.ORG_TYPE_STREET_PARTY);
 
         statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue(), OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT);
-        statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue(), OrganizationTypeConstant.ORG_TYPE_STREET_DEPT);
+        statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue(), OrganizationTypeConstant.ORG_TYPE_STREET_PARTY);
 
         statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_YEAR.getValue(), OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT);
-        statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_YEAR.getValue(), OrganizationTypeConstant.ORG_TYPE_STREET_DEPT);
+        statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_YEAR.getValue(), OrganizationTypeConstant.ORG_TYPE_STREET_PARTY);
     }
 
     /**
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java
index d5904e3bb..a662a8f32 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java
@@ -504,7 +504,7 @@ public class KpiRuleServiceImpl extends BaseServiceImpl<KpiRuleDao, KpiRuleEntit
      */
     private void saveSuperiorKpiResult(Long deptId, Double score, Date startDate, Date endDate, String kpiCycle) {
         //先删除 在插入
-        this.deletedSuperiorKpiResult(deptId, startDate, endDate);
+        kpiResultSuperiorDao.deleteByDeptIdAndKpiDate(deptId, startDate, endDate);
 
         DeptLevelAndLeaderDTO deptLevelInfo = deptUtils.getDeptLevelInfo(deptId, YesOrNoEnum.YES);
         KpiResultSuperiorEntity kpiResultSuperiorEntity = new KpiResultSuperiorEntity();
@@ -521,24 +521,6 @@ public class KpiRuleServiceImpl extends BaseServiceImpl<KpiRuleDao, KpiRuleEntit
         kpiResultSuperiorDao.insert(kpiResultSuperiorEntity);
     }
 
-    /**
-     * 删除 街道/区直考核结果表
-     *
-     * @param deptId    部门id
-     * @param startDate 开始日
-     * @param endDate   结束日
-     * @return void
-     * @author zhangyong
-     * @date 2019/12/25
-     */
-    private void deletedSuperiorKpiResult(Long deptId, Date startDate, Date endDate) {
-        QueryWrapper<KpiResultSuperiorEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(KpiFieldConstant.DEPT_ID, deptId)
-                .eq(KpiFieldConstant.START_DATE, startDate)
-                .eq(KpiFieldConstant.END_DATE, endDate);
-        kpiResultSuperiorDao.delete(wrapper);
-    }
-
     /**
      * 获取公式所有参数对应的元数据编码、升序排列
      *
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml
index b02d9e9a0..35f25c460 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml
@@ -3,25 +3,9 @@
 
 <mapper namespace="com.elink.esua.epdc.dao.KpiResultSuperiorDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.KpiResultSuperiorEntity" id="kpiResultSuperiorMap">
-        <result property="id" column="ID"/>
-        <result property="deptId" column="dept_id"/>
-        <result property="finalScore" column="final_score"/>
-        <result property="startDate" column="start_date"/>
-        <result property="endDate" column="end_date"/>
-        <result property="kpiCycle" column="kpi_cycle"/>
-        <result property="deptTypeKey" column="dept_type_key"/>
-        <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>
+    <delete id="deleteByDeptIdAndKpiDate">
+        delete from epdc_kpi_result_superior where dept_id = #{deptId} and start_date = #{startDate} and end_date = #{endDate}
+    </delete>
 
     <!--根据查询条件，返回首页 考核统计列表-->
     <select id="selectSuperiorInfoList" resultType="com.elink.esua.epdc.dto.KpiResultSuperiorDTO">