From e96908d0c5681721f12b82bbd1eda7ad5091e8cc Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 21 六月 2023 14:14:21 +0800
Subject: [PATCH] 修改高级查询关闭报错问题
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 14 ++--
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 1
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 140 ++++++++++++++++++++++------------------------
3 files changed, 75 insertions(+), 80 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index 559522b..76e9e0c 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -82,7 +82,7 @@
:value="searchFormArrays[index].fieldValue"
:text="item.showField"
:display="!item.hidden"
- @setReferValue="setReferValue">
+ @setReferValue="val=>setReferValue(val,index)">
</vci-web-refer>
</div>
</el-col>
@@ -189,66 +189,76 @@
},
// 瀵硅瘽妗嗗唴瀹规覆鏌撻厤缃�
options(){
- // 灏唎ptions閰嶇疆璧嬪�煎埌data涓殑option涓紝閬垮厤娣辨祬鎷疯礉鐨勯棶棰樻墍浠ラ渶瑕佽浆json涔嬪悗鍐嶈祴鍊�
- const data = JSON.stringify(this.options);
- this.initOptions = JSON.parse(data);
- //console.log(this.initOptions);
- if(this.initOptions.length > 0){
- this.initOptions.forEach((item,index) => {
- if(item.fieldType==='combox') {
- let enumCach = JSON.parse(localStorage.getItem(item.comboxKey));
- if(enumCach != null) {
- item.data = enumCach;
- }else {
- getDictionary({code: item.comboxKey}).then(res=>{
- item.data = res.data.data;
- localStorage.setItem(item.comboxKey,JSON.stringify(res.data.data));
- })
- }
- }else if(item.fieldType==='refer'){
- this.$set(item,"referConfigData",{
- title: item.title,
- showField: item.showField || item.field,
- field: item.field,
- placeholder: item.inputTip || '',
- 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(''),
- }
- this.searchFormArrays.push(add)
- });
- }
- //console.log(this.initOptions);
- //console.log(this.searchFormArrays);
+ this.initData();
}
},
methods: {
+ initData(){
+ // 灏唎ptions閰嶇疆璧嬪�煎埌data涓殑option涓紝閬垮厤娣辨祬鎷疯礉鐨勯棶棰樻墍浠ラ渶瑕佽浆json涔嬪悗鍐嶈祴鍊�
+ const data = JSON.stringify(this.options);
+ this.initOptions = JSON.parse(data);
+ //console.log(this.initOptions);
+ if(this.initOptions.length > 0){
+ let array = [];
+ this.initOptions.forEach((item,index) => {
+ if(item.fieldType==='combox') {
+ let enumCach = JSON.parse(localStorage.getItem(item.comboxKey));
+ if(enumCach != null) {
+ item.data = enumCach;
+ }else {
+ getDictionary({code: item.comboxKey}).then(res=>{
+ item.data = res.data.data;
+ localStorage.setItem(item.comboxKey,JSON.stringify(res.data.data));
+ })
+ }
+ }else if(item.fieldType==='refer'){
+ this.$set(item,"referConfigData",{
+ title: item.title,
+ showField: item.showField || item.field,
+ field: item.field,
+ placeholder: item.inputTip || '',
+ options: Object.assign(item.referConfig,{width:"80%"}),
+ })
+ //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(''),
+ }
+ array.push(add)
+ });
+ this.searchFormArrays = array;
+ }
+ //console.log(this.initOptions);
+ //console.log(this.searchFormArrays);
+ },
+
/** 涓哄弬鐓х被鍨嬫椂鍊奸�夋嫨涔嬪悗鐨勫鐞� */
- setReferValue(data){
- // if(data.field) {
-
- // }
- console.log(data);
+ setReferValue(data,index){
+ // console.log(index);
+ if(data.field) {
+ this.searchFormArrays[index][data.fieldValue] = data.value || '';
+ this.initOptions[index][data.showField] = data.text || '';
+ }
+ // console.log(this.initOptions[index][data.showField]);
+ // console.log(data);
},
// 灞炴�у垏鎹㈡椂鏌ヨ鏉′欢鍜屾煡璇㈠�间篃闇�瑕佸杈撳叆妗嗚繘琛屽垏鎹�
@@ -284,22 +294,7 @@
},
// 閲嶇疆褰撳墠鐣岄潰鐨勮緭鍏ユ
resetInput(){
- const data = JSON.stringify(this.options);
- this.initOptions = JSON.parse(data);
- if(this.initOptions.length > 0){
- let array = [];
- this.initOptions.forEach((item,index) => {
- let add = {
- queryField: String(item.queryField),
- condition:item.fieldType=='text' ? String("_like"):String("_equal"),
- fieldValue: item.fieldType=='truefalse' ? Boolean(false):String(''),
- }
- array.push(add)
- });
- this.searchFormArrays = array;
- }
- //console.log(this.initOptions);
- //console.log(this.searchFormArrays);
+ this.initData();
},
// 鎭㈠椤甸潰
recoverPage(){
@@ -395,6 +390,5 @@
.grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner{
width: 100%;
}
-
</style>
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 8cc886b..eafcf03 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -6,6 +6,7 @@
top="0"
class="avue-dialog avue-dialog--top"
:width="referConfig.options.width|| '80%'">
+
<avue-crud :option="option"
:table-loading="loading"
:data="data"
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 447777d..0bba185 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
@@ -1729,9 +1729,9 @@
String field = UBCSSqlKeyword.getColumn(key, "_like");
if (referFieldMap.containsKey(field)) {
//璇存槑杩樻槸鍙傜収閲岄潰鐨勶紝鎴戜滑榛樿杩欑鎯呭喌涓嬮兘鏄瓧绗︿覆鍚э紝鍥犱负鍙傜収鐨勫睘鎬т笉涓�瀹氱敤鐨勫钩鍙扮殑灞炴�ф睜閲岀殑锛屾墍浠ュぇ閮ㄥ垎鎯呭喌涓嬶紝鏄剧ず鐨勫睘鎬ч兘鏄瓧绗︿覆鍚�
- return referFieldMap.get(field) + SPACE + "LIKE" + SPACE + "%" + value + "%)" + SPACE;
+ return referFieldMap.get(field) + SPACE + "LIKE" + SPACE + "'%" + value + "%'" + SPACE;
} else {
- return (field.contains(".") ? "" : "t.") + field + SPACE + "LIKE " + "%" + getStringValueInWhere(field, value, attrVOMap) + "%)" + SPACE;
+ return (field.contains(".") ? "" : "t.") + field + SPACE + "LIKE " + "'%" + getStringValueInWhere(field, value, attrVOMap) + "%'" + SPACE;
}
} else if (key.endsWith("_notequal")) {
String field = UBCSSqlKeyword.getColumn(key, "_notequal");
@@ -1849,9 +1849,9 @@
}else if(key.endsWith("_equal")) {
String field = UBCSSqlKeyword.getColumn(key, "_equal");
if (referFieldMap.containsKey(field)) {
- return referFieldMap.get(field) + SPACE + "= " + value + SPACE;
+ return referFieldMap.get(field) + SPACE + "= '" + value + "'" + SPACE;
} else {
- return (field.contains(".") ? "" : "t.") + field + SPACE + "= " + getStringValueInWhere(field, value, attrVOMap) + SPACE;
+ return (field.contains(".") ? "" : "t.") + field + SPACE + "= '" + getStringValueInWhere(field, value, attrVOMap) + "'" + SPACE;
}
}else {
if (referFieldMap.containsKey(key)) {
@@ -1914,7 +1914,7 @@
}
if (field.contains(".") && attrVOMap != null && attrVOMap.containsKey(field.split("\\.")[0].toLowerCase(Locale.ROOT))) {
//鏄弬鐓�
- return "'" + value + "'";
+ return value;
} else {
return value;
}
@@ -1938,13 +1938,13 @@
|| VciFieldTypeEnum.VTInteger.equals(fieldTypeEnum)) {
return value;
} else {
- return "'" + value + "'";
+ return value;
}
} else {
if ((value.startsWith("(") && value.endsWith(")")) || (value.startsWith("'") && value.endsWith("'"))) {
return value;
}
- return "'" + value + "'";
+ return value;
}
}
--
Gitblit v1.9.3