From e97be533c2ed926fb4a0494113c916b520d260cd Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 13 Apr 2020 18:33:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8E=92=E8=A1=8C-=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E6=89=93=E5=88=86-=E8=A1=A8=E6=A0=BC=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/ManualScoreDTO.java    | 14 ++++++++++++--
 .../epdc/controller/ManualScoreController.java     |  2 +-
 .../elink/esua/epdc/entity/ManualScoreEntity.java  | 14 ++++++++++++--
 .../elink/esua/epdc/excel/ManualScoreExcel.java    | 10 ++++++++--
 .../src/main/resources/mapper/ManualScoreDao.xml   |  4 +++-
 5 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ManualScoreDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ManualScoreDTO.java
index 331db251a..5fa2d680e 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ManualScoreDTO.java
+++ b/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
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/ManualScoreController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/ManualScoreController.java
index f5c08e946..81f1c00df 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/ManualScoreController.java
+++ b/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
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/ManualScoreEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/ManualScoreEntity.java
index d87cb1297..4f8443ab1 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/ManualScoreEntity.java
+++ b/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
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/ManualScoreExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/ManualScoreExcel.java
index cf4c56bea..9df19a4b0 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/ManualScoreExcel.java
+++ b/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;
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/ManualScoreDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/ManualScoreDao.xml
index 85006ac17..7996bc684 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/ManualScoreDao.xml
+++ b/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"/>