Browse Source

新增人员评分列表

anderx 1 year ago
parent
commit
6cfa9233dd

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

@@ -189,6 +189,7 @@
         <if test="roleId !=null">
             left join user_role ur on a.id=ur.uid left join role r on ur.rid=r.id
         </if>
+        <include refid="findAdminTaskScoreSql"/>
         <if test="page_sql != null">
             ${page_sql}
         </if>

+ 22 - 35
src/main/java/com/goafanti/order/bo/TaskScore/OutAdminTaskScore.java

@@ -65,19 +65,8 @@ public class OutAdminTaskScore {
     private Date lastLoginTime;
 
 
-
-    public String id() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Integer htSatCount() {
-        if (htSatCount==null){
-            htSatCount=0;
-        }
+    public Integer getHtSatCount() {
+        if (htSatCount==null) htSatCount=0;
         return htSatCount;
     }
 
@@ -85,10 +74,8 @@ public class OutAdminTaskScore {
         this.htSatCount = htSatCount;
     }
 
-    public Integer htSatScoreCount() {
-        if (htSatScoreCount==null){
-            htSatScoreCount=0;
-        }
+    public Integer getHtSatScoreCount() {
+        if (htSatScoreCount==null) htSatScoreCount=0;
         return htSatScoreCount;
     }
 
@@ -96,10 +83,8 @@ public class OutAdminTaskScore {
         this.htSatScoreCount = htSatScoreCount;
     }
 
-    public Double htSatScoreAverage() {
-        if (htSatScoreAverage==null){
-            htSatScoreAverage=0.0;
-        }
+    public Double getHtSatScoreAverage() {
+        if (htSatScoreAverage==null) htSatScoreAverage=0.0;
         return htSatScoreAverage;
     }
 
@@ -107,10 +92,8 @@ public class OutAdminTaskScore {
         this.htSatScoreAverage = htSatScoreAverage;
     }
 
-    public Integer memberCount() {
-        if (memberCount==null){
-            memberCount=0;
-        }
+    public Integer getMemberCount() {
+        if (memberCount==null) return 0;
         return memberCount;
     }
 
@@ -118,10 +101,8 @@ public class OutAdminTaskScore {
         this.memberCount = memberCount;
     }
 
-    public Integer memberScoreCount() {
-        if (memberScoreCount==null){
-            memberScoreCount=0;
-        }
+    public Integer getMemberScoreCount() {
+        if (memberScoreCount==null) memberScoreCount=0;
         return memberScoreCount;
     }
 
@@ -129,10 +110,8 @@ public class OutAdminTaskScore {
         this.memberScoreCount = memberScoreCount;
     }
 
-    public Double memberScoreAverage() {
-        if (memberScoreAverage==null){
-            memberScoreAverage=0.0;
-        }
+    public Double getMemberScoreAverage() {
+        if (memberScoreAverage==null) memberScoreAverage=0.0;
         return memberScoreAverage;
     }
 
@@ -140,6 +119,14 @@ public class OutAdminTaskScore {
         this.memberScoreAverage = memberScoreAverage;
     }
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getName() {
         return name;
     }
@@ -156,7 +143,7 @@ public class OutAdminTaskScore {
         this.depId = depId;
     }
 
-    public String depName() {
+    public String getDepName() {
         return depName;
     }
 
@@ -188,7 +175,7 @@ public class OutAdminTaskScore {
         this.status = status;
     }
 
-    public Date lastLoginTime() {
+    public Date getLastLoginTime() {
         return lastLoginTime;
     }
 

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

@@ -4,6 +4,7 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.model.TaskScore;
 import com.goafanti.order.bo.TaskScore.InputTaskScore;
+import com.goafanti.order.bo.TaskScore.OutAdminTaskScore;
 import com.goafanti.order.service.TaskScoreService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -92,7 +93,7 @@ public class TaskScoreController extends BaseController {
      * @return
      */
     @GetMapping("/list")
-    public Result<TaskScore> list(InputTaskScore in) {
+    public Result<OutAdminTaskScore> list(InputTaskScore in) {
         return new Result<>().data(this.taskScoreService.list(in));
     }