From 63c9ec27a1f717cff8b36ad7db23d56e41dfae8f Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 22 七月 2025 20:01:56 +0800
Subject: [PATCH] art: 技术状态鉴定申请-Bug修改

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java
index f402727..9b4ecd9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java
@@ -1,14 +1,19 @@
 package org.jeecg.modules.eam.controller;
 
 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.TechnicalStatusEvaluationApplicationStatusEnum;
 import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication;
 import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationQuery;
@@ -32,7 +37,10 @@
 public class EamTechnicalStatusEvaluationApplicationController extends JeecgController<EamTechnicalStatusEvaluationApplication, IEamTechnicalStatusEvaluationApplicationService> {
     @Autowired
     private IEamTechnicalStatusEvaluationApplicationService eamTechnicalStatusEvaluationApplicationService;
-
+    @Autowired
+    private ObjectMapper objectMapper;
+    @Autowired
+    private TranslateDictTextUtils translateDictTextUtils;
     /**
      * 鍒嗛〉鍒楄〃鏌ヨ
      *
@@ -149,7 +157,18 @@
     @GetMapping(value = "/queryById")
     public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
         EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication = eamTechnicalStatusEvaluationApplicationService.getById(id);
-        return Result.OK(eamTechnicalStatusEvaluationApplication);
+        if (eamTechnicalStatusEvaluationApplication == null) {
+            return Result.error("鏈壘鍒板搴旀暟鎹�");
+        }
+        try {
+            String json = objectMapper.writeValueAsString(eamTechnicalStatusEvaluationApplication);
+            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+            translateDictTextUtils.translateField("applicant", eamTechnicalStatusEvaluationApplication.getApplicant(), item, "sys_user,realname,username");
+            translateDictTextUtils.translateField("factoryOrgCode", eamTechnicalStatusEvaluationApplication.getFactoryOrgCode(), item, "eam_base_factory,factory_name,org_code");
+            return Result.OK(item);
+        } catch (JsonProcessingException e) {
+            return Result.error("鏁版嵁杞瘧澶辫触锛�");
+        }
     }
 
 }

--
Gitblit v1.9.3