|
@@ -19,10 +19,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.huimv.farm.damsubsidy.common.utils.Result;
|
|
|
import com.huimv.farm.damsubsidy.common.utils.ResultCode;
|
|
|
import com.huimv.farm.damsubsidy.entity.vo.BillSubsidyReportVo;
|
|
|
-import com.huimv.farm.damsubsidy.mapper.AreaAllMapper;
|
|
|
-import com.huimv.farm.damsubsidy.mapper.BaseAnimalMapper;
|
|
|
-import com.huimv.farm.damsubsidy.mapper.BillSubsidyMapper;
|
|
|
-import com.huimv.farm.damsubsidy.mapper.SysUserMapper;
|
|
|
+import com.huimv.farm.damsubsidy.mapper.*;
|
|
|
import com.huimv.farm.damsubsidy.service.IBillSubsidyService;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.huimv.farm.test.Print2;
|
|
@@ -215,6 +212,8 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
|
|
|
|
|
|
@Resource
|
|
|
private BaseAnimalMapper baseAnimalMapper;
|
|
|
+ @Resource
|
|
|
+ private BaseUserBankMapper baseUserBankMapper;
|
|
|
|
|
|
@Override
|
|
|
@Transactional
|
|
@@ -230,12 +229,15 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
|
|
|
if (billSubsidy.getImportNum() < billSubsidy.getRewardNum()) {
|
|
|
return new Result(10001, "奖补数应小于或等于引进数!", false);
|
|
|
}
|
|
|
- if (!(BankUtil.checkBankCard(bankCardId))) {
|
|
|
- return new Result(10001, "银行卡号不符合标准!", false);
|
|
|
- }
|
|
|
- if (ObjectUtil.isEmpty(BankUtil.getname(bankCardId))) {
|
|
|
- return new Result(10001, "补贴账号有误,请检查!", false);
|
|
|
- }
|
|
|
+ BaseUserBank bankCard = baseUserBankMapper.selectOne(new QueryWrapper<BaseUserBank>().eq("bank_id", billSubsidy.getBankCardId()));
|
|
|
+ billSubsidy.setBankName(bankCard.getBankName());
|
|
|
+ billSubsidy.setBankImgUrl(bankCard.getBankImgUrl());
|
|
|
+// if (!(BankUtil.checkBankCard(bankCardId))) {
|
|
|
+// return new Result(10001, "银行卡号不符合标准!", false);
|
|
|
+// }
|
|
|
+// if (ObjectUtil.isEmpty(BankUtil.getname(bankCardId))) {
|
|
|
+// return new Result(10001, "补贴账号有误,请检查!", false);
|
|
|
+// }
|
|
|
for (String eartag : eartags) {
|
|
|
if (!eartag.contains("-")) {
|
|
|
BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartag));
|
|
@@ -258,7 +260,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- billSubsidy.setBankName(BankUtil.getname(bankCardId));
|
|
|
+// billSubsidy.setBankName(BankUtil.getname(bankCardId));
|
|
|
billSubsidy.setSubsidyName(billSubsidy.getFarmerName() + "的补贴申请");
|
|
|
billSubsidy.setDetailedAdress(sysUser.getDetailedAdress());
|
|
|
billSubsidy.setDetailedAdressCode(sysUser.getDetailedAdressCode());
|
|
@@ -281,6 +283,9 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
|
|
|
public Result saveApplication(HttpServletRequest httpServletRequest, BillSubsidy billSubsidy) {
|
|
|
Long userName = TokenSign.getMemberIdByJwtToken(httpServletRequest);
|
|
|
BillSubsidy subsidy = this.getOne(new QueryWrapper<BillSubsidy>().eq("create_user", userName).eq("subsidy_sch", 7));
|
|
|
+ BaseUserBank bankCard = baseUserBankMapper.selectOne(new QueryWrapper<BaseUserBank>().eq("bank_id", billSubsidy.getBankCardId()));
|
|
|
+ billSubsidy.setBankName(bankCard.getBankName());
|
|
|
+ billSubsidy.setBankImgUrl(bankCard.getBankImgUrl());
|
|
|
billSubsidy.setSubsidySch(7);
|
|
|
billSubsidy.setCreateUser(userName);
|
|
|
if (ObjectUtil.isEmpty(subsidy)) {
|