feats"

pom.xml

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

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

@@ -14,6 +14,7 @@ import com.huiju.estateagents.center.taUser.service.*;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.service.*;
@@ -577,10 +578,13 @@ public class TaUserController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageNum", value = "第几页"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageSize", value = "一页多少条"),
     })
-    @RequestMapping(value="/wx/life-consultant/list",method= RequestMethod.GET)
-    public ResponseBean lifeConsultantList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                   HttpServletRequest request){
+    @RequestMapping(value="/{client}/life-consultant/list",method= RequestMethod.GET)
+    public ResponseBean lifeConsultantList(@PathVariable String client,
+                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           @RequestParam(value ="userName", required = false) String userName,
+                                           @RequestParam(value ="phone", required = false) String phone,
+                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -588,6 +592,8 @@ public class TaUserController extends BaseController {
             LambdaQueryWrapper<TaUser> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(TaUser::getOrgId,getOrgId(request));
             queryWrapper.eq(TaUser::getType,"life-consultant");
+            queryWrapper.like(!StringUtils.isEmpty(userName), TaUser::getUserName,"%"+ userName + "%");
+            queryWrapper.like(!StringUtils.isEmpty(phone), TaUser::getPhone,"%"+ phone + "%");
             queryWrapper.orderByDesc(TaUser::getCreateDate);
             IPage<TaUser> result = iTaUserService.page(pg,queryWrapper);
             List<TaUser> records = result.getRecords();

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

@@ -48,14 +48,20 @@ public class TpLifeConsultantEvaluateController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/tpLifeConsultantEvaluate",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/tpLifeConsultantEvaluate",method= RequestMethod.GET)
     public ResponseBean tpLifeConsultantEvaluateList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                     @RequestParam(value ="userId") String userId,
+                                                     @RequestParam(value ="evaluateTime", required = false) String evaluateTime,
+                                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         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");
 
             IPage<TpLifeConsultantEvaluate> result = iTpLifeConsultantEvaluateService.page(pg, queryWrapper);