|
@@ -358,6 +358,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Result listPcSub(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
public Result listPcSub(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
|
|
+ Integer userType = TokenSign.getUserType(httpServletRequest);
|
|
String userName = paramsMap.get("userName");
|
|
String userName = paramsMap.get("userName");
|
|
String date = paramsMap.get("date");
|
|
String date = paramsMap.get("date");
|
|
String pageSize = paramsMap.get("pageSize");
|
|
String pageSize = paramsMap.get("pageSize");
|
|
@@ -369,29 +370,55 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
|
|
if (pageNum == null || pageNum == "") {
|
|
if (pageNum == null || pageNum == "") {
|
|
pageNum = "1";
|
|
pageNum = "1";
|
|
}
|
|
}
|
|
|
|
+ if (userType == 0) {
|
|
|
|
+ QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
|
|
|
|
+ queryWrapper.between(StringUtils.isNotBlank(date), "create_time", date + " 00:00:00", date + " 23:59:59")
|
|
|
|
+ .like(StringUtils.isNotBlank(userName), "farmer_name", userName);
|
|
|
|
|
|
- QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
|
|
|
|
- queryWrapper.between(StringUtils.isNotBlank(date), "create_time", date + " 00:00:00", date + " 23:59:59")
|
|
|
|
- .like(StringUtils.isNotBlank(userName), "farmer_name", userName);
|
|
|
|
-
|
|
|
|
- if (Integer.parseInt(type) == 7) {
|
|
|
|
- queryWrapper.eq("is_pay", 1).orderByDesc("create_time");
|
|
|
|
- Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
|
|
- return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
|
|
|
|
- }
|
|
|
|
- if (Integer.parseInt(type) == 6) {
|
|
|
|
- queryWrapper.eq("is_pay", 2).orderByDesc("create_time");
|
|
|
|
|
|
+ if (Integer.parseInt(type) == 7) {
|
|
|
|
+ queryWrapper.eq("is_pay", 1).orderByDesc("create_time");
|
|
|
|
+ Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
|
|
+ return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
|
|
|
|
+ }
|
|
|
|
+ if (Integer.parseInt(type) == 6) {
|
|
|
|
+ queryWrapper.eq("is_pay", 2).orderByDesc("create_time");
|
|
|
|
+ Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
|
|
+ return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
|
|
|
|
+ }
|
|
|
|
+ if (Integer.parseInt(type) == 3) {
|
|
|
|
+ queryWrapper.in("is_pay", 0, 1).eq("subsidy_sch", 3).orderByDesc("create_time");
|
|
|
|
+ Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
|
|
+ return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
|
|
|
|
+ }
|
|
|
|
+ queryWrapper.eq(StringUtils.isNotBlank(type), "subsidy_sch", type).orderByDesc("create_time");
|
|
Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
|
|
return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
|
|
- }
|
|
|
|
- if (Integer.parseInt(type) == 3) {
|
|
|
|
- queryWrapper.in("is_pay", 0, 1).eq("subsidy_sch", 3).orderByDesc("create_time");
|
|
|
|
|
|
+ } else {
|
|
|
|
+ String addressCode = TokenSign.getAddressCode(httpServletRequest);
|
|
|
|
+ QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
|
|
|
|
+ queryWrapper.between(StringUtils.isNotBlank(date), "create_time", date + " 00:00:00", date + " 23:59:59")
|
|
|
|
+ .like(StringUtils.isNotBlank(userName), "farmer_name", userName).like("brief_address_code",addressCode);
|
|
|
|
+
|
|
|
|
+ if (Integer.parseInt(type) == 7) {
|
|
|
|
+ queryWrapper.eq("is_pay", 1).orderByDesc("create_time").like("brief_address_code",addressCode);
|
|
|
|
+ Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
|
|
+ return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
|
|
|
|
+ }
|
|
|
|
+ if (Integer.parseInt(type) == 6) {
|
|
|
|
+ queryWrapper.eq("is_pay", 2).orderByDesc("create_time").like("brief_address_code",addressCode);
|
|
|
|
+ Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
|
|
+ return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
|
|
|
|
+ }
|
|
|
|
+ if (Integer.parseInt(type) == 3) {
|
|
|
|
+ queryWrapper.in("is_pay", 0, 1).eq("subsidy_sch", 3).orderByDesc("create_time").like("brief_address_code",addressCode);
|
|
|
|
+ Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
|
|
+ return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
|
|
|
|
+ }
|
|
|
|
+ queryWrapper.eq(StringUtils.isNotBlank(type), "subsidy_sch", type).orderByDesc("create_time").like("brief_address_code",addressCode);
|
|
Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
|
|
return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
|
|
}
|
|
}
|
|
- queryWrapper.eq(StringUtils.isNotBlank(type), "subsidy_sch", type).orderByDesc("create_time");
|
|
|
|
- Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
|
|
- return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|