From a270e0a1425f6754aa65cbd93ea5ca7bd5748f46 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 24 Sep 2026 11:17:08 +0800 Subject: [PATCH] =?UTF-8?q?2026-09-24=20=E6=8A=80=E6=9C=AF=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=8D=A1=E7=9A=84=E3=80=90=E6=90=9C=E7=B4=A2=E3=80=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E2=80=9C=E5=A4=87=E6=B3=A8=E5=8C=BA=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QueryUserSettingController.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/main/java/com/spring/modules/sift/controller/QueryUserSettingController.java b/src/main/java/com/spring/modules/sift/controller/QueryUserSettingController.java index 24507ebe..694b7bfb 100644 --- a/src/main/java/com/spring/modules/sift/controller/QueryUserSettingController.java +++ b/src/main/java/com/spring/modules/sift/controller/QueryUserSettingController.java @@ -22,6 +22,10 @@ import java.util.List; public class QueryUserSettingController { private static final String ROHS_MENU_ID = "112001"; private static final String TOOL_APPLY_MENU_ID = "106002"; + private static final String TECHNICAL_SPEC_MENU_ID = "103002"; + private static final String TECHNICAL_SPEC_REMARK_PAGE_FIELD_NAME = "remarkPage"; + private static final String TECHNICAL_SPEC_REMARK_PAGE_FIELD_CAPTION = "备注区"; + private static final String TECHNICAL_SPEC_REMARK_PAGE_ORIGINAL_FIELD = "a.remarkPage"; private static final String ROHS_STATUS_FIELD_NAME = "rohsStatus"; private static final String ROHS_STATUS_FIELD_NAME_UNDERSCORE = "rohs_status"; private static final String ROHS_STATUS_FIELD_CAPTION = "状态/RoHS Status"; @@ -60,11 +64,13 @@ public class QueryUserSettingController { if (!queryUserSettingList.isEmpty()){ appendRohsStatusFieldForUserSetting(menuId, userId, queryUserSettingList); appendToolApplyFieldsForUserSetting(menuId, userId, queryUserSettingList); + appendTechnicalSpecRemarkPageFieldForUserSetting(menuId, userId, queryUserSettingList); return R.ok().put("rows",queryUserSettingList); } List defaultList = defaultService.searchQueryUserSettingDefault(menuId); appendRohsStatusFieldForDefaultSetting(menuId, defaultList); appendToolApplyFieldsForDefaultSetting(menuId, defaultList); + appendTechnicalSpecRemarkPageFieldForDefaultSetting(menuId, defaultList); return R.ok().put("rows",defaultList); } @@ -183,6 +189,24 @@ public class QueryUserSettingController { TOOL_APPLY_ALL_COST_FIELD_NAME, TOOL_APPLY_ALL_COST_FIELD_CAPTION, TOOL_APPLY_ALL_COST_ORIGINAL_FIELD, NUMBER_DATA_TYPE); } + private void appendTechnicalSpecRemarkPageFieldForUserSetting(String menuId, String userId, List settingList) { + if (!TECHNICAL_SPEC_MENU_ID.equals(menuId) || settingList == null) { + return; + } + appendToolApplyFieldForUserSetting(menuId, userId, settingList, + TECHNICAL_SPEC_REMARK_PAGE_FIELD_NAME, TECHNICAL_SPEC_REMARK_PAGE_FIELD_CAPTION, + TECHNICAL_SPEC_REMARK_PAGE_ORIGINAL_FIELD, STRING_DATA_TYPE); + } + + private void appendTechnicalSpecRemarkPageFieldForDefaultSetting(String menuId, List settingList) { + if (!TECHNICAL_SPEC_MENU_ID.equals(menuId) || settingList == null) { + return; + } + appendToolApplyFieldForDefaultSetting(menuId, settingList, + TECHNICAL_SPEC_REMARK_PAGE_FIELD_NAME, TECHNICAL_SPEC_REMARK_PAGE_FIELD_CAPTION, + TECHNICAL_SPEC_REMARK_PAGE_ORIGINAL_FIELD, STRING_DATA_TYPE); + } + private void appendToolApplyFieldForUserSetting(String menuId, String userId, List settingList, String fieldName, String fieldCaption, String originalField, String dataType) { if (containsUserSettingField(settingList, fieldName, originalField)) {