Browse Source

人员项目评分列表修改

anderx 1 year ago
parent
commit
5476606fa1

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

@@ -193,8 +193,8 @@
 
     <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
+        b.ht_sat_count  htSatCount,b.ht_sat_not_score_count htSatNotScoreCount,b.ht_sat_score_count htSatScoreCount,b.ht_sat_score_average htSatScoreAverage,
+        b.member_count memberCount,b.member_not_score_count memberNotScoreCount,b.member_score_count memberScoreCount,b.member_score_average memberScoreAverage
         from admin a left join admin_project_statistics b on a.id =b.aid
         left join department c on a.department_id =c.id
         left join admin a2 on a.superior_id =a2.id

+ 40 - 12
src/main/java/com/goafanti/order/bo/TaskScore/OutAdminTaskScore.java

@@ -12,10 +12,17 @@ public class OutAdminTaskScore {
     @Excel(name = "高新&科技总数")
     private int htSatCount;
     /**
+     * 高新&科技待评分数
+     */
+    @Excel(name = "高新&科技待评分数")
+    private int htSatNotScoreCount;
+    /**
      * 高新&科技已评分数
      */
     @Excel(name = "高新&科技已评分数")
     private int htSatScoreCount;
+
+
     /**
      * 高新&科技平均分
      */
@@ -27,6 +34,11 @@ public class OutAdminTaskScore {
     @Excel(name = "会员数")
     private int memberCount;
     /**
+     * 会员待评分数
+     */
+    @Excel(name = "会员待评分数")
+    private int memberNotScoreCount;
+    /**
      * 会员评分数
      */
     @Excel(name = "会员已评分数")
@@ -66,51 +78,67 @@ public class OutAdminTaskScore {
     private Date lastLoginTime;
 
 
-    public Integer getHtSatCount() {
+    public int getHtSatCount() {
         return htSatCount;
     }
 
-    public void setHtSatCount(Integer htSatCount) {
+    public void setHtSatCount(int htSatCount) {
         this.htSatCount = htSatCount;
     }
 
-    public Integer getHtSatScoreCount() {
+    public int getHtSatNotScoreCount() {
+        return htSatNotScoreCount;
+    }
+
+    public void setHtSatNotScoreCount(int htSatNotScoreCount) {
+        this.htSatNotScoreCount = htSatNotScoreCount;
+    }
+
+    public int getHtSatScoreCount() {
         return htSatScoreCount;
     }
 
-    public void setHtSatScoreCount(Integer htSatScoreCount) {
+    public void setHtSatScoreCount(int htSatScoreCount) {
         this.htSatScoreCount = htSatScoreCount;
     }
 
-    public Double getHtSatScoreAverage() {
+    public double getHtSatScoreAverage() {
         return htSatScoreAverage;
     }
 
-    public void setHtSatScoreAverage(Double htSatScoreAverage) {
+    public void setHtSatScoreAverage(double htSatScoreAverage) {
         this.htSatScoreAverage = htSatScoreAverage;
     }
 
-    public Integer getMemberCount() {
+    public int getMemberCount() {
         return memberCount;
     }
 
-    public void setMemberCount(Integer memberCount) {
+    public void setMemberCount(int memberCount) {
         this.memberCount = memberCount;
     }
 
-    public Integer getMemberScoreCount() {
+    public int getMemberNotScoreCount() {
+        return memberNotScoreCount;
+    }
+
+    public void setMemberNotScoreCount(int memberNotScoreCount) {
+        this.memberNotScoreCount = memberNotScoreCount;
+    }
+
+    public int getMemberScoreCount() {
         return memberScoreCount;
     }
 
-    public void setMemberScoreCount(Integer memberScoreCount) {
+    public void setMemberScoreCount(int memberScoreCount) {
         this.memberScoreCount = memberScoreCount;
     }
 
-    public Double getMemberScoreAverage() {
+    public double getMemberScoreAverage() {
         return memberScoreAverage;
     }
 
-    public void setMemberScoreAverage(Double memberScoreAverage) {
+    public void setMemberScoreAverage(double memberScoreAverage) {
         this.memberScoreAverage = memberScoreAverage;
     }