|
@@ -79,14 +79,16 @@ public class BaseFarmServiceImpl extends ServiceImpl<BaseFarmMapper, BaseFarm> i
|
|
|
queryWrapper.eq("area_code",areaCode);
|
|
|
List<BaseFarm> basePigpens = baseFarmMapper.selectList(queryWrapper);
|
|
|
if (null == basePigpens || basePigpens.size()== 0){
|
|
|
- return areaCode+"001";
|
|
|
+ String substring1 = areaCode.substring(areaCode.length() - 6);
|
|
|
+ return substring1+"001";
|
|
|
}
|
|
|
//当前区域中最大的牧场编码
|
|
|
String farmCode = basePigpens.stream().max(Comparator.comparing(BaseFarm::getFarmCode)).get().getFarmCode();
|
|
|
String substring = farmCode.substring(farmCode.length() - 3);
|
|
|
int code = Integer.parseInt(substring)+1;
|
|
|
String formatCode = String.format("%03d", code);
|
|
|
- return areaCode+formatCode;
|
|
|
+ String substring1 = areaCode.substring(areaCode.length() - 6);
|
|
|
+ return substring1+formatCode;
|
|
|
}
|
|
|
|
|
|
@Override
|