From f50e1f8f20d98a255044d938a7e98bfc0b18d1b0 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期五, 27 十二月 2024 16:51:46 +0800
Subject: [PATCH] 业务功能模块 管理功能模块更改菜单唯一标识以及样式 操作类型管理添加按钮图标功能 系统运行监控修改为当前在线人员信息图标
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/wrapper/VciQueryWrapperForDO.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/wrapper/VciQueryWrapperForDO.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/wrapper/VciQueryWrapperForDO.java
index 2d2ce8e..af95a71 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/wrapper/VciQueryWrapperForDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/wrapper/VciQueryWrapperForDO.java
@@ -54,7 +54,6 @@
*/
public static final String USER_TABLE_COMPATIBILITY_FIELD_SEP = "${vcicomplibitysep}";
-
/**
* 鏌ヨ鏉′欢
*/
@@ -111,7 +110,7 @@
private PageHelper pageHelper;
/**
- * 鎵�鏈夌殑瀛楁鍚嶇О,key鏄璞″睘鎬т腑鐨勫瓧娈碉紝value鏄暟鎹簱閲岀殑瀛楁
+ * 鎵�鏈夌殑瀛楁鍚嶇О,key鏄暟鎹簱閲岀殑瀛楁锛寁alue鏄璞″睘鎬т腑鐨勫瓧娈�
*/
private Map<String,String> allFieldNameMap;
@@ -173,6 +172,39 @@
put("firstr","isfirstr");
put("lastv","islastv");
put("firstv","isfirstv");
+ }};
+
+ /**
+ * BaseModel鍜孊usinessObject涓殑灞炴�ф槧灏勩��
+ * key锛氫负BaseModel涓殑灞炴�э紝value锛氫负BusinessObject涓殑灞炴��
+ */
+ public static final Map<String, String> BASEMODEL_CBO_FIELD_MAP = new HashMap(){{
+ put("oid", "oid");
+ put("revisionoid","revoid");
+ put("nameoid","nameoid");
+ put("btmname","btname");
+ put("lastr","islastr");
+ put("firstr","isfirstr");
+ put("lastv","islastv");
+ put("firstv","isfirstv");
+ put("creator","creator");
+ put("createtime","createtime");
+ put("lastmodifier","modifier");
+ put("lastmodifytime","modifytime");
+ put("revisionrule","revisionrule");
+ put("versionrule","versionrule");
+ put("revisionseq","revisionseq");
+ put("revisionvalue","revisionvalue");
+ put("versionseq","versionseq");
+ put("versionvalue","versionvalue");
+ put("lctid","lctid");
+ put("lcstatus","lcstatus");
+ put("ts","ts");
+ put("id","id");
+ put("name","name");
+ put("description","description");
+ put("owner","owner");
+ put("copyfromversion","fromversion");
}};
/**
@@ -1428,9 +1460,10 @@
public Map<String,String> switchConditionMap(){
Map<String,String> queryMap = new HashMap<>();
if(!CollectionUtils.isEmpty(this.conditionMap)){
- this.conditionMap.forEach((key,value)->{
+ //TODO: 杞崲鍓嶇殑瀛楁鍜岃浆鎹㈠悗鐨勫瓧娈典笉搴旇鍚屾椂瀛樺湪锛屽簲璇ラ兘缁熶竴浣跨敤杞崲鍚庣殑瀛楁鍋氭煡璇㈡潯浠�
+ /*this.conditionMap.forEach((key,value)->{
queryMap.put(key,value);
- });
+ });*/
//鎴戜滑杞崲涓�涓嬶紝鐩存帴set锛屽鏋滆繕鏈夐噸澶嶇殑灏卞彧鑳借嚜琛岃В鍐�
this.allFieldNameMap.forEach((dbField,field)->{
if(conditionMap.containsKey(field)){
@@ -1452,7 +1485,6 @@
public void setLinkTableSql(String linkTableSql) {
this.linkTableSql = linkTableSql;
}
-
/**
--
Gitblit v1.9.3