会员查询条件增加仪器查询

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java

@@ -78,6 +78,8 @@ public class WxUserMemberVm extends BaseEntity {
      */
     private Date endTime;
 
+    private List<Long> devicesIdList;
+
     /**
      * 仪器数量起始值
      */
@@ -288,4 +290,12 @@ public class WxUserMemberVm extends BaseEntity {
     public void setMiniProgramTagNum(Integer miniProgramTagNum) {
         this.miniProgramTagNum = miniProgramTagNum;
     }
+
+    public List<Long> getDevicesIdList() {
+        return devicesIdList;
+    }
+
+    public void setDevicesIdList(List<Long> devicesIdList) {
+        this.devicesIdList = devicesIdList;
+    }
 }

flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml

@@ -436,6 +436,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     COUNT( DISTINCT tag_id ) = #{miniProgramTagNum}
             )
             </if>
+            <if test="devicesIdList != null and devicesIdList.size > 0" >
+                and id in (
+                    SELECT
+                        ui.user_id
+                    FROM
+                        `wx_user_instrument` ui
+                    WHERE
+                        ui.instrument_id IN
+                        <foreach item="instrumentId" collection="devicesIdList" open="(" separator="," close=")">
+                            #{instrumentId}
+                        </foreach>
+                )
+            </if>
             and member.status = 0
         </where>
         order by member.id desc

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java

@@ -50,6 +50,14 @@ public class WxInstrumentController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 获取全部的仪器
+     */
+    @GetMapping("/getAllInstrument")
+    public AjaxResult getAllInstrument() {
+        return success(wxInstrumentService.selectWxInstrumentList(new WxInstrument()));
+    }
+
     /**
      * 获取仪器列详细信息
      */

flossom-ui/src/api/system/member.js

@@ -9,6 +9,14 @@ export function listMember(query) {
   })
 }
 
+// 获取全部的仪器列表
+export function getAllInstrument() {
+  return request({
+    url: '/system/instrument/getAllInstrument',
+    method: 'get',
+  })
+}
+
 // 查询用户详细
 export function getMember(id) {
   return request({