From 0a19d4923b0a048aee0cda91c37f25bc6e140d54 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 16 七月 2025 21:01:24 +0800
Subject: [PATCH] 修改接收字段
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java
index 2ce6030..12d18a1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java
@@ -2,14 +2,19 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.constant.ThirdMaintenanceStatusEnum;
@@ -21,6 +26,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.List;
@@ -41,6 +47,10 @@
private IEamThirdMaintenanceOrderService eamThirdMaintenanceOrderService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Resource
+ private ObjectMapper objectMapper;
+ @Resource
+ private TranslateDictTextUtils translateDictTextUtils;
/**
@@ -62,6 +72,18 @@
Page<EamThirdMaintenanceOrder> page = new Page<EamThirdMaintenanceOrder>(pageNo, pageSize);
IPage<EamThirdMaintenanceOrder> pageList = eamThirdMaintenanceOrderService.queryPageList(page, query);
return Result.OK(pageList);
+ }
+
+ /**
+ * 鏌ヨ涓変繚宸ュ崟鍩烘湰淇℃伅
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "鏌ヨ涓変繚宸ュ崟鍩烘湰淇℃伅", notes = "鏌ヨ涓変繚宸ュ崟鍩烘湰淇℃伅")
+ @GetMapping(value = "/selectVoById")
+ public Result<?> selectVoById(@RequestParam(name = "id") String id) {
+ return eamThirdMaintenanceOrderService.selectVoById(id);
}
/**
@@ -113,8 +135,29 @@
@ApiOperation(value = "璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ", notes = "璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
- EamThirdMaintenanceOrder order = eamThirdMaintenanceOrderService.getById(id);
- return Result.OK(order);
+ EamThirdMaintenanceOrder eamThirdMaintenanceOrder = eamThirdMaintenanceOrderService.getById(id);
+ if (eamThirdMaintenanceOrder == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamThirdMaintenanceOrder);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("createBy", eamThirdMaintenanceOrder.getCreateBy(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("standardId", eamThirdMaintenanceOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
+ translateDictTextUtils.translateField("repairman", eamThirdMaintenanceOrder.getRepairman(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("maintenanceStatus", eamThirdMaintenanceOrder.getMaintenanceStatus(), item, "third_maintenance_status");
+ translateDictTextUtils.translateField("creationMethod", eamThirdMaintenanceOrder.getCreationMethod(), item, "order_creation_method");
+ translateDictTextUtils.translateField("fullyFunctional", eamThirdMaintenanceOrder.getFullyFunctional(), item, "yn");
+ translateDictTextUtils.translateField("runningNormally", eamThirdMaintenanceOrder.getRunningNormally(), item, "yn");
+ translateDictTextUtils.translateField("inspector", eamThirdMaintenanceOrder.getInspector(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("operatorSignature", eamThirdMaintenanceOrder.getOperatorSignature(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("repairmanSignature", eamThirdMaintenanceOrder.getRepairmanSignature(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("repairManagerSignature", eamThirdMaintenanceOrder.getRepairManagerSignature(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("inspectorSignature", eamThirdMaintenanceOrder.getInspectorSignature(), item, "sys_user,realname,username");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
/**
--
Gitblit v1.9.3