From efd6a955d5fa558f9bd04005cf83118279cc10a1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 22 七月 2025 09:37:07 +0800
Subject: [PATCH] art: 设备台账-设备选择接口
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 11 +++++++----
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java | 2 +-
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/vo/EquipmentSearchResult.java | 9 +++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 18 +++++++++++++++---
4 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
index c58b04a..5c28bbc 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
@@ -57,7 +57,7 @@
* @param pageSize
* @return
*/
- List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id);
+ List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id, String factoryOrgCode);
/**
* 鏌ヨ璁惧淇℃伅
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index c994336..8ce714f 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -235,7 +235,7 @@
}
@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) {
@@ -269,10 +269,13 @@
}
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<>();
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/vo/EquipmentSearchResult.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/vo/EquipmentSearchResult.java
index 0a27828..46129b9 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/vo/EquipmentSearchResult.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/vo/EquipmentSearchResult.java
@@ -16,11 +16,20 @@
*/
private String text;
+ private String equipmentModel;
+ private String equipmentCode;
+ private String equipmentName;
+ private String factoryOrgCode;
+
public EquipmentSearchResult() {
}
public EquipmentSearchResult(EamEquipment eamEquipment) {
this.value = eamEquipment.getId();
this.text = eamEquipment.getEquipmentCode() + "[" + eamEquipment.getEquipmentName() + "]";
+ this.equipmentModel = eamEquipment.getEquipmentModel();
+ this.equipmentCode = eamEquipment.getEquipmentCode();
+ this.equipmentName = eamEquipment.getEquipmentName();
+ this.factoryOrgCode = eamEquipment.getFactoryOrgCode();
}
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index f6ee810..c9b3516 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -384,9 +384,21 @@
@GetMapping(value = "/asyncLoadEquipment")
public Result<?> asyncLoadEquipment(@RequestParam(name="keyword",required = false) String keyword,
@RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize,
- @RequestParam(name="id",required = false) String id) {
- List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipment(keyword, pageSize, id);
- return Result.ok(resultList);
+ @RequestParam(name="id",required = false) String id,
+ @RequestParam(name="factoryOrgCode",required = false) String factoryOrgCode) {
+ List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipment(keyword, pageSize, id, factoryOrgCode);
+ List<JSONObject> items = new ArrayList<>();
+ try {
+ for(EquipmentSearchResult vo : resultList) {
+ String json = objectMapper.writeValueAsString(vo);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("factoryOrgCode", vo.getFactoryOrgCode(), item, "eam_base_factory,factory_name,org_code");
+ items.add(item);
+ }
+ return Result.OK(items);
+ }catch (Exception e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
}
--
Gitblit v1.9.3