Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

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

@@ -601,7 +601,7 @@ public class TaUserController extends BaseController {
                 LambdaQueryWrapper<TpLifeConsultantEvaluate> evaluateQueryWrapper = new LambdaQueryWrapper<>();
                 evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getOrgId,getOrgId(request));
                 evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getUserId,e.getUserId());
-                evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getEvaluateTime,new SimpleDateFormat("yyyyMMdd").format(new Date()));
+                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();
                 // 平均分

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

@@ -90,7 +90,7 @@ public class TpLifeConsultantEvaluateController extends BaseController {
             tpLifeConsultantEvaluate.setOrgId(getOrgId(request));
             tpLifeConsultantEvaluate.setPersonId(getPersonId(request));
             tpLifeConsultantEvaluate.setCreateDate(LocalDateTime.now());
-            tpLifeConsultantEvaluate.setEvaluateTime(new SimpleDateFormat("yyyyMMdd").format(new Date()));
+            tpLifeConsultantEvaluate.setEvaluateTime(new SimpleDateFormat("yyyyMM").format(new Date()));
             LambdaQueryWrapper<TpLifeConsultantEvaluate> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(TpLifeConsultantEvaluate::getOrgId,tpLifeConsultantEvaluate.getOrgId());
             queryWrapper.eq(TpLifeConsultantEvaluate::getPersonId,tpLifeConsultantEvaluate.getPersonId());