修改人员白名单处mid值

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -239,18 +239,19 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         String farmId = paramsMap.get("farmId");
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
+        String vistitType = paramsMap.get("vistitType");
         Page<CleanDryGoodsVo> cleanDryGoodPage = null;
         Page<CleanDryGoodsVo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("vistit_type", 5);
+        queryWrapper.eq("farm_id", farmId).eq("vistit_type", vistitType);
         QueryWrapper<BillDry> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("farm_id", farmId).eq("vistit_type", 5);
+        queryWrapper2.eq("farm_id", farmId).eq("vistit_type", vistitType);
         QueryWrapper<BillGoodsInventory> queryWrapper3 = new QueryWrapper<>();
         queryWrapper3.eq("farm_id", farmId);
 
         String[] s = {TokenSign.getMemberIdByJwtToken(httpServletRequest).toString()};
         System.out.println("传入自定义sql的位置参数形式：" + s);
-        cleanDryGoodPage = cleanMapper.listCleanDryGoods(page, farmId, "5", "0,1".split(","), s);
+        cleanDryGoodPage = cleanMapper.listCleanDryGoods(page, farmId, vistitType, "0,1".split(","), s);
 //        queryWrapper.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
 //        queryWrapper2.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
 //        queryWrapper3.in("current_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));

huimv-receive/src/main/resources/com/huimv/receive/mapper/BillCleanMapper.xml

@@ -144,7 +144,7 @@ ORDER BY
     </select>
     <select id="listCleanDryGoods" resultType="com.huimv.receive.entity.vo.CleanDryGoodsVo">
         select id,vistit_Type,test_location,admission_user_name,car_num,clean_time,null as 'dryTime',check_date,sub_date,bill_status,img_status,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
-        and test_location_id in
+        and admission_user_id in
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}
         </foreach>
@@ -154,7 +154,7 @@ ORDER BY
         </foreach>
         union all
         select id,vistit_Type,test_location,admission_user_name,car_num,null as 'cleanTime',dry_time,check_date,sub_date,bill_status,img_status,2 AS 'type' from bill_dry where farm_id=#{farmId} and vistit_type=#{type}
-        and test_location_id in
+        and admission_user_id in
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}
         </foreach>
@@ -164,7 +164,7 @@ ORDER BY
         </foreach>
         union all
         select id,vistit_type,test_location as 'testLocation',admission_user_name,car_num,null as 'cleanTime',null as 'dryTime',null as 'checkDate' ,sub_date,bill_status as 'billStatus' ,null,3 AS 'type' from bill_goods_inventory where farm_id=#{farmId}
-        and test_location_id in
+        and admission_user_id in
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}
         </foreach>