From 184ab4ca30a50a43b4626fea9ade52024380a3de Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 22 四月 2025 11:40:10 +0800
Subject: [PATCH] 维修工单维修报修
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 10 ++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java | 28 +++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java | 25 ++++++++++++
5 files changed, 58 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java
index 2378ea9..476bf60 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java
@@ -4,9 +4,13 @@
import javax.servlet.http.HttpServletRequest;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.request.EamRepairOrderQuery;
import org.jeecg.modules.eam.request.EamRepairOrderRequest;
@@ -16,6 +20,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
@@ -34,6 +39,12 @@
@Resource
private IEamRepairOrderService eamRepairOrderService;
+
+ @Resource
+ private ObjectMapper objectMapper;
+
+ @Resource
+ private TranslateDictTextUtils translateDictTextUtils;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -105,7 +116,22 @@
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
EamRepairOrderResponse eamRepairOrder = eamRepairOrderService.findById(id);
- return Result.OK(eamRepairOrder);
+ if (eamRepairOrder == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹紒");
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamRepairOrder);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("createBy", eamRepairOrder.getCreateBy(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("breakdownFlag", eamRepairOrder.getBreakdownFlag(), item, "breakdown_flag");
+ translateDictTextUtils.translateField("faultType", eamRepairOrder.getFaultType(), item, "fault_reason_category");
+ translateDictTextUtils.translateField("reportStatus", eamRepairOrder.getReportStatus(), item, "report_repair_status");
+ translateDictTextUtils.translateField("equipmentId", eamRepairOrder.getEquipmentId(), item, "eam_equipment,id,equipment_code");
+ translateDictTextUtils.translateField("repairStatus", eamRepairOrder.getRepairStatus(), item, "report_repair_status");
+ return Result.OK(item);
+ } catch (Exception e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
/**
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
index af0bc11..5d8857e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
@@ -5,6 +5,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -13,6 +15,7 @@
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.ReportRepairEnum;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
@@ -41,6 +44,12 @@
@Resource
private IEamReportRepairService eamReportRepairService;
+
+ @Resource
+ private ObjectMapper objectMapper;
+
+ @Resource
+ private TranslateDictTextUtils translateDictTextUtils;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -133,7 +142,21 @@
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
EamReportRepair eamReportRepair = eamReportRepairService.getById(id);
- return Result.OK(eamReportRepair);
+ if (eamReportRepair == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹紒");
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamReportRepair);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("createBy", eamReportRepair.getCreateBy(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("breakdownFlag", eamReportRepair.getBreakdownFlag(), item, "breakdown_flag");
+ translateDictTextUtils.translateField("faultType", eamReportRepair.getFaultType(), item, "fault_reason_category");
+ translateDictTextUtils.translateField("reportStatus", eamReportRepair.getReportStatus(), item, "report_repair_status");
+ translateDictTextUtils.translateField("equipmentId", eamReportRepair.getEquipmentId(), item, "eam_equipment,id,equipment_code");
+ return Result.OK(item);
+ } catch (Exception e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
/**
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml
index d76beae..b3b9667 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml
@@ -40,6 +40,6 @@
AND t1.repair_code LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.repairCode }),'%')
</if>
</where>
- ORDER BY t1.create_time
+ ORDER BY t1.create_time DESC
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java
index 1f01bbb..0ae9b1d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java
@@ -42,7 +42,7 @@
* 鏄惁闇�瑕侀鐢ㄥ浠� 1:鏄� 0:鍚�
*/
@ApiModelProperty(value = "鏄惁闇�瑕侀鐢ㄥ浠�")
- private Integer status;
+ private Integer isUseSpare;
/**
* 鏁呴殰鍘熷洜
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index f76aff8..e742d72 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -188,7 +188,7 @@
throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
}
- ReportRepairEnum status = ReportRepairEnum.getInstance(request.getRepairStatus());
+ ReportRepairEnum status = ReportRepairEnum.getInstance(eamRepairOrder.getRepairStatus());
if (status == null) {
return null;
}
@@ -197,7 +197,7 @@
switch (status) {
case UNDER_REPAIR:
//缁翠慨涓細涓嬩竴姝� 鍒ゆ柇鏄惁闇�瑕佸浠�, 闇�瑕佸浠惰浆璁惧绠＄悊鍛橀鐢ㄥ浠�, 涓嶉渶瑕佸垯杞埌璁惧鎶ヤ慨鍛樼‘璁ょ淮淇畬鎴�
- if (request.getStatus() == 1) {
+ if (request.getIsUseSpare() == 1) {
// 闇�瑕�
List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
if (CollectionUtil.isEmpty(userSelectors)) {
@@ -217,7 +217,7 @@
values.put("dataId", eamRepairOrder.getId());
values.put("organization", "缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
values.put("comment", "缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
- values.put("NextAssignee", eamReportRepair.getCreateBy());
+ values.put("NextAssignee", Arrays.asList(eamReportRepair.getCreateBy().split(",")));
values.put("status", 0);
request.setComment("缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_CONFIRM.name());
@@ -245,7 +245,7 @@
values.put("dataId", eamRepairOrder.getId());
values.put("organization", "缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
values.put("comment", "缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
- values.put("NextAssignee", eamRepairOrder.getRepairer());
+ values.put("NextAssignee", Arrays.asList(eamRepairOrder.getRepairer().split(",")));
values.put("status", 0);
request.setComment("缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
@@ -257,7 +257,7 @@
values.put("dataId", eamRepairOrder.getId());
values.put("organization", "缁翠慨宸ュ崟娴佺▼缁撴潫");
values.put("comment", "缁翠慨宸ュ崟娴佺▼缁撴潫");
- values.put("NextAssignee", eamReportRepair.getCreateBy());
+ values.put("NextAssignee", Arrays.asList(eamReportRepair.getCreateBy().split(",")));
values.put("status", 0);
request.setComment("缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
eamRepairOrder.setRepairStatus(ReportRepairEnum.COMPLETE.name());
--
Gitblit v1.9.3