修改补贴接口

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -212,7 +212,7 @@ public class SysUserController {
     //测试-token
     @PostMapping(value = "/getToken")
     public String getToken(HttpServletRequest req) {
-        String token = TokenSign.sign("superadmin", "123456789",1L);
+        String token = TokenSign.sign("养殖户测试", "13112341236",6L);
         return token;
     }
 

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

@@ -71,7 +71,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         calendar.setTime(startTime);
         calendar.add(Calendar.DATE, Integer.valueOf(dayIsolated));
         Date endTime = calendar.getTime();
-        billIsolated.setInspectionName(TokenSign.getUserName(httpServletRequest)+"的隔离信息");
+        String userName = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum)).getCreateUser();
+        billIsolated.setInspectionName(userName+"的隔离信息");
         billIsolated.setInspectionNum(inspectionNum);
         billIsolated.setIsolatedPosition(isolatedPosition);
         billIsolated.setStrIsolated(startTime);
@@ -106,7 +107,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                         baseAnimal.setEaratgNo(earatgNo);
                         baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                         baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-                        baseAnimal.setBelongToUser(TokenSign.getUserName(httpServletRequest));
+                        baseAnimal.setBelongToUser(userName);
                         baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
                         baseAnimal.setCreateTime(new Date());
                         baseAnimalMapper.insert(baseAnimal);
@@ -120,7 +121,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     baseAnimal.setEaratgNo(input);
                     baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                     baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-                    baseAnimal.setBelongToUser(TokenSign.getUserName(httpServletRequest));
+                    baseAnimal.setBelongToUser(userName);
                     baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
                     baseAnimal.setCreateTime(new Date());
                     baseAnimalMapper.insert(baseAnimal);
@@ -146,7 +147,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     baseAnimal.setEaratgNo(earatgNo);
                     baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                     baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-                    baseAnimal.setBelongToUser(TokenSign.getUserName(httpServletRequest));
+                    baseAnimal.setBelongToUser(userName);
                     baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
                     baseAnimal.setCreateTime(new Date());
                     baseAnimalMapper.insert(baseAnimal);
@@ -160,7 +161,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                 baseAnimal.setEaratgNo(eartags);
                 baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                 baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-                baseAnimal.setBelongToUser(TokenSign.getUserName(httpServletRequest));
+                baseAnimal.setBelongToUser(userName);
                 baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
                 baseAnimal.setCreateTime(new Date());
                 baseAnimalMapper.insert(baseAnimal);

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

@@ -203,25 +203,33 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         if(!(BankUtil.checkBankCard(bankCardId))){
             return new Result(10001,"补贴账号不符合标准!",false);
         }
+        billSubsidy.setBankName(BankUtil.getname(bankCardId));
         billSubsidy.setSubsidyName(TokenSign.getUserName(httpServletRequest)+"的补贴申请");
         billSubsidy.setCreateTime(DateTime.now());
         billSubsidy.setCreateUser(TokenSign.getUserName(httpServletRequest));
-        if (this.saveOrUpdate(billSubsidy)) {
-            return Result.SUCCESS();
+        billSubsidy.setSubsidySch(0);
+        String userName = TokenSign.getUserName(httpServletRequest);
+        BillSubsidy subsidy = this.getOne(new QueryWrapper<BillSubsidy>().eq("create_user", userName).eq("subsidy_sch", 7));
+        if (ObjectUtil.isEmpty(subsidy)){
+            this.save(billSubsidy);
         }else {
-            return Result.FAIL();
+            this.update(billSubsidy,new QueryWrapper<BillSubsidy>().eq("create_user",userName).eq("subsidy_sch",7));
         }
+        return Result.SUCCESS();
     }
 
     @Override
     public Result saveApplication(HttpServletRequest httpServletRequest, BillSubsidy billSubsidy) {
+        String userName = TokenSign.getUserName(httpServletRequest);
+        BillSubsidy subsidy = this.getOne(new QueryWrapper<BillSubsidy>().eq("create_user", userName).eq("subsidy_sch", 7));
         billSubsidy.setSubsidySch(7);
-        billSubsidy.setCreateUser(TokenSign.getUserName(httpServletRequest));
-        if (this.saveOrUpdate(billSubsidy)) {
-            return Result.SUCCESS();
+        billSubsidy.setCreateUser(userName);
+        if (ObjectUtil.isEmpty(subsidy)){
+            this.save(billSubsidy);
         }else {
-            return Result.FAIL();
+            this.update(billSubsidy,new QueryWrapper<BillSubsidy>().eq("create_user",userName).eq("subsidy_sch",7));
         }
+        return Result.SUCCESS();
     }
 
     @Override
@@ -298,7 +306,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         QueryWrapper<BillSubsidy> subsidyQueryWrapper = new QueryWrapper<>();
 
         if (userType == 2 || userType == 3) {
-            subsidyQueryWrapper.eq("creat_user", userName);
+            subsidyQueryWrapper.eq("create_user", userName);
         }
 //        if (startTime != null) {
 //            startTime = startTime + " 00:00:00";
@@ -315,8 +323,6 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
                 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("subsidy_sch",8);
             }
         }else {
             subsidyQueryWrapper.ne("subsidy_sch",7);