手动打分管理，导入 修改，同时增加对 网格考核最终得分 表的操作

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<KpiResultGridEntity> {
-	
+
+    /** 
+     * @Description: 查询网格考核最终得分表中，当前考核规则数据是否存在 
+     * @Param: [] 
+     * @return: java.util.List<com.elink.esua.epdc.dto.KpiResultGridDTO> 
+     * @Author: zy 
+     * @Date: 2019-12-17 
+     */ 
+    KpiResultGridDTO selectManualScoringISExist(Map<String,Object> map);
 }

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<KpiManualScoreDao
     private KpiRuleDao kpiRuleDao;
     @Autowired
     private AdminFeignClient adminFeignClient;
+    @Autowired
+    private KpiResultGridDao kpiResultGridDao;
 
     @Override
     public PageData<KpiManualScoreDTO> page(Map<String, Object> params) {
@@ -311,6 +313,30 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
                 kpiManualScoreEntity.setCreatorDeptId(user.getDeptId());
                 kpiManualScoreEntity.setCreatorDeptName(user.getDeptName());
                 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
+                    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<KpiManualScoreDao
             return new Result().error("得分不能高于满分");
         }
         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
+            KpiResultGridEntity kpiResultGridEntity = new KpiResultGridEntity();
+            kpiResultGridEntity.setId(kpiResultGridDto.getId());
+            kpiResultGridEntity.setManualScore(dto.getScore());
+            kpiResultGridDao.updateById(kpiResultGridEntity);
+        }
+
         return new Result();
     }
 

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

@@ -26,5 +26,26 @@
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
 
-
+    <!--  查询网格考核最终得分表中，当前考核规则数据是否存在 -->
+    <select id="selectManualScoringISExist" resultType="com.elink.esua.epdc.dto.KpiResultGridDTO">
+       SELECT
+            ID id,
+            grid_id gridId,
+            manual_score manualScore,
+            start_date startDate,
+            end_date endDate,
+            grid_leader gridLeader,
+            kpi_cycle kpiCycle,
+            parent_dept_ids parentDeptIds,
+            parent_dept_names parentDeptNames,
+            all_dept_ids allDeptIds,
+            all_dept_names allDeptNames
+        FROM
+            epdc_kpi_result_grid
+        WHERE
+        grid_id = #{deptId}
+        and start_date = #{scoreStartDate}
+        and end_date = #{scoreEndDate}
+        and	DEL_FLAG = 0
+    </select>
 </mapper>