Browse Source

增加颜色

master
han\hanst 2 months ago
parent
commit
2370c6abe5
  1. 1
      src/main/java/com/xujie/sys/modules/sift/data/AdvancedSearchSchemeCardData.java
  2. 5
      src/main/java/com/xujie/sys/modules/sift/entity/QuerySavedHeader.java
  3. 5
      src/main/java/com/xujie/sys/modules/sift/service/impl/QueryCenterServiceImpl.java
  4. 1
      src/main/java/com/xujie/sys/modules/sift/service/impl/QuerySavedHeaderServiceImpl.java
  5. 2
      src/main/resources/mapper/sift/QuerySavedHeaderDao.xml

1
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<String, Object> queryPayload;
}

5
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;
}

5
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());

1
src/main/java/com/xujie/sys/modules/sift/service/impl/QuerySavedHeaderServiceImpl.java

@ -119,6 +119,7 @@ public class QuerySavedHeaderServiceImpl extends ServiceImpl<QuerySavedHeaderMap
.eq(QuerySavedHeader::getUserId,querySavedVo.getUserId())
.eq(QuerySavedHeader::getItemNo,querySavedVo.getItemNo())
.set(QuerySavedHeader::getCaseSensitiveFlag,querySavedVo.getCaseSensitiveFlag())
.set(QuerySavedHeader::getSchemeColor,querySavedVo.getSchemeColor())
.update();
detailService.lambdaUpdate()
.eq(QuerySavedDetail::getMenuId,querySavedVo.getMenuId())

2
src/main/resources/mapper/sift/QuerySavedHeaderDao.xml

@ -8,6 +8,7 @@
<result column="item_no" property="itemNo"/>
<result column="item_desc" property="itemDesc"/>
<result column="case_sensitive_flag" property="caseSensitiveFlag"/>
<result column="scheme_color" property="schemeColor"/>
<collection property="querySavedDetailList" ofType="com.xujie.sys.modules.sift.entity.QuerySavedDetail">
<result column="menu_id" property="menuId"/>
<result column="user_id" property="userId"/>
@ -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,

Loading…
Cancel
Save