anderx 1 год назад
Родитель
Сommit
a495a8042f

+ 122 - 41
src/main/java/com/goafanti/order/bo/TaskScore/OutAdminTaskScore.java

@@ -1,62 +1,143 @@
 package com.goafanti.order.bo.TaskScore;
 
-import com.goafanti.common.model.AdminProjectStatistics;
-
-public class OutAdminTaskScore extends AdminProjectStatistics {
+import com.goafanti.common.utils.excel.Excel;
+
+import java.util.Date;
+
+public class OutAdminTaskScore {
+    /**
+     * 高新&科技总数
+     */
+    @Excel(name = "高新&科技总数")
+    private Integer htSatCount;
+    /**
+     * 高新&科技已评分数
+     */
+    @Excel(name = "高新&科技已评分数")
+    private Integer htSatScoreCount;
+    /**
+     * 高新&科技平均分
+     */
+    @Excel(name = "高新&科技平均分")
+    private Double htSatScoreAverage;
+    /**
+     * 会员数
+     */
+    @Excel(name = "会员数")
+    private Integer memberCount;
+    /**
+     * 会员评分数
+     */
+    @Excel(name = "会员已评分数")
+    private Integer memberScoreCount;
+    /**
+     * 会员平均分
+     */
+    @Excel(name = "会员平均分")
+    private Double memberScoreAverage;
+    private String id;
+    /**
+     * 用户姓名
+     */
+    @Excel(name = "用户姓名")
     private String name;
     private String depId;
-    private String depname;
+    /**
+     * 部门名称
+     */
+    @Excel(name = "部门名称")
+    private String depName;
     private String superId;
+    /**
+     * 上级主管名称
+     */
+    @Excel(name = "上级主管名称")
     private String superName;
+    /**
+     * 会员平均分
+     */
+    @Excel(name = "状态",readConverterExp = "0=正常,1=锁定")
     private String status;
-    private String lastLoginTime;
+    /**
+     * 最后登录时间
+     */
+    @Excel(name = "最后登录时间")
+    private Date lastLoginTime;
+
+
+
+    public String id() {
+        return id;
+    }
 
-    @Override
-    public Integer getHtSatCount() {
-        if (super.getHtSatCount() == null) {
-            return 0;
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer htSatCount() {
+        if (htSatCount==null){
+            htSatCount=0;
         }
-        return super.getHtSatCount();
+        return htSatCount;
     }
 
-    @Override
-    public Integer getHtSatScoreCount() {
-        if (super.getHtSatScoreCount() == null) {
-            return 0;
+    public void setHtSatCount(Integer htSatCount) {
+        this.htSatCount = htSatCount;
+    }
+
+    public Integer htSatScoreCount() {
+        if (htSatScoreCount==null){
+            htSatScoreCount=0;
         }
-        return super.getHtSatScoreCount();
+        return htSatScoreCount;
     }
 
-    @Override
-    public Double getHtSatScoreAverage() {
-        if (super.getHtSatScoreAverage() == null) {
-            return 0d;
+    public void setHtSatScoreCount(Integer htSatScoreCount) {
+        this.htSatScoreCount = htSatScoreCount;
+    }
+
+    public Double htSatScoreAverage() {
+        if (htSatScoreAverage==null){
+            htSatScoreAverage=0.0;
         }
-        return super.getHtSatScoreAverage();
+        return htSatScoreAverage;
+    }
+
+    public void setHtSatScoreAverage(Double htSatScoreAverage) {
+        this.htSatScoreAverage = htSatScoreAverage;
     }
 
-    @Override
-    public Integer getMemberCount() {
-        if (super.getMemberCount() == null) {
-            return 0;
+    public Integer memberCount() {
+        if (memberCount==null){
+            memberCount=0;
         }
-        return super.getMemberCount();
+        return memberCount;
+    }
+
+    public void setMemberCount(Integer memberCount) {
+        this.memberCount = memberCount;
     }
 
-    @Override
-    public Integer getMemberScoreCount() {
-        if (super.getMemberScoreCount() == null) {
-            return 0;
+    public Integer memberScoreCount() {
+        if (memberScoreCount==null){
+            memberScoreCount=0;
         }
-        return super.getMemberScoreCount();
+        return memberScoreCount;
     }
 
-    @Override
-    public Double getMemberScoreAverage() {
-        if (super.getMemberScoreAverage() == null) {
-            return 0d;
+    public void setMemberScoreCount(Integer memberScoreCount) {
+        this.memberScoreCount = memberScoreCount;
+    }
+
+    public Double memberScoreAverage() {
+        if (memberScoreAverage==null){
+            memberScoreAverage=0.0;
         }
-        return super.getMemberScoreAverage();
+        return memberScoreAverage;
+    }
+
+    public void setMemberScoreAverage(Double memberScoreAverage) {
+        this.memberScoreAverage = memberScoreAverage;
     }
 
     public String getName() {
@@ -75,12 +156,12 @@ public class OutAdminTaskScore extends AdminProjectStatistics {
         this.depId = depId;
     }
 
-    public String getDepname() {
-        return depname;
+    public String depName() {
+        return depName;
     }
 
-    public void setDepname(String depname) {
-        this.depname = depname;
+    public void setDepName(String depName) {
+        this.depName = depName;
     }
 
     public String getSuperId() {
@@ -107,11 +188,11 @@ public class OutAdminTaskScore extends AdminProjectStatistics {
         this.status = status;
     }
 
-    public String getLastLoginTime() {
+    public Date lastLoginTime() {
         return lastLoginTime;
     }
 
-    public void setLastLoginTime(String lastLoginTime) {
+    public void setLastLoginTime(Date lastLoginTime) {
         this.lastLoginTime = lastLoginTime;
     }
 }

+ 3 - 2
src/main/java/com/goafanti/order/service/impl/TaskScoreServiceImpl.java

@@ -12,6 +12,7 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.bo.TaskScore.InputTaskScore;
+import com.goafanti.order.bo.TaskScore.OutAdminTaskScore;
 import com.goafanti.order.service.TaskScoreService;
 import org.springframework.stereotype.Service;
 
@@ -42,9 +43,9 @@ public class TaskScoreServiceImpl extends BaseMybatisDao<TaskScoreMapper> implem
 
 
     @Override
-    public Pagination<TaskScore> list(InputTaskScore in) {
+    public Pagination<OutAdminTaskScore> list(InputTaskScore in) {
         Map<String, Object> params = pushMap(in);
-        return (Pagination<TaskScore>) findPage("findAdminTaskScoreList",
+        return (Pagination<OutAdminTaskScore>) findPage("findAdminTaskScoreList",
                 "findAdminTaskScoreList", params, in.getPageNo(), in.getPageSize());
     }