|
@@ -268,7 +268,6 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-// billSubsidy.setBankName(BankUtil.getname(bankCardId));
|
|
|
billSubsidy.setSubsidyName(billSubsidy.getFarmerName() + "的补贴申请");
|
|
|
billSubsidy.setDetailedAdress(sysUser.getDetailedAdress());
|
|
|
billSubsidy.setDetailedAdressCode(sysUser.getDetailedAdressCode());
|
|
@@ -276,8 +275,12 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
|
|
|
billSubsidy.setBriefAddressCode(sysUser.getBriefAddressCode());
|
|
|
billSubsidy.setCreateTime(DateTime.now());
|
|
|
billSubsidy.setCreateUser(id);
|
|
|
+ Integer count = billBuyInfoMapper.selectCount(new QueryWrapper<BillBuyInfo>().eq("inspection_num", billSubsidy.getInspectionNum()));
|
|
|
BillLandingInspection billLandingInspection = billLandingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", billSubsidy.getInspectionNum()));
|
|
|
- billSubsidy.setSaleName(billLandingInspection.getCargoOwner());
|
|
|
+ Integer userType = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id", billLandingInspection.getCreateUser())).getUserType();
|
|
|
+ if (count != 0 && userType == 2){
|
|
|
+ billSubsidy.setSaleName(billLandingInspection.getCargoOwner());
|
|
|
+ }
|
|
|
billSubsidy.setSubsidySch(0);
|
|
|
Long userName = id;
|
|
|
BillSubsidy subsidy = this.getOne(new QueryWrapper<BillSubsidy>().eq("create_user", userName).eq("subsidy_sch", 7));
|