Skip to content

A
amos-boot-biz
Commit e88a06fd authored by tianbo's avatar tianbo
Browse files
Options

fix(amos-boot-module-jg): 修复历史设备录入的分类问题

- 新增历史设备录入时，移动式压力容器不应出现在可选设备分类中 -历史无证设备录入时，移动式压力容器和气瓶不应出现在可选设备分类中 - 优化了设备分类过滤逻辑，提高数据准确性
parent ec11bb66
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java
View file @ e88a06fd
...@@ -169,12 +169,12 @@ public class IdxBizJqEquipmentRegisterController extends BaseController { ...@@ -169,12 +169,12 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
List<DictionarieValueModel> dictionarieValueModels = idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList, businessScenarios, dataSource, type); List<DictionarieValueModel> dictionarieValueModels = idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList, businessScenarios, dataSource, type);
//bug 24467 新增历史设备--有移动式压力容器，需禁用或者删除 (历史设备录入(有证-his,无证-black)) //bug 24467 新增历史设备--有移动式压力容器，需禁用或者删除 (历史设备录入(有证-his,无证-black))
if ("his".equals(dataSource) && "2000".equals(equList) && ("SB_XZ".equals(type) || "DW_LR".equals(type)) && "0".equals(businessScenarios)) { if ("his".equals(dataSource) && "2000".equals(equList) && "SB_XZ".equals(type) && "0".equals(businessScenarios)) {
dictionarieValueModels = dictionarieValueModels.stream().filter(dictionarieValueModel -> !dictionarieValueModel.getDictDataValue().equals("移动式压力容器")).collect(Collectors.toList()); dictionarieValueModels = dictionarieValueModels.stream().filter(dictionarieValueModel -> !dictionarieValueModel.getDictDataValue().equals("移动式压力容器")).collect(Collectors.toList());
} }
// 历史无证设备录入(有证-his,无证-black)) // 历史无证设备录入(有证-his,无证-black))
if ( "black".equals(dataSource) && "2000".equals(equList) && ("SB_XZ".equals(type) || "DW_LR".equals(type)) && "0".equals(businessScenarios)) { if ( "black".equals(dataSource) && "2000".equals(equList) && "SB_XZ".equals(type) && "0".equals(businessScenarios)) {
dictionarieValueModels = dictionarieValueModels.stream().filter(dictionarieValueModel -> !dictionarieValueModel.getDictDataValue().equals("移动式压力容器")).collect(Collectors.toList()); dictionarieValueModels = dictionarieValueModels.stream().filter(dictionarieValueModel -> !dictionarieValueModel.getDictDataValue().equals("移动式压力容器") && !dictionarieValueModel.getDictDataValue().equals("气瓶")).collect(Collectors.toList());
} }
//如果是单位录入只显示气瓶 //如果是单位录入只显示气瓶
if(("2000".equals(equList) && "DW_LR".equals(type) && "0".equals(businessScenarios))){ if(("2000".equals(equList) && "DW_LR".equals(type) && "0".equals(businessScenarios))){
......
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