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)) {