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/controller/EamReportRepairController.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
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 f09ad51..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;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -71,19 +80,10 @@
@ApiOperation(value = "鏁呴殰鎶ヤ慨-娣诲姞", notes = "鏁呴殰鎶ヤ慨-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody EamReportRepair eamReportRepair) {
- eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
- eamReportRepair.setDelFlag(CommonConstant.DEL_FLAG_0);
- if (eamReportRepair.getImageFilesResult() != null) {
- List<FileUploadResult> imageFilesResult = eamReportRepair.getImageFilesResult();
- ObjectMapper mapper = new ObjectMapper();
- try {
- String referenceFile = mapper.writeValueAsString(imageFilesResult);
- eamReportRepair.setImageFiles(referenceFile);
- } catch (JsonProcessingException e) {
- return Result.OK("娣诲姞澶辫触锛�");
- }
+ EamReportRepair b = eamReportRepairService.add(eamReportRepair);
+ if(b == null) {
+ return Result.error("娣诲姞澶辫触锛�");
}
- eamReportRepairService.save(eamReportRepair);
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -142,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("鏁版嵁杞瘧澶辫触锛�");
+ }
}
/**
--
Gitblit v1.9.3