fix:后台管理技师审核页

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TJsController.java

@@ -2,6 +2,8 @@ package com.ylx.web.controller.massage;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.stream.CollectorUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.annotation.Log;
@@ -32,6 +34,7 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -208,6 +211,7 @@ public class TJsController extends BaseController {
                 like(StringUtils.isNotBlank(js.getcPhone()), TJs::getcPhone, js.getcPhone()).
                 eq(js.getnStatus() != null, TJs::getnStatus, js.getnStatus()).
                 eq(js.getnSex() != null, TJs::getnSex, js.getnSex()).
+                in(CollectionUtil.isNotEmpty(js.getTongStatus()), TJs::getnTong, js.getTongStatus()).
                 orderByDesc(TJs::getDtCreateTime);
         return jsService.page(page, mhCompanyLambdaQueryWrapper);
     }

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TJs.java

@@ -266,6 +266,10 @@ public class TJs implements Serializable {
     @ApiModelProperty("技师距离")
     private BigDecimal distance = BigDecimal.valueOf(10000L);
 
+    @TableField(exist = false)
+    @ApiModelProperty("审核状态list")
+    private List<Integer> tongStatus;
+
     @TableField(exist = false)
     @ApiModelProperty("技师项目")
     private List<TXiangmu> projects;