Commit 06e09d72 authored by 刘林's avatar 刘林

fix(JG):车用气瓶-内部编码多个问题处理

parent 7ffc8fe3
......@@ -907,9 +907,22 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
populateEquipmentInformation(registerInfoList, exportParamsMap);
}
IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(vehicleInformationEqList.get(0).getEquId());
if (useInfo != null && useInfo.getUseInnerCode() != null) {
exportParamsMap.put("useInnerCode", useInfo.getUseInnerCode());
//IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(vehicleInformationEqList.get(0).getEquId());
//if (useInfo != null && useInfo.getUseInnerCode() != null) {
// exportParamsMap.put("useInnerCode", useInfo.getUseInnerCode());
//}
List<IdxBizJgUseInfo> userInfoList = idxBizJgUseInfoService.list(new QueryWrapper<IdxBizJgUseInfo>().in("RECORD", vehicleInformationEqList.stream()
.map(JgVehicleInformationEq::getEquId)
.filter(Objects::nonNull)
.collect(Collectors.toList())));
if (!ValidationUtil.isEmpty(userInfoList)) {
exportParamsMap.put("useInnerCode", userInfoList.stream()
.map(IdxBizJgUseInfo::getUseInnerCode)
.filter(Objects::nonNull)
.distinct()
.collect(Collectors.joining(", ")));
}
List<IdxBizJgFactoryInfo> factoryInfoList = idxBizJgFactoryInfoMapper.selectList(new QueryWrapper<IdxBizJgFactoryInfo>().in("RECORD", vehicleInformationEqList.stream()
......@@ -921,6 +934,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
exportParamsMap.put("factoryNum", factoryInfoList.stream()
.map(IdxBizJgFactoryInfo::getFactoryNum)
.filter(Objects::nonNull)
.distinct()
.collect(Collectors.joining(", ")));
}
exportParamsMap.put("applyNo", vehicleInformation.getApplyNo());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment