禅道3319 - 考核结果、手动打分管理，页面功能开发

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiResultGridDTO.java

@@ -166,4 +166,12 @@ public class KpiResultGridDTO implements Serializable {
      */
     private String detail;
 
+
+    //虚字段-----------------------
+
+    //考核周期开始日
+    private String startDateString;
+
+    //考核周期结束日
+    private String endDateString;
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridExcel.java

@@ -38,7 +38,13 @@ public class KpiResultGridExcel {
     @Excel(name = "网格长")
     private String leaderName;
 
-    @Excel(name = "抓基层党建工作职责得分")
+    @Excel(name = "考核周期开始日")
+    private String startDateString;
+
+    @Excel(name = "考核周期结束日")
+    private String endDateString;
+
+    @Excel(name = "基层党建工作职责得分")
     private BigDecimal manualScore;
 
     @Excel(name = "平时工作得分")

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

@@ -105,6 +105,17 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
      **/
     @Override
     public PageData<KpiManualScoreResultDTO> listKpiManualScoreResultDTO(Map<String, Object> params) {
+        String allDeptIds = "";
+        if (params.get("streetId") != "" && params.get("streetId") != null){
+            allDeptIds = params.get("streetId").toString(); //查询条件 街道
+        }
+        if (params.get("communityId") != "" && params.get("communityId") != null){
+            allDeptIds = params.get("communityId").toString(); //查询条件 社区
+        }
+        if (params.get("gridId") != "" && params.get("gridId") != null){
+            allDeptIds = params.get("gridId").toString(); //查询条件 网格
+        }
+        params.put("allDeptIds", allDeptIds);
         IPage<KpiManualScoreResultDTO> page = getPage(params);
         List<KpiManualScoreResultDTO> list = baseDao.selectListKpiManualScoreResultDTO(params);
         return new PageData<>(list, page.getTotal());

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

@@ -39,6 +39,9 @@
             <if test="scoreStartDate != null and scoreStartDate != ''">
                 AND DATE_FORMAT( kmc.score_start_date, '%Y-%m' ) BETWEEN #{scoreStartDate} AND #{scoreStartDate}
             </if>
+            <if test="allDeptIds != '' and allDeptIds != null">
+                AND kmc.all_dept_ids like concat('%',#{allDeptIds},'%')
+            </if>
         ORDER BY kmc.CREATED_TIME DESC
     </select>
 

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

@@ -100,8 +100,8 @@
         g.work_score workScore,
         g.vote_score voteScore,
         g.final_score finalScore,
-        g.start_date startDate,
-        g.end_date endDate,
+        DATE_FORMAT(g.start_date, "%Y-%m-%d") startDateString,
+        DATE_FORMAT(g.end_date, "%Y-%m-%d") endDateString,
         g.leader_name leaderName,
         g.all_dept_names allDeptNames,
         g.kpi_cycle kpiCycle

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

@@ -25,6 +25,9 @@
         <if test="allDeptIds != '' and allDeptIds != null">
             AND s.all_dept_ids like concat('%',#{allDeptIds},'%')
         </if>
+        <if test="scoreStartDate != null and scoreStartDate != ''">
+            AND DATE_FORMAT( s.start_date, '%Y-%m' ) BETWEEN #{scoreStartDate} AND #{scoreStartDate}
+        </if>
         ORDER BY finalScore DESC LIMIT #{page},#{limit}
     </select>
 
@@ -38,6 +41,9 @@
         <if test="allDeptIds != '' and allDeptIds != null">
             AND s.all_dept_ids like concat('%',#{allDeptIds},'%')
         </if>
+        <if test="scoreStartDate != null and scoreStartDate != ''">
+            AND DATE_FORMAT( s.start_date, '%Y-%m' ) BETWEEN #{scoreStartDate} AND #{scoreStartDate}
+        </if>
     </select>
 
     <!--根据查询条件，返回首页 考核统计导出列表-->
@@ -71,5 +77,8 @@
         <if test="allDeptIds != '' and allDeptIds != null">
             AND s.all_dept_ids like concat('%',#{allDeptIds},'%')
         </if>
+        <if test="scoreStartDate != null and scoreStartDate != ''">
+            AND DATE_FORMAT( s.start_date, '%Y-%m' ) BETWEEN #{scoreStartDate} AND #{scoreStartDate}
+        </if>
     </select>
 </mapper>