diff --git a/src/main/java/com/xujie/sys/modules/sift/data/AdvancedSearchSchemeCardData.java b/src/main/java/com/xujie/sys/modules/sift/data/AdvancedSearchSchemeCardData.java index e013247..429e066 100644 --- a/src/main/java/com/xujie/sys/modules/sift/data/AdvancedSearchSchemeCardData.java +++ b/src/main/java/com/xujie/sys/modules/sift/data/AdvancedSearchSchemeCardData.java @@ -15,6 +15,7 @@ public class AdvancedSearchSchemeCardData implements Serializable { private String routePath; private String routeName; private String savedSearchId; + private String schemeColor; private Boolean supported; private Map queryPayload; } diff --git a/src/main/java/com/xujie/sys/modules/sift/entity/QuerySavedHeader.java b/src/main/java/com/xujie/sys/modules/sift/entity/QuerySavedHeader.java index f07eace..e2f45b5 100644 --- a/src/main/java/com/xujie/sys/modules/sift/entity/QuerySavedHeader.java +++ b/src/main/java/com/xujie/sys/modules/sift/entity/QuerySavedHeader.java @@ -45,6 +45,11 @@ public class QuerySavedHeader implements Serializable { * 是否区分大小写 */ private String caseSensitiveFlag; + /** + * 方案颜色,HEX格式(如 #409EFF) + */ + @TableField("scheme_color") + private String schemeColor; } diff --git a/src/main/java/com/xujie/sys/modules/sift/service/impl/QueryCenterServiceImpl.java b/src/main/java/com/xujie/sys/modules/sift/service/impl/QueryCenterServiceImpl.java index b5144ff..2e5504b 100644 --- a/src/main/java/com/xujie/sys/modules/sift/service/impl/QueryCenterServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/sift/service/impl/QueryCenterServiceImpl.java @@ -121,6 +121,7 @@ public class QueryCenterServiceImpl implements QueryCenterService { querySavedVo.getItemNo(), querySavedVo.getItemDesc(), item.getSavedSearchId(), + querySavedVo.getSchemeColor(), menuMap.get(querySavedVo.getMenuId()), adapterOptional.isPresent() ); @@ -294,6 +295,7 @@ public class QueryCenterServiceImpl implements QueryCenterService { header.getItemNo(), header.getItemDesc(), String.valueOf(header.getItemNo()), + header.getSchemeColor(), sysMenuDao.selectById(header.getMenuId()), queryModuleAdapterRegistry.findAdapter(header.getMenuId()).isPresent() ); @@ -313,6 +315,7 @@ public class QueryCenterServiceImpl implements QueryCenterService { header.getItemNo(), header.getItemDesc(), String.valueOf(header.getItemNo()), + header.getSchemeColor(), menuMap.get(header.getMenuId()), adapterOptional.isPresent() ); @@ -323,6 +326,7 @@ public class QueryCenterServiceImpl implements QueryCenterService { Integer itemNo, String itemDesc, String savedSearchId, + String schemeColor, SysMenuEntity menu, boolean adapterSupported ) { @@ -331,6 +335,7 @@ public class QueryCenterServiceImpl implements QueryCenterService { data.setItemNo(itemNo); data.setItemDesc(itemDesc); data.setSavedSearchId(savedSearchId); + data.setSchemeColor(schemeColor); data.setCount(null); if (menu != null) { data.setMenuName(menu.getName()); diff --git a/src/main/java/com/xujie/sys/modules/sift/service/impl/QuerySavedHeaderServiceImpl.java b/src/main/java/com/xujie/sys/modules/sift/service/impl/QuerySavedHeaderServiceImpl.java index 17fe9d6..25e276f 100644 --- a/src/main/java/com/xujie/sys/modules/sift/service/impl/QuerySavedHeaderServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/sift/service/impl/QuerySavedHeaderServiceImpl.java @@ -119,6 +119,7 @@ public class QuerySavedHeaderServiceImpl extends ServiceImpl + @@ -35,6 +36,7 @@ sd.item_no, sd.item_desc, sd.case_sensitive_flag, + sd.scheme_color, qsd.menu_id, qsd.user_id, qsd.DTS_name,