接口11

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

@@ -255,10 +255,23 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         if (date != "") {
             date = date + " 00:00:00";
         }
+
+
         QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
         queryWrapper.ge(StringUtils.isNotBlank(date),"sub_time", date)
-                .like(StringUtils.isNotBlank(userName),"farmer_name", userName)
-                .eq(StringUtils.isNotBlank(type),"subsidy_sch",type);
+                .like(StringUtils.isNotBlank(userName),"farmer_name", userName);
+
+        if (Integer.parseInt(type) == 7) {
+            queryWrapper.eq("is_pay", 1);
+            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);
+            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);
         Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
     }

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

@@ -12,6 +12,7 @@ import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.PovertyUserRegist;
 import com.huimv.farm.damsubsidy.entity.SysUser;
+import com.huimv.farm.damsubsidy.mapper.BaseVeterStationMapper;
 import com.huimv.farm.damsubsidy.mapper.PovertyUserRegistMapper;
 import com.huimv.farm.damsubsidy.mapper.SysUserMapper;
 import com.huimv.farm.damsubsidy.service.ISysUserService;
@@ -41,6 +42,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private SysUserMapper userMapper;
     @Autowired
     private PovertyUserRegistMapper povertyUserRegistMapper;
+    @Autowired
+    private BaseVeterStationMapper baseVeterStationMapper;
 
     @Override
     public Result loginMultilevel(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -144,6 +147,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (ObjectUtil.isNotEmpty(paramsMap.get("address"))) {
             user.setAddress(paramsMap.get("address"));
         }
+//        if (Integer.parseInt(paramsMap.get("type")) == 1) {
+//
+//        }
         if (Integer.parseInt(paramsMap.get("type")) == 3) {
             QueryWrapper<PovertyUserRegist> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("XM", paramsMap.get("userName")).eq("ZJHM", paramsMap.get("idCord"));