From fdaad68c0715d6f7858b956071e3b01cd543a5cd Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 19 六月 2023 20:32:18 +0800
Subject: [PATCH] 高级查询组件增加refer类型条件框

---
 Source/UBCS-WEB/src/components/refer/vciWebRefer.vue                                                      |    1 
 Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml                                     |    8 ++--
 Source/UBCS-WEB/src/components/Crud/Crud.vue                                                              |    3 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java |   24 +++++++++---
 Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue                                           |   63 ++++++++++++++++++++++---------
 5 files changed, 69 insertions(+), 30 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Crud/Crud.vue b/Source/UBCS-WEB/src/components/Crud/Crud.vue
index 53cd177..f76a5d2 100644
--- a/Source/UBCS-WEB/src/components/Crud/Crud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/Crud.vue
@@ -420,7 +420,8 @@
     },
     //楂樼骇鏌ヨ鎸夐挳
     findHandler(){
-      this.findvisible=true
+      this.findvisible=true;
+      console.log(this.options)
     },
     // 楂樼骇鏌ヨ
     echoContion(val) {
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index 28c5d8a..733f77b 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -10,8 +10,7 @@
         width="55vw"
         style="height: 115vh; margin-top: -10vh; overflow: hidden"
         :visible.sync="isShowDialog"
-        @close="recoverPage"
-        destroy-on-close>
+        @close="recoverPage">
         <div class="search-total">
             <!-- 澶撮儴鎸夐挳鍖哄煙 -->
             <div slot="title" class="dialog-search-button"> 
@@ -52,8 +51,7 @@
                         <div class="grid-content">
                             <el-select placeholder="璇烽�夋嫨" v-model="searchFormArrays[index].condition">
                                 <el-option
-                                    v-for="condition in item.fieldType==='text' || item.fieldType==='combox' ? 
-                                    item.fieldType==='text' ? searchConditions:switchSearchConditions:dateConditions"
+                                    v-for="condition in item.conditions"
                                     :key="condition.value"
                                     :label="condition.label"
                                     :value="condition.value">
@@ -63,8 +61,8 @@
                     </el-col>
                     <el-col :span="12">
                         <div class="grid-content">
-                            <el-input v-if="item.fieldType==='text' || item.fieldType===''" v-model="searchFormArrays[index].fieldValue" type="text" placeholder="璇疯緭鍏�" :display="item.display"></el-input>
-                            <el-select v-else-if="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="璇烽�夋嫨" :display="item.display">
+                            <el-input v-if="item.fieldType==='text' || item.fieldType===''" v-model="searchFormArrays[index].fieldValue" type="text" placeholder="璇疯緭鍏�"></el-input>
+                            <el-select v-else-if="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="璇烽�夋嫨">
                                 <el-option
                                     v-for="option in item.data"
                                     :key="option.itemValue"
@@ -72,8 +70,8 @@
                                     :value="option.itemValue">
                                 </el-option>
                             </el-select>
-                            <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue" :display="item.display"></el-switch>
-                            <el-date-picker v-else-if="item.fieldType==='datetime'" :display="item.display"
+                            <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
+                            <el-date-picker v-else-if="item.fieldType==='datetime'"
                                 v-model="searchFormArrays[index].fieldValue"
                                 type="date"
                                 placeholder="閫夋嫨鏃ユ湡">
@@ -82,8 +80,8 @@
                                 v-else-if="item.fieldType==='refer'"
                                 :referConfig="item.referConfigData || {}"
                                 :value="searchFormArrays[index].fieldValue"
-                                :disabled="item.referConfig.showField"
-                                :display="item.display"
+                                :text="item.showField"
+                                :display="!item.hidden"
                                 @setReferValue="setReferValue">
                             </vci-web-refer>
                         </div>
@@ -148,6 +146,22 @@
                     label: "涓嶇瓑浜�",
                 }
             ],
+            // 鍙傜収绫诲瀷鐨勬潯浠舵暟缁�
+            referSearchConditions: [
+                {
+                    value: "_equal",
+                    label: "绛変簬",
+                },{
+                    value: "_notequal",
+                    label: "涓嶇瓑浜�",
+                },{
+                    value: "_like",
+                    label: "鍖呭惈",
+                },{
+                    value: "_notlike",
+                    label: "涓嶅寘鍚�",
+                }
+            ],
             // 瀛楁绫诲瀷鏄棩鏈�
             dateConditions: [
                 {
@@ -191,24 +205,37 @@
                         })
                     }
                 }else if(item.fieldType==='refer'){
-                    item = Object.assign(item,{referConfigData:{
+                    this.$set(item,"referConfigData",{
                         title: item.referConfig.textField,
                         showField: item.showField || item.field,
                         field: item.field,
                         placeholder: item.inputTip || '',
-                        options: item.referConfig,
-                    }})
-                    //console.log(item.referConfigData.options.type);
+                        options: Object.assign(item.referConfig,{width:'100%'}),
+                    })
+                    //console.log(item.referConfigData.options);
                     //console.log(item);   
                 }
+                // TODO: 杩欏効淇敼涓�涓嬪弬鐓х殑鏌ヨ鏉′欢
+                let conditions = [];
+                if(item.fieldType==='text'){
+                    conditions = this.searchConditions;
+                }else if (item.fieldType==='combox'){
+                    conditions = this.dateConditions;
+                }else if (item.fieldType==='datetime') {
+                    conditions = this.switchSearchConditions;
+                }else {
+                    conditions = this.referSearchConditions;
+                }
+                // console.log(conditions);
+                this.$set(item,"conditions",conditions)
                 let add = {
                     queryField: String(item.queryField),
                     condition: item.fieldType==='text' ? String("_like"):String("_equal"),
-                    fieldValue: item.fieldType==='truefalse' ? Boolean(false):String(""),
+                    fieldValue: item.fieldType==='truefalse' ? Boolean(false):String(''),
                 }
                 this.searchFormArrays.push(add)
             });
-            console.log(this.initOptions);
+            //console.log(this.initOptions);
             //console.log(this.searchFormArrays);
         }
     },
@@ -219,7 +246,7 @@
             // if(data.field) {
                
             // }
-            //console.log(data);
+            console.log(data);
         },
 
         // 灞炴�у垏鎹㈡椂鏌ヨ鏉′欢鍜屾煡璇㈠�间篃闇�瑕佸杈撳叆妗嗚繘琛屽垏鎹�
@@ -293,7 +320,7 @@
                 }
             }
             // 鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝灏变紶閫掔粰鐖剁粍浠�
-            // console.log(condtionParam);
+            console.log(condtionParam);
             this.$emit('echoContion',condtionParam)
             this.isShowDialog = false;
         },    
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
index 3f53986..d8893cf 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -27,7 +27,6 @@
     var title = this.referConfig.title || '';
     title = title.replace(":", "");
     title = title ? ('涓恒��' + title + '銆戦�夊彇鍊�') : ('涓恒��' + this.referConfig.showField + '銆戦�夊彇鍊�');
-
     this.title=title;
   },
   methods: {
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml
index 6f79fa5..2c7536b 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml
@@ -7,7 +7,7 @@
   enabled: true
   name: minio
   tenant-mode: true
-  endpoint: http://127.0.0.1:9000
-  access-key: D99KGE6ZTQXSATTJWU24
-  secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ
-  bucket-name: bladex
+  endpoint: http://dev.vci-tech.com:39000
+  access-key: TyEeBAJiAKDvHICUVAoH
+  secret-key: Reo4wW8EWF4gSizUmVsNjWfbDZzR3rBYFn5Jehd9
+  bucket-name: vci-ubcs
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index d7b4d6d..c0f8939 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -34,6 +34,7 @@
 import com.vci.ubcs.starter.revision.model.TreeQueryObject;
 import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
 import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
 import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
 import com.vci.ubcs.starter.web.constant.RegExpConstant;
 import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
@@ -56,6 +57,8 @@
 import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
@@ -1721,7 +1724,7 @@
 	 * @return Sql璇彞
 	 */
 	private String getConditionSql(String key, String value, Map<String/**鍙傜収鐨勫睘鎬�**/, String/**瀹為檯鐨勫睘鎬�**/> referFieldMap, Map<String, CodeClassifyTemplateAttrVO> attrVOMap,String btmType) {
-		if (!Func.hasEmpty(new Object[]{key,value}) && !key.endsWith("_ignore")) {
+		/*if (!Func.hasEmpty(new Object[]{key,value}) && !key.endsWith("_ignore")) {
 			if (key.endsWith("_like")) {
 				String field = UBCSSqlKeyword.getColumn(key, "_like");
 				if (referFieldMap.containsKey(field)) {
@@ -1839,11 +1842,19 @@
 			} else if(key.endsWith("_dateequal")) {
 				String field = UBCSSqlKeyword.getColumn(key, "_dateequal");
 				if (referFieldMap.containsKey(field)) {
+					return referFieldMap.get(field) + SPACE + "= '" + DateUtil.parse(String.valueOf(value), "yyyy-MM-dd HH:mm:ss") + "'" + SPACE;
+				} else {
+					return (field.contains(".") ? "" : "t.") + field + SPACE + "= '" + DateUtil.parse(String.valueOf(getStringValueInWhere(field, value, attrVOMap)), "yyyy-MM-dd HH:mm:ss") + "'" + SPACE;
+				}
+			}else {
+				String field = UBCSSqlKeyword.getColumn(key, "_equal");
+				if (referFieldMap.containsKey(field)) {
 					return referFieldMap.get(field) + SPACE + "= '" + value + "'" + SPACE;
 				} else {
 					return (field.contains(".") ? "" : "t.") + field + SPACE + "= '" + getStringValueInWhere(field, value, attrVOMap)+ "'" + SPACE;
 				}
-			}else {
+			}
+			*//*else {
 				if (referFieldMap.containsKey(key)) {
 					//璇存槑鏄弬鐓х殑锛屾垜浠弬鐓х殑鏌ヨ閮借涓烘槸瀛楃涓诧紝濡傛灉鏄椂闂存牸寮忕殑鏌ヨ鑲畾鏈夐棶棰橈紝
 					String selectKey = referFieldMap.get(key);
@@ -1851,10 +1862,11 @@
 				} else {
 					return getSqlByValue(key, value, attrVOMap,btmType);
 				}
-			}
+			}*//*
 		}
-		return "";
-		/*if (key.endsWith("_begin")) {
+		return "";*/
+
+		if (key.endsWith("_begin")) {
 			//璇存槑鏄�>=鐨勩�傛垜浠渶瑕佸厛鑾峰彇涓�涓�
 			String field = (key.substring(0, key.length() - 6).toLowerCase().trim());
 			if (referFieldMap.containsKey(field)) {
@@ -1880,7 +1892,7 @@
 			} else {
 				return getSqlByValue(key, value, attrVOMap,btmType);
 			}
-		}*/
+		}
 
 	}
 

--
Gitblit v1.9.3