From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 16 一月 2025 16:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/WebBoServiceI.java | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/WebBoServiceI.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/WebBoServiceI.java
index a1f9f49..ad64908 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/WebBoServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/WebBoServiceI.java
@@ -67,7 +67,7 @@
* @param btmType 涓氬姟绫诲瀷
* @param conditionMap 鏌ヨ鏉′欢
* @param ph 鍒嗛〉鍜屾帓搴�
- * @param clauseList 鏌ヨ瀛楁锛屽弬鐓у瓧娈典娇鐢▁xxx.yy;鏋氫妇瀛楁浣跨敤xxx_enumCode;鐢熷懡鍛ㄦ湡浼氳嚜鍔ㄥ鐞嗕负lcStatus_text
+ * @param clauseList 鏌ヨ瀛楁锛屽弬鐓у瓧娈典娇鐢╢ield.yy;鏋氫妇瀛楁浣跨敤enumCode_field;鐢熷懡鍛ㄦ湡浼氳嚜鍔ㄥ鐞嗕负lcStatus_text銆傛牴鎹瓧娈垫槧灏凪ap鐨刱ey鑰屾潵銆�
* @return
* @throws VciBaseException
*/
@@ -137,8 +137,9 @@
* @return
* @throws VciBaseException
*/
- List<BusinessObject> queryCBOByScheme(String queryScheme, Map<String, String> conditionMap, Map<String, Object> replaceMap, PageHelper ph, List<String> clauseList) throws VciBaseException;
-
+ List<BusinessObject> queryCBOByScheme(String queryScheme, Map<String, String> conditionMap, Map<String, Object> replaceMap,
+ PageHelper ph, List<String> clauseList) throws VciBaseException;
+
/**
* 鏌ヨ鏁伴噺
* @param btmType 涓氬姟绫诲瀷鍚嶇О
@@ -196,7 +197,7 @@
/**
* 鍙敤sql璇彞鏌ヨ锛岃繖涓拰queryBySqlForMap鍖哄埆鏄紝鐗规畩鐨剆ql(濡傚寘鍚湁鍑芥暟鐨�)鍙互鐢ㄨ繖涓柟娉曪紝浣嗘槸鏈塻ql娉ㄥ叆椋庨櫓
* @param sql sql璇彞锛屾煡璇㈡潯浠跺繀椤昏嚜琛屽湪鍏朵腑澶勭悊瀹屾垚
- * @return 鏁版嵁鏄犲皠
+ * @return 鏁版嵁鏄犲皠銆侻ap涓紝key鍊间负澶у啓銆�
* @throws VciBaseException 鏌ヨ鍑洪敊娲绘姏鍑哄紓甯�
*/
List<Map> queryByOnlySqlForMap(String sql) throws VciBaseException;
@@ -212,7 +213,7 @@
<T> List<T> queryByOnlySqlForObj(String sql, Class<T> tClass) throws VciBaseException;
/**
- * 鏍规嵁sql璇彞鏉ユ煡璇㈠唴瀹癸紝杩斿洖Map
+ * 鏍规嵁sql璇彞鏉ユ煡璇㈠唴瀹癸紝杩斿洖Map銆俿ql涓嶈兘鏄痵elect * 鎴栬�� select t.*
* @param sql 涓轰簡闃叉SQL娉ㄥ叆锛屽�煎繀椤诲湪sql璇彞閲屼互:xxx鏍煎紡锛屽 id =:idvalue锛岀劧鍚庡湪conditionMap涓坊鍔犲缓涓篿dvalue鐨勬牸寮�
* @param conditionMap 鏌ヨ鏉′欢锛屽繀椤讳笌sql閲屽搴�
* @return map鏁版嵁
@@ -220,7 +221,7 @@
*/
List<Map> queryBySqlForMap(String sql, Map<String, String> conditionMap) throws VciBaseException;
/**
- * 鏍规嵁sql璇彞鏉ユ煡璇㈠唴瀹癸紝杩斿洖Map
+ * 鏍规嵁sql璇彞鏉ユ煡璇㈠唴瀹癸紝杩斿洖Map銆俿ql涓嶈兘鏄痵elect * 鎴栬�� select t.*
* @param sql 涓轰簡闃叉SQL娉ㄥ叆锛屽�煎繀椤诲湪sql璇彞閲屼互:xxx鏍煎紡锛屽 id =:idvalue锛岀劧鍚庡湪conditionMap涓坊鍔犲缓涓篿dvalue鐨勬牸寮�
* @param conditionMap 鏌ヨ鏉′欢锛屽繀椤讳笌sql閲屽搴�
* @param selectKeys 鏌ヨ鐨勫瓧娈�
@@ -288,7 +289,6 @@
*/
<T> BatchCBO batchAddSave(List<T> list) throws VciBaseException;
-
/**
* 淇敼鏁版嵁锛屽彲浠ュ湪request閲岃缃笉鎸佷箙鍖�
* @param obj 淇敼鏁版嵁瀵硅薄
@@ -305,6 +305,14 @@
*/
<T> BatchCBO batchEditSave(List<T> list) throws VciBaseException;
+ /**
+ * 鍒犻櫎鏁版嵁锛屽彲浠ュ湪request閲岃缃笉鎸佷箙鍖�
+ * @param obj 鍒犻櫎鏁版嵁瀵硅薄
+ * @param checkRefered 鏄惁鍒犻櫎寮曠敤鐨勬暟鎹�
+ * @return 闇�瑕佸垱寤虹殑CBO,CLO;闇�瑕佷慨鏀圭殑CBO,CLO;闇�瑕佸垹闄ょ殑CBO,CLO
+ * @throws VciBaseException
+ */
+ <T> BatchCBO delete(T obj,boolean checkRefered) throws VciBaseException;
/**
* 鍒犻櫎鏁版嵁锛屽彲浠ュ湪request閲岃缃笉鎸佷箙鍖�
@@ -312,8 +320,16 @@
* @return 闇�瑕佸垱寤虹殑CBO,CLO;闇�瑕佷慨鏀圭殑CBO,CLO;闇�瑕佸垹闄ょ殑CBO,CLO
* @throws VciBaseException
*/
- <T> BatchCBO delete(T obj,boolean checkRefered) throws VciBaseException;
<T> BatchCBO delete(T obj) throws VciBaseException;
+
+ /**
+ * 鎵归噺鍒犻櫎鏁版嵁锛屽彲浠ュ湪request閲岃缃笉鎸佷箙鍖�
+ * @param list 闇�瑕佸垹闄ゆ暟鎹璞″垪琛�
+ * @param checkRefered 鏄惁鍒犻櫎寮曠敤鐨勬暟鎹�
+ * @return 闇�瑕佸垱寤虹殑CBO,CLO;闇�瑕佷慨鏀圭殑CBO,CLO;闇�瑕佸垹闄ょ殑CBO,CLO,checkRefered:[false/true]鏄惁妫�鏌ヨ寮曠敤锛岄粯璁や笉妫�鏌�
+ * @throws VciBaseException
+ */
+ <T> BatchCBO batchDelete(List<T> list,boolean checkRefered) throws VciBaseException;
/**
* 鎵归噺鍒犻櫎鏁版嵁锛屽彲浠ュ湪request閲岃缃笉鎸佷箙鍖�
@@ -321,12 +337,8 @@
* @return 闇�瑕佸垱寤虹殑CBO,CLO;闇�瑕佷慨鏀圭殑CBO,CLO;闇�瑕佸垹闄ょ殑CBO,CLO,checkRefered:[false/true]鏄惁妫�鏌ヨ寮曠敤锛岄粯璁や笉妫�鏌�
* @throws VciBaseException
*/
- <T> BatchCBO batchDelete(List<T> list,boolean checkRefered) throws VciBaseException;
-
<T> BatchCBO batchDelete(List<T> list) throws VciBaseException;
-
-
/**
* 鏍规嵁鏌ヨ鏉′欢鏉ュ垹闄ゆ暟鎹�
* @param c 鍒犻櫎鏁版嵁瀵硅薄鎵�灞炵被
@@ -420,7 +432,8 @@
* @return 鍒楄〃鏁版嵁锛屾暟鎹槸Map褰㈠紡鐨勶紝鍖呭惈鍒嗛〉淇℃伅
* @throws VciBaseException
*/
- DataGrid queryGridByScheme(String queryScheme, Map<String, String> conditionMap, Map<String, Object> replaceMap, PageHelper ph) throws VciBaseException;
+ DataGrid queryGridByScheme(String queryScheme, Map<String, String> conditionMap, Map<String, Object> replaceMap,
+ PageHelper ph) throws VciBaseException;
/**
* 鏍规嵁鏌ヨ鏂规鏉ユ煡璇㈠垪琛ㄦ暟鎹紝鍙互鑷畾涔夋煡璇㈢殑鍒楋紝鍖呮嫭鍙傜収鍜屾灇涓�
@@ -432,8 +445,9 @@
* @return 鍒楄〃鏁版嵁锛屾暟鎹槸Map褰㈠紡鐨勶紝鍖呭惈鍒嗛〉淇℃伅
* @throws VciBaseException
*/
- DataGrid queryGridByScheme(String queryScheme, Map<String, String> conditionMap, Map<String, Object> replaceMap, PageHelper ph, List<String> clauseList) throws VciBaseException;
-
+ DataGrid queryGridByScheme(String queryScheme, Map<String, String> conditionMap, Map<String, Object> replaceMap,
+ PageHelper ph, List<String> clauseList) throws VciBaseException;
+
/**
* 鏌ヨ瀵硅薄鐨勫垪琛ㄦ暟鎹�
* @param c 鏌ヨ瀵硅薄鎵�灞炵被
@@ -625,6 +639,8 @@
|| "lastmodifytime".equalsIgnoreCase(attrName)
|| "createtime".equalsIgnoreCase(attrName)
|| "checkintime".equalsIgnoreCase(attrName)
- ||"checkouttime".equalsIgnoreCase(attrName));
+ ||"checkouttime".equalsIgnoreCase(attrName)
+ || "modifier".equalsIgnoreCase(attrName)
+ || "modifytime".equalsIgnoreCase(attrName));
}
}
--
Gitblit v1.9.3