治理排行-手动打分-表格修改

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

@@ -45,9 +45,19 @@ public class ManualScoreDTO implements Serializable {
 	private Long deptId;
 
     /**
-     * 考核起始年月
+     * 考核月度
      */
-	private Date scoreDate;
+	private Date month;
+
+    /**
+     * 考核年度
+     */
+	private Date year;
+
+    /**
+     * 考核打分类型 0-月，1-年
+     */
+	private String scoreType;
 
     /**
      * 打分的部门ID

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/ManualScoreController.java

@@ -43,7 +43,7 @@ import java.util.Map;
  * @since v1.0.0 2020-04-13
  */
 @RestController
-@RequestMapping("manualscore")
+@RequestMapping("manualscore-zlph")
 public class ManualScoreController {
     
     @Autowired

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/ManualScoreEntity.java

@@ -45,9 +45,19 @@ public class ManualScoreEntity extends BaseEpdcEntity {
 	private Long deptId;
 
     /**
-     * 考核起始年月
+     * 考核月度
      */
-	private Date scoreDate;
+	private Date month;
+
+    /**
+     * 考核年度
+     */
+	private Date year;
+
+    /**
+     * 考核打分类型 0-月，1-年
+     */
+	private String scoreType;
 
     /**
      * 打分的部门ID

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

@@ -38,8 +38,14 @@ public class ManualScoreExcel {
     @Excel(name = "被打分的部门ID")
     private Long deptId;
 
-    @Excel(name = "考核起始年月")
-    private Date scoreDate;
+    @Excel(name = "考核月度")
+    private Date month;
+
+    @Excel(name = "考核年度")
+    private Date year;
+
+    @Excel(name = "考核打分类型 0-月，1-年")
+    private String scoreType;
 
     @Excel(name = "打分的部门ID")
     private Long creatorDeptId;

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

@@ -6,7 +6,9 @@
     <resultMap type="com.elink.esua.epdc.entity.ManualScoreEntity" id="manualScoreMap">
         <result property="id" column="ID"/>
         <result property="deptId" column="DEPT_ID"/>
-        <result property="scoreDate" column="SCORE_DATE"/>
+        <result property="month" column="MONTH"/>
+        <result property="year" column="YEAR"/>
+        <result property="scoreType" column="SCORE_TYPE"/>
         <result property="creatorDeptId" column="CREATOR_DEPT_ID"/>
         <result property="creatorDeptName" column="CREATOR_DEPT_NAME"/>
         <result property="score" column="SCORE"/>