瀏覽代碼

平均分

andrew 4 年之前
父節點
當前提交
4cdedae198

+ 17
- 8
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java 查看文件

@@ -9,10 +9,7 @@ import com.huiju.estateagents.base.BaseController;
9 9
 import com.huiju.estateagents.base.ResponseBean;
10 10
 import com.huiju.estateagents.center.sysUser.entity.SysToken;
11 11
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
12
-import com.huiju.estateagents.center.taUser.entity.TaTagUser;
13
-import com.huiju.estateagents.center.taUser.entity.TaTags;
14
-import com.huiju.estateagents.center.taUser.entity.TaUser;
15
-import com.huiju.estateagents.center.taUser.entity.TaUserRole;
12
+import com.huiju.estateagents.center.taUser.entity.*;
16 13
 import com.huiju.estateagents.center.taUser.service.*;
17 14
 import com.huiju.estateagents.common.CommConstant;
18 15
 import com.huiju.estateagents.common.JWTUtils;
@@ -30,11 +27,9 @@ import org.springframework.web.bind.annotation.*;
30 27
 
31 28
 import javax.servlet.http.HttpServletRequest;
32 29
 
30
+import java.text.SimpleDateFormat;
33 31
 import java.time.LocalDateTime;
34
-import java.util.ArrayList;
35
-import java.util.HashMap;
36
-import java.util.List;
37
-import java.util.Map;
32
+import java.util.*;
38 33
 
39 34
 /**
40 35
  * <p>
@@ -86,6 +81,9 @@ public class TaUserController extends BaseController {
86 81
     @Autowired
87 82
     private ITaMiniappService iTaMiniappService;
88 83
 
84
+    @Autowired
85
+    public ITpLifeConsultantEvaluateService iTpLifeConsultantEvaluateService;
86
+
89 87
     /**
90 88
      * 分页查询列表
91 89
      * @param pageNum
@@ -592,6 +590,17 @@ public class TaUserController extends BaseController {
592 590
             queryWrapper.eq(TaUser::getType,"life-consultant");
593 591
             queryWrapper.orderByDesc(TaUser::getCreateDate);
594 592
             IPage<TaUser> result = iTaUserService.page(pg,queryWrapper);
593
+            List<TaUser> records = result.getRecords();
594
+            records.forEach(e -> {
595
+                LambdaQueryWrapper<TpLifeConsultantEvaluate> evaluateQueryWrapper = new LambdaQueryWrapper<>();
596
+                evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getOrgId,getOrgId(request));
597
+                evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getUserId,e.getUserId());
598
+                evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getEvaluateTime,new SimpleDateFormat("yyyyMMdd").format(new Date()));
599
+                List<TpLifeConsultantEvaluate> list = iTpLifeConsultantEvaluateService.list(evaluateQueryWrapper);
600
+                String average = list.stream().mapToInt(TpLifeConsultantEvaluate::getScore).average().toString();
601
+                // 平均分
602
+                e.setAverageScore(Integer.valueOf(average));
603
+            });
595 604
             responseBean.addSuccess(result);
596 605
         }catch (Exception e){
597 606
             e.printStackTrace();

+ 6
- 0
src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java 查看文件

@@ -283,4 +283,10 @@ public class TaUser implements Serializable {
283 283
      */
284 284
     @TableField(exist = false)
285 285
     private Integer roomNoId;
286
+
287
+    /**
288
+     * 平均分
289
+     */
290
+    @TableField(exist = false)
291
+    private Integer averageScore;
286 292
 }