Browse Source

新增人员评分列表

anderx 1 year ago
parent
commit
bc82df8eb5

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TaskScoreMapper.xml

@@ -179,7 +179,7 @@
     </delete>
 
 
-    <select id="findAdminTaskScoreList" resultType="com.goafanti.order.bo.TaskScore.OutTaskScore">
+    <select id="findAdminTaskScoreList" resultType="com.goafanti.order.bo.TaskScore.OutAdminTaskScore">
         select a.id,a.name ,a.department_id depId,c.name depName,a.superior_id superId,a2.name superName,a.status ,a.last_login_time  lastLoginTime,
         b.ht_sat_count  htSatCount,b.ht_sat_score_count htSatScoreCount,b.ht_sat_score_average htSatScoreAverage,
         b.member_count memberCount,b.member_score_count memberScoreCount,b.member_score_average memberScoreAverage

+ 46 - 2
src/main/java/com/goafanti/order/bo/TaskScore/OutTaskScore.java

@@ -1,8 +1,8 @@
 package com.goafanti.order.bo.TaskScore;
 
-import com.goafanti.common.model.TaskScore;
+import com.goafanti.common.model.AdminProjectStatistics;
 
-public class OutTaskScore extends TaskScore {
+public class OutAdminTaskScore extends AdminProjectStatistics {
     private String name;
     private String depId;
     private String depname;
@@ -11,9 +11,53 @@ public class OutTaskScore extends TaskScore {
     private String status;
     private String lastLoginTime;
 
+    @Override
+    public Integer getHtSatCount() {
+        if (super.getHtSatCount() == null) {
+            return 0;
+        }
+        return super.getHtSatCount();
+    }
+
+    @Override
+    public Integer getHtSatScoreCount() {
+        if (super.getHtSatScoreCount() == null) {
+            return 0;
+        }
+        return super.getHtSatScoreCount();
+    }
+
+    @Override
+    public Double getHtSatScoreAverage() {
+        if (super.getHtSatScoreAverage() == null) {
+            return 0d;
+        }
+        return super.getHtSatScoreAverage();
+    }
 
+    @Override
+    public Integer getMemberCount() {
+        if (super.getMemberCount() == null) {
+            return 0;
+        }
+        return super.getMemberCount();
+    }
 
+    @Override
+    public Integer getMemberScoreCount() {
+        if (super.getMemberScoreCount() == null) {
+            return 0;
+        }
+        return super.getMemberScoreCount();
+    }
 
+    @Override
+    public Double getMemberScoreAverage() {
+        if (super.getMemberScoreAverage() == null) {
+            return 0d;
+        }
+        return super.getMemberScoreAverage();
+    }
 
     public String getName() {
         return name;

+ 1 - 1
src/main/java/com/goafanti/order/controller/TaskScoreController.java

@@ -86,7 +86,7 @@ public class TaskScoreController extends BaseController {
     }
 
     /**
-     * 列表查询
+     * 人员评分列表
      *
      * @param in 参数
      * @return