| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id) { |
|---|
| | | public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id, String factoryOrgCode) { |
|---|
| | | if (StringUtils.isNotBlank(id)) { |
|---|
| | | EamEquipment eamEquipment = eamEquipmentMapper.selectById(id); |
|---|
| | | if (eamEquipment != null) { |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(keyword)) { |
|---|
| | | queryWrapper.like("equipment_code", keyword); |
|---|
| | | queryWrapper.or().like("equipment_name", keyword); |
|---|
| | | queryWrapper.like("e.equipment_code", keyword); |
|---|
| | | queryWrapper.or().like("e.equipment_name", keyword); |
|---|
| | | } |
|---|
| | | queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0); |
|---|
| | | if(StringUtils.isNotBlank(factoryOrgCode)){ |
|---|
| | | queryWrapper.eq("e.factory_org_code", factoryOrgCode); |
|---|
| | | } |
|---|
| | | queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0); |
|---|
| | | IPage<EamEquipment> pageResult = eamEquipmentMapper.queryPageList(page, queryWrapper); |
|---|
| | | if (pageResult != null && CollectionUtil.isNotEmpty(pageResult.getRecords())) { |
|---|
| | | List<EquipmentSearchResult> resultList = new ArrayList<>(); |
|---|
