银行卡提示

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

@@ -154,7 +154,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         if (this.count(landingInspectionQueryWrapper) != 0) {
             return new Result(10001, "存在相同检疫证号！", false);
         }
-        billLandingInspection.setInspectionName(TokenSign.getUserName(httpServletRequest) + "的落地检疫申请");
+        billLandingInspection.setInspectionName(billLandingInspection.getCargoOwner() + "的落地检疫申请");
         billLandingInspection.setCreateTime(DateTime.now());
         billLandingInspection.setCreateUser(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setInspectionType(0);
@@ -200,7 +200,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         }
 
         if (inspectionSch.equals("4")){
-            landingInspectionQueryWrapper.eq("inspection_sch",4).or().eq("inspection_sch",5);
+            landingInspectionQueryWrapper.in("inspection_sch",4,5);
         } else if (ObjectUtil.isNotEmpty(inspectionSch)){
             landingInspectionQueryWrapper.eq("inspection_sch",inspectionSch);
         }

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

@@ -186,7 +186,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         String[] eartags = eartagNo.split(",");
         String bankCardId = billSubsidy.getBankCardId();
         if(!(BankUtil.checkBankCard(bankCardId))){
-            return new Result(10001,"补贴账号不符合标准!",false);
+            return new Result(10001,"银行卡号不符合标准!",false);
         }
         for (String eartag : eartags) {
             if (!eartag.contains("-")){
@@ -211,7 +211,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             }
         }
         billSubsidy.setBankName(BankUtil.getname(bankCardId));
-        billSubsidy.setSubsidyName(TokenSign.getUserName(httpServletRequest)+"的补贴申请");
+        billSubsidy.setSubsidyName(billSubsidy.getFarmerName()+"的补贴申请");
         billSubsidy.setCreateTime(DateTime.now());
         billSubsidy.setCreateUser(TokenSign.getUserName(httpServletRequest));
         billSubsidy.setSubsidySch(0);