From f74869616f24e83ec92573302e99a21c35202b81 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 15 Jul 2026 10:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/ChooselistController.java | 31 ++++++++++++++++++-
 .../modules/base/entity/Chooselist.java       | 24 ++++++++++++++
 .../views/modules/common/Chooselist_eam.vue   | 26 +++++++++++++---
 3 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/cclqms-java/src/main/java/com/gaotao/modules/base/controller/ChooselistController.java b/cclqms-java/src/main/java/com/gaotao/modules/base/controller/ChooselistController.java
index 9280e37..12cebd4 100644
--- a/cclqms-java/src/main/java/com/gaotao/modules/base/controller/ChooselistController.java
+++ b/cclqms-java/src/main/java/com/gaotao/modules/base/controller/ChooselistController.java
@@ -3,6 +3,7 @@ package com.gaotao.modules.base.controller;
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.base.entity.Chooselist;
 import com.gaotao.modules.base.service.ChooselistService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -34,8 +35,10 @@ public class ChooselistController {
      * @return
      **/
     @GetMapping("getChooselist/{tagNo}")
-    public R getChooselist(@PathVariable("tagNo") String tagNo) {
+    public R getChooselist(@PathVariable("tagNo") String tagNo,
+                           @RequestHeader(value = "Accept-Language", required = false) String acceptLanguage) {
         Chooselist chooselist = chooselistService.getChooselist(tagNo);
+        applyLocaleValue(chooselist, acceptLanguage);
         return R.ok().put("data", chooselist);
     }
 
@@ -72,4 +75,30 @@ public class ChooselistController {
         }
     }
 
+    private void applyLocaleValue(Chooselist chooselist, String acceptLanguage) {
+        if (chooselist == null || !isEnglishLanguage(acceptLanguage)) {
+            return;
+        }
+        chooselist.setDescription(localizedValue(chooselist.getDescriptionEn(), chooselist.getDescription()));
+        chooselist.setCaption1(localizedValue(chooselist.getCaption1En(), chooselist.getCaption1()));
+        chooselist.setCaption2(localizedValue(chooselist.getCaption2En(), chooselist.getCaption2()));
+        chooselist.setCaption3(localizedValue(chooselist.getCaption3En(), chooselist.getCaption3()));
+        chooselist.setCaption4(localizedValue(chooselist.getCaption4En(), chooselist.getCaption4()));
+        chooselist.setCaption5(localizedValue(chooselist.getCaption5En(), chooselist.getCaption5()));
+        chooselist.setCaption6(localizedValue(chooselist.getCaption6En(), chooselist.getCaption6()));
+        chooselist.setCaption7(localizedValue(chooselist.getCaption7En(), chooselist.getCaption7()));
+    }
+
+    private String localizedValue(String languageValue, String defaultValue) {
+        return StringUtils.isBlank(languageValue) ? defaultValue : languageValue;
+    }
+
+    private boolean isEnglishLanguage(String acceptLanguage) {
+        if (StringUtils.isBlank(acceptLanguage)) {
+            return false;
+        }
+        String normalized = acceptLanguage.trim().toLowerCase();
+        return normalized.startsWith("en");
+    }
+
 }
diff --git a/cclqms-java/src/main/java/com/gaotao/modules/base/entity/Chooselist.java b/cclqms-java/src/main/java/com/gaotao/modules/base/entity/Chooselist.java
index 722ad82..8358609 100644
--- a/cclqms-java/src/main/java/com/gaotao/modules/base/entity/Chooselist.java
+++ b/cclqms-java/src/main/java/com/gaotao/modules/base/entity/Chooselist.java
@@ -11,22 +11,46 @@ public class Chooselist implements Serializable {
 
     private String description;
 
+    @TableField("DescriptionEn")
+    private String descriptionEn;
+
     private String sqlcode;
 
     private String caption1;
 
+    @TableField("Caption1En")
+    private String caption1En;
+
     private String caption2;
 
+    @TableField("Caption2En")
+    private String caption2En;
+
     private String caption3;
 
+    @TableField("Caption3En")
+    private String caption3En;
+
     private String caption4;
 
+    @TableField("Caption4En")
+    private String caption4En;
+
     private String caption5;
 
+    @TableField("Caption5En")
+    private String caption5En;
+
     private String caption6;
 
+    @TableField("Caption6En")
+    private String caption6En;
+
     private String caption7;
 
+    @TableField("Caption7En")
+    private String caption7En;
+
     private String fieldname1;
 
     private String fieldname2;
diff --git a/cclqms-vue/src/views/modules/common/Chooselist_eam.vue b/cclqms-vue/src/views/modules/common/Chooselist_eam.vue
index 9a765fa..3950813 100644
--- a/cclqms-vue/src/views/modules/common/Chooselist_eam.vue
+++ b/cclqms-vue/src/views/modules/common/Chooselist_eam.vue
@@ -30,9 +30,9 @@
         <el-col :span="6" >
       <el-form-item :label="baseListData.caption6" v-if="baseListData.caption6 != '' && baseListData.caption6 != null ">
         <el-select v-model="param6" style="width: 120px">
-          <el-option label="全部" value=""></el-option>
-          <el-option label="在用" value="Y"></el-option>
-          <el-option label="不在用" value="N"></el-option>
+          <el-option :label="getStatusOptionLabel('')" value=""></el-option>
+          <el-option :label="getStatusOptionLabel('Y')" value="Y"></el-option>
+          <el-option :label="getStatusOptionLabel('N')" value="N"></el-option>
         </el-select>
       </el-form-item>
         </el-col>
@@ -42,7 +42,7 @@
       </el-form-item>
         </el-col>
         <el-col :span="6" >
-      <el-button style="margin-top: 18px" type="primary" @click="getDataList(false)">查询
+      <el-button style="margin-top: 18px" type="primary" @click="getDataList(false)">{{ $t('sys.common.search') }}
       </el-button>
         </el-col>
 
@@ -73,7 +73,7 @@
     </el-table>
 
     <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false" type="primary">关闭</el-button>
+      <el-button @click="visible = false" type="primary">{{ $t('sys.common.close') }}</el-button>
     </span>
   </el-dialog>
 
@@ -130,6 +130,22 @@ export default {
     }
   },
   methods: {
+    isEnglishLocale () {
+      return (this.$i18n && this.$i18n.locale ? this.$i18n.locale : 'cn').toLowerCase() === 'en'
+    },
+    getStatusOptionLabel (status) {
+      const zhMap = {
+        '': '全部',
+        'Y': '在用',
+        'N': '不在用'
+      }
+      const enMap = {
+        '': 'All',
+        'Y': 'Active',
+        'N': 'Inactive'
+      }
+      return this.isEnglishLocale() ? enMap[status] : zhMap[status]
+    },
 
     // 获取 用户的配置
     init (tagNo, param, conSql) {