pcr查询

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

@@ -63,7 +63,6 @@ public class BaseProcessServiceImpl extends ServiceImpl<BaseProcessMapper, BaseP
             baseProcessVo.setAllLocationSatus(allLocationStatus[i]);
             list.add(baseProcessVo);
         }
-
         return new Result(ResultCode.SUCCESS,list);
     }
 

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

@@ -300,9 +300,9 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             pageSize = "20";
         }
         Page<BillPcr> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        BaseLocation baseLocation = locationMapper.selectById(TokenSign.getWorkIdByJwtToken(httpServletRequest));
+        String[] locationIds = TokenSign.getWorkIdByJwtToken(httpServletRequest).split(",");
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("test_location_id", baseLocation.getId()).orderByDesc("sub_date");
+        queryWrapper.in("test_location_id", locationIds).orderByDesc("sub_date");
         if ("0".equals(type)) {
             queryWrapper.in("bill_status", 0, 1, 2, 3,4);
         }
@@ -316,7 +316,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             queryWrapper.in("bill_status", 2, 3);
         }
         QueryWrapper<BillPcr> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("test_location_id", baseLocation.getId()).orderByDesc("sub_date");
+        queryWrapper2.in("test_location_id", locationIds).orderByDesc("sub_date");
         queryWrapper2.eq("bill_status", 0);
         return new Result(ResultCode.SUCCESS, pcrMapper.selectPage(page, queryWrapper), pcrMapper.selectCount(queryWrapper2));
     }