feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.17</version>
+	<version>1.0.18</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -603,9 +603,9 @@ public class TaUserController extends BaseController {
                 evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getUserId,e.getUserId());
                 evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getEvaluateTime,new SimpleDateFormat("yyyyMM").format(new Date()));
                 List<TpLifeConsultantEvaluate> list = iTpLifeConsultantEvaluateService.list(evaluateQueryWrapper);
-                String average = list.stream().mapToInt(TpLifeConsultantEvaluate::getScore).average().toString();
+                String average = list.size() > 0 ? list.stream().mapToInt(TpLifeConsultantEvaluate::getScore).average().toString() : null;
                 // 平均分
-                e.setAverageScore(Integer.valueOf(average));
+                e.setAverageScore(null == average ? 0 : Integer.valueOf(average));
             });
             responseBean.addSuccess(result);
         }catch (Exception e){

src/main/java/com/huiju/estateagents/center/taUser/controller/TpLifeConsultantEvaluateController.java

@@ -58,13 +58,16 @@ public class TpLifeConsultantEvaluateController extends BaseController {
         try {
             //使用分页插件
 		    IPage<TpLifeConsultantEvaluate> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TpLifeConsultantEvaluate> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id", getOrgId(request));
-            queryWrapper.eq("user_id", userId);
-            queryWrapper.eq("evaluate_time", evaluateTime);
-            queryWrapper.orderByDesc("create_date");
+//            QueryWrapper<TpLifeConsultantEvaluate> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.eq("org_id", getOrgId(request));
+//            queryWrapper.eq("user_id", userId);
+//            queryWrapper.eq("evaluate_time", evaluateTime);
+//            queryWrapper.orderByDesc("create_date");
+//
+//            IPage<TpLifeConsultantEvaluate> result = iTpLifeConsultantEvaluateService.page(pg, queryWrapper);
+
+            IPage<TpLifeConsultantEvaluate> result = iTpLifeConsultantEvaluateService.getPageBy(pg, getOrgId(request), userId, evaluateTime);
 
-            IPage<TpLifeConsultantEvaluate> result = iTpLifeConsultantEvaluateService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/center/taUser/entity/TpLifeConsultantEvaluate.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.center.taUser.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -58,5 +59,6 @@ public class TpLifeConsultantEvaluate implements Serializable {
      */
     private Integer orgId;
 
-
+    @TableField(exist = false)
+    private String personName;
 }

src/main/java/com/huiju/estateagents/center/taUser/mapper/TpLifeConsultantEvaluateMapper.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.center.taUser.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.center.taUser.entity.TpLifeConsultantEvaluate;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -15,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TpLifeConsultantEvaluateMapper extends BaseMapper<TpLifeConsultantEvaluate> {
 
+    IPage<TpLifeConsultantEvaluate> getPageBy(IPage<TpLifeConsultantEvaluate> pg, Integer orgId, String userId, String evaluateTime);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITpLifeConsultantEvaluateService.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.center.taUser.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.center.taUser.entity.TpLifeConsultantEvaluate;
 
@@ -13,4 +14,5 @@ import com.huiju.estateagents.center.taUser.entity.TpLifeConsultantEvaluate;
  */
 public interface ITpLifeConsultantEvaluateService extends IService<TpLifeConsultantEvaluate> {
 
+    IPage<TpLifeConsultantEvaluate> getPageBy(IPage<TpLifeConsultantEvaluate> pg, Integer orgId, String userId, String evaluateTime);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TpLifeConsultantEvaluateServiceImpl.java

@@ -1,9 +1,11 @@
 package com.huiju.estateagents.center.taUser.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.center.taUser.entity.TpLifeConsultantEvaluate;
 import com.huiju.estateagents.center.taUser.mapper.TpLifeConsultantEvaluateMapper;
 import com.huiju.estateagents.center.taUser.service.ITpLifeConsultantEvaluateService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +18,11 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TpLifeConsultantEvaluateServiceImpl extends ServiceImpl<TpLifeConsultantEvaluateMapper, TpLifeConsultantEvaluate> implements ITpLifeConsultantEvaluateService {
+    @Autowired
+    TpLifeConsultantEvaluateMapper tpLifeConsultantEvaluateMapper;
 
+    @Override
+    public IPage<TpLifeConsultantEvaluate> getPageBy(IPage<TpLifeConsultantEvaluate> pg, Integer orgId, String userId, String evaluateTime) {
+        return tpLifeConsultantEvaluateMapper.getPageBy(pg, orgId, userId, evaluateTime);
+    }
 }

src/main/resources/mapper/TpLifeConsultantEvaluateMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.center.taUser.mapper.TpLifeConsultantEvaluateMapper">
 
+    <select id="getPageBy" resultType="com.huiju.estateagents.center.taUser.entity.TpLifeConsultantEvaluate">
+        SELECT t.*, s.nickname as person_name
+        FROM
+            tp_life_consultant_evaluate t
+        LEFT JOIN ta_person s ON t.person_id = s.person_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.user_id = #{userId}
+            AND t.evaluate_time = #{evaluateTime}
+        ORDER BY t.create_date DESC
+    </select>
 </mapper>