|
@@ -49,6 +49,8 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
|
|
private BillSubsidyMapper subsidyMapper;
|
|
private BillSubsidyMapper subsidyMapper;
|
|
@Resource
|
|
@Resource
|
|
private SysUserMapper sysUserMapper;
|
|
private SysUserMapper sysUserMapper;
|
|
|
|
+ @Resource
|
|
|
|
+ private BaseAnimalMapper baseAnimalMapper;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
@@ -305,13 +307,11 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Result getEartagNoBy(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
public Result getEartagNoBy(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
- String id = paramsMap.get("id");
|
|
|
|
- BillLandingInspection billLandingInspection = billLandingInspectionMapper.selectById(id);
|
|
|
|
- String eartags = billLandingInspection.getEartags();
|
|
|
|
- List eartagNo = PovertyUtils.getEartagNo(eartags);
|
|
|
|
- if (ObjectUtil.isEmpty(eartagNo)){
|
|
|
|
|
|
+ String inspectionNum = paramsMap.get("inspectionNum");
|
|
|
|
+ List<BaseAnimal> baseAnimals = baseAnimalMapper.selectList(new QueryWrapper<BaseAnimal>().eq("inspection_num",inspectionNum));
|
|
|
|
+ if (ObjectUtil.isEmpty(baseAnimals)){
|
|
return new Result(10001,"当前检疫无耳标",false);
|
|
return new Result(10001,"当前检疫无耳标",false);
|
|
}
|
|
}
|
|
- return new Result(ResultCode.SUCCESS,eartagNo);
|
|
|
|
|
|
+ return new Result(ResultCode.SUCCESS,baseAnimals);
|
|
}
|
|
}
|
|
}
|
|
}
|