Commit 42e670ae authored by suhuiguang's avatar suhuiguang

fix(重要提示):气瓶循环查询修改

1.气瓶循环查询修改,改成按照单据查询
parent b1ba7baf
......@@ -64,8 +64,9 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
lambda.eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr());
lambda.select(JgUseRegistrationEq::getEquId);
List<String> records = useRegisterReminderParse.getJgRelationEquipMapper().selectList(lambda).stream().map(JgUseRegistrationEq::getEquId).collect(Collectors.toList());
Map<String, Object> historyData = getValuesFromHistory(useRegistration);
List<ReminderItemDto> itemDtoList = useRegisterReminderParse.getJgUseRegistrationMapper().queryForUnitVehiclePageForReminder(records);
itemDtoList.forEach(item -> item.setDetailData(this.buildSetUseDataByStatus(useRegistration, item.getEquipId())));
itemDtoList.forEach(item -> item.setDetailData(this.buildSetUseDataByStatus(historyData, item.getEquipId())));
re.addAll(itemDtoList);
}
// 台套设备
......@@ -83,14 +84,14 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
reminderItemDto.setEquipId(record);
reminderItemDto.setEquipNo(idxBizJgUseInfo.getUseInnerCode());
reminderItemDto.setEquipName(registerInfo.getProductName());
reminderItemDto.setDetailData(this.buildSetUseDataByStatus(useRegistration, record));
Map<String, Object> historyData = getValuesFromHistory(useRegistration);
reminderItemDto.setDetailData(this.buildSetUseDataByStatus(historyData, record));
re.add(reminderItemDto);
}
return re;
}
private Map<String, Object> buildSetUseDataByStatus(JgUseRegistration useRegistration, String record) {
Map<String, Object> re = getValuesFromHistory(useRegistration);
private Map<String, Object> buildSetUseDataByStatus(Map<String, Object> re, String record) {
if (re != null) return re;
return useRegisterReminderParse.getEquipDetailByRecord(record);
}
......
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