判断补贴种类

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillSubsidyServiceImpl.java

@@ -329,6 +329,33 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
 
         if (userType == 2 || userType == 3) {
             subsidyQueryWrapper.eq("create_user", userName);
+            if (ObjectUtil.isNotEmpty(subsidySch)){
+                if (subsidySch.equals("1")){
+                    subsidyQueryWrapper.eq("subsidy_sch",0);
+                }else if (subsidySch.equals("2")){
+                    subsidyQueryWrapper.in("subsidy_sch",1,5);
+                }else if (subsidySch.equals("3")){
+                    subsidyQueryWrapper.in("subsidy_sch",2,3,4);
+                }else if (subsidySch.equals("4")){
+                    subsidyQueryWrapper.eq("is_pay",2);
+                }
+            }else {
+                subsidyQueryWrapper.ne("subsidy_sch",7);
+            }
+        }else {
+            if (ObjectUtil.isNotEmpty(subsidySch)){
+                if (subsidySch.equals("1")){
+                    subsidyQueryWrapper.eq("subsidy_sch",0);
+                }else if (subsidySch.equals("2")){
+                    subsidyQueryWrapper.in("subsidy_sch",1,5);
+                }else if (subsidySch.equals("3")){
+                    subsidyQueryWrapper.in("subsidy_sch",2,3,4);
+                }else if (subsidySch.equals("4")){
+                    subsidyQueryWrapper.eq("is_pay",2);
+                }
+            }else {
+                subsidyQueryWrapper.ne("subsidy_sch",7);
+            }
         }
 //        if (startTime != null) {
 //            startTime = startTime + " 00:00:00";
@@ -338,19 +365,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
 //            endTime = endTime + " 23:59:59";
 //            subsidyQueryWrapper.le("create_time",endTime);
 //        }
-        if (ObjectUtil.isNotEmpty(subsidySch)){
-            if (subsidySch.equals("1")){
-                subsidyQueryWrapper.eq("subsidy_sch",0);
-            }else if (subsidySch.equals("2")){
-                subsidyQueryWrapper.eq("subsidy_sch",1).or().eq("subsidy_sch",5);
-            }else if (subsidySch.equals("3")){
-                subsidyQueryWrapper.eq("subsidy_sch",2).or().eq("subsidy_sch",3).or().eq("subsidy_sch",4);
-            }else if (subsidySch.equals("4")){
-                subsidyQueryWrapper.eq("is_pay",2);
-            }
-        }else {
-            subsidyQueryWrapper.ne("subsidy_sch",7);
-        }
+
         subsidyQueryWrapper.orderByDesc("create_time");
         Page<BillSubsidy> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS,subsidyMapper.selectPage(page,subsidyQueryWrapper));