Skip to content

A
amos-boot-biz
Commit 42e670ae authored by suhuiguang's avatar suhuiguang
Browse files
Options

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

1.气瓶循环查询修改，改成按照单据查询
parent b1ba7baf
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/useRegister/UseRegisterReminderAdapter.java
View file @ 42e670ae
...@@ -64,8 +64,9 @@ public class UseRegisterReminderAdapter extends DefaultReminder { ...@@ -64,8 +64,9 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
lambda.eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr()); lambda.eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr());
lambda.select(JgUseRegistrationEq::getEquId); lambda.select(JgUseRegistrationEq::getEquId);
List<String> records = useRegisterReminderParse.getJgRelationEquipMapper().selectList(lambda).stream().map(JgUseRegistrationEq::getEquId).collect(Collectors.toList()); 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); 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); re.addAll(itemDtoList);
} }
// 台套设备 // 台套设备
...@@ -83,14 +84,14 @@ public class UseRegisterReminderAdapter extends DefaultReminder { ...@@ -83,14 +84,14 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
reminderItemDto.setEquipId(record); reminderItemDto.setEquipId(record);
reminderItemDto.setEquipNo(idxBizJgUseInfo.getUseInnerCode()); reminderItemDto.setEquipNo(idxBizJgUseInfo.getUseInnerCode());
reminderItemDto.setEquipName(registerInfo.getProductName()); 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); re.add(reminderItemDto);
} }
return re; return re;
} }
private Map<String, Object> buildSetUseDataByStatus(JgUseRegistration useRegistration, String record) { private Map<String, Object> buildSetUseDataByStatus(Map<String, Object> re, String record) {
Map<String, Object> re = getValuesFromHistory(useRegistration);
if (re != null) return re; if (re != null) return re;
return useRegisterReminderParse.getEquipDetailByRecord(record); 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