|
@@ -68,19 +68,19 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
type = "1";
|
|
|
}
|
|
|
if ("".equals(data) || null == data) {
|
|
|
- data = "1";
|
|
|
+ data = "0";
|
|
|
}
|
|
|
Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
|
QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("farm_id", farmId).eq("vistit_type", type).orderByDesc("sub_date")
|
|
|
- .eq("test_location", TokenSign.getWorkIdByJwtToken(httpServletRequest));
|
|
|
- if ("1".equals(data)) {
|
|
|
+ .eq("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
|
|
|
+ if ("0".equals(data)) {
|
|
|
queryWrapper.in("bill_status", 0, 1, 2);
|
|
|
}
|
|
|
- if ("2".equals(data)) {
|
|
|
+ if ("1".equals(data)) {
|
|
|
queryWrapper.eq("bill_status", 0);
|
|
|
}
|
|
|
- if ("3".equals(data)) {
|
|
|
+ if ("2".equals(data)) {
|
|
|
queryWrapper.eq("bill_status", 1);
|
|
|
}
|
|
|
return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page,queryWrapper));
|