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) { 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; }, 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: { 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 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); } }*/ } }
