补贴

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BillSubsidy.java

@@ -243,4 +243,6 @@ public class BillSubsidy extends BaseEntity implements Serializable {
     private String bankBelongTo;
     //银行预留手机
     private String bankReservePhone;
+
+    private Integer subsidyType;
 }

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

@@ -159,6 +159,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
 
     @Override
     public Result addApplication(HttpServletRequest httpServletRequest, String inspectionNum, String cargoOwner, String ownerPhone, String animalType, String animalNumberUp, String useTo, String startTran, String reachTran, String veter, String eartags, MultipartFile image1,MultipartFile image2,MultipartFile image3,MultipartFile image4,MultipartFile image5) throws IOException {
+
         QueryWrapper<BillLandingInspection> landingInspectionQueryWrapper = new QueryWrapper<>();
         landingInspectionQueryWrapper.eq("inspection_num", inspectionNum);
         if (this.count(landingInspectionQueryWrapper) != 0) {
@@ -271,9 +272,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         billLandingInspection.setVeterId(Integer.parseInt(veter));
         billLandingInspection.setEartags(eartags);
         billLandingInspection.setJcbgImgUrl(content);
-        billLandingInspection.setCargoOwner(TokenSign.getUserName(httpServletRequest));
-        billLandingInspection.setOwnerPhone(TokenSign.getPhone(httpServletRequest));
-        billLandingInspection.setInspectionName(cargoOwner + "的落地检疫申请");
+        billLandingInspection.setInspectionName(TokenSign.getUserName(httpServletRequest) + "的落地检疫申请");
         billLandingInspection.setCreateTime(DateTime.now());
         billLandingInspection.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         billLandingInspection.setInspectionType(0);

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

@@ -224,6 +224,26 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
     @Override
     @Transactional
     public Result addApplication(HttpServletRequest httpServletRequest, BillSubsidy billSubsidy) {
+        Integer type = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id", TokenSign.getMemberIdByJwtToken(httpServletRequest))).getUserType();
+
+        if (type == 2){
+            if ("".equals(billSubsidy.getFarmName())){
+                return new Result(10001,"牧场名称不能为空",false);
+            }
+            if ("".equals(billSubsidy.getNameTwo())){
+                return new Result(10001,"负责人不能为空",false);
+            }
+            billSubsidy.setSubsidyType(1);
+        }
+        if (type == 3){
+            if ("".equals(billSubsidy.getFarmerName())){
+                return new Result(10001,"农户姓名不能为空",false);
+            }
+            if ("".equals(billSubsidy.getFarmerType())){
+                return new Result(10001,"农户类型不能为空",false);
+            }
+            billSubsidy.setSubsidyType(0);
+        }
         String eartagNo = billSubsidy.getEartagNo();
         String[] eartags = eartagNo.split(",");
         if (eartags.length !=  billSubsidy.getRewardNum()){
@@ -240,6 +260,8 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         BaseUserBank bankCard = baseUserBankMapper.selectOne(new QueryWrapper<BaseUserBank>().eq("bank_id", billSubsidy.getBankCardId()));
         billSubsidy.setBankName(bankCard.getBankName());
         billSubsidy.setBankImgUrl(bankCard.getBankImgUrl());
+        billSubsidy.setBankBelongTo(bankCard.getBankBelongTo());
+        billSubsidy.setBankReservePhone(bankCard.getBankReservePhone());
 //        if (!(BankUtil.checkBankCard(bankCardId))) {
 //            return new Result(10001, "银行卡号不符合标准!", false);
 //        }
@@ -268,7 +290,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
                 }
             }
         }
-        billSubsidy.setSubsidyName(billSubsidy.getFarmerName() + "的补贴申请");
+        billSubsidy.setSubsidyName(TokenSign.getUserName(httpServletRequest) + "的补贴申请");
         billSubsidy.setDetailedAdress(sysUser.getDetailedAdress());
         billSubsidy.setDetailedAdressCode(sysUser.getDetailedAdressCode());
         billSubsidy.setBriefAddress(sysUser.getBriefAddress());
@@ -299,6 +321,8 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         BaseUserBank bankCard = baseUserBankMapper.selectOne(new QueryWrapper<BaseUserBank>().eq("bank_id", billSubsidy.getBankCardId()));
         billSubsidy.setBankName(bankCard.getBankName());
         billSubsidy.setBankImgUrl(bankCard.getBankImgUrl());
+        billSubsidy.setBankBelongTo(bankCard.getBankBelongTo());
+        billSubsidy.setBankReservePhone(bankCard.getBankReservePhone());
         billSubsidy.setSubsidySch(7);
         billSubsidy.setCreateUser(userName);
         if (ObjectUtil.isEmpty(subsidy)) {