From dd6942743fa3936a1bbcbe6f4102c028d8021d5c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 05 六月 2023 16:56:35 +0800
Subject: [PATCH] 完善高级查询组件
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java | 12
Source/UBCS-WEB/src/views/code/code.vue | 107 +++------
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreApplyFormServiceImpl.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java | 1
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/GroupCodeApplyApplication.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java | 37 +--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 32 ++
Source/UBCS-WEB/src/components/code-dialog-page/referSelectBtmAttrDialog.vue | 49 ++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 12
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferBtmTypeService.java | 6
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreClassifyServiceImpl.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java | 3
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 277 +++++++++++++++++++--------
15 files changed, 325 insertions(+), 218 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index 517c823..d9e17d9 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -1,73 +1,88 @@
+<!-- 楂樼骇鏌ヨ瀵硅瘽妗嗙粍浠�
+ 1銆佹墦寮�涓庡叧闂笌el-dialog鐢ㄦ硶涓�鑷达紱
+ 2銆佺敤鎴风紪杈戝ソ鐨勬煡璇㈡潯浠堕�氳繃@echoContion浜嬩欢缁戝畾鐩稿簲鐨勫嚱鏁帮紝瀹炵幇瀛愮粍浠跺�间紶閫掑洖鐖剁粍浠讹紱
+ 3銆佺敤鎴疯緭鍏ョ殑鍊间細浠onditionMap[field]鐨勬牸寮忔嫾鎺ュソ杩涜鍥炰紶锛岀劧鍚庡氨闇�瑕佷娇鐢ㄧ殑鍦版柟鑷杩涜鏌ヨ鐨勮皟鐢紱
+ -->
<template>
<el-dialog
title="楂樼骇鏌ヨ"
append-to-body
width="55vw"
- style="height: 115vh; overflow: hidden"
+ style="height: 115vh; margin-top: -10vh; overflow: hidden"
:visible.sync="isShowDialog"
@close="recoverPage"
destroy-on-close>
<div class="search-total">
- <el-row>
- <div class="grid-content">
- <el-button
- type="primary"
- size="small"
- icon="el-icon-search"
- @click="searchSubmit">
- 鏌ヨ
- </el-button>
- <el-button
- type="warning"
- size="small"
- icon="el-icon-refresh"
- @click="resetInput">
- 閲嶇疆
- </el-button>
- </div>
- </el-row>
- <el-row
- v-for="(item,index) in initOptions.column"
- :key="item.value"
- class="search-content"
- :span="24">
- <el-col :span="4">
- <div class="grid-content">
- <el-select placeholder="璇烽�夋嫨">
- <el-option
- v-for="feildName in item.searchfeildName"
- :key="feildName.value"
- :label="feildName.label"
- :value="feildName.value">
+ <!-- 澶撮儴鎸夐挳鍖哄煙 -->
+ <div class="dialog-search-button">
+ <el-button
+ type="primary"
+ size="small"
+ icon="el-icon-search"
+ @click="searchSubmit">
+ 鏌ヨ
+ </el-button>
+ <el-button
+ type="warning"
+ size="small"
+ icon="el-icon-refresh"
+ @click="resetInput">
+ 閲嶇疆
+ </el-button>
+ </div>
+ <!-- 椤甸潰涓讳綋鍐呭鍖哄煙 -->
+ <div class="search-content">
+ <el-row
+ v-for="(item,index) in initOptions"
+ :key="item.queryField"
+ v-show="!item.hidden"
+ :span="24">
+ <el-col :span="5">
+ <div class="grid-content">
+ <el-select placeholder="璇烽�夋嫨" v-model="searchFormArrays[index].queryField">
+ <el-option
+ v-for="feildName in initOptions"
+ :key="feildName.queryField"
+ :label="feildName.title"
+ :value="feildName.queryField">
</el-option>
- </el-select>
- </div>
- </el-col>
- <el-col :span="4">
- <div class="grid-content">
- <el-select placeholder="璇烽�夋嫨">
- <el-option
- v-for="condition in item.searchCondition"
- :key="condition.value"
- :label="condition.label"
- :value="condition.value">
- </el-option>
- </el-select>
- </div>
- </el-col>
- <el-col :span="13">
- <div class="grid-content">
- <div class="el-input">
- <input type="text" placeholder="璇疯緭鍏�" autocomplete="off" class="el-input__inner" :value="value">
+ </el-select>
</div>
- </div>
- </el-col>
- <el-col :span="2">
- <div class="grid-content">
- <i class="el-icon-close" @click="removeInput(index)"></i>
- </div>
- </el-col>
- </el-row>
+ </el-col>
+ <el-col :span="4">
+ <div class="grid-content">
+ <el-select placeholder="璇烽�夋嫨" v-model="searchFormArrays[index].condition">
+ <el-option
+ v-for="condition in item.fieldType=='text' ? searchConditions:switchSearchConditions"
+ :key="condition.value"
+
+ :label="condition.label"
+ :value="condition.value">
+ </el-option>
+ </el-select>
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="grid-content">
+ <el-input v-show="item.fieldType==='text' || item.fieldType===''" v-model="searchFormArrays[index].fieldValue" type="text" placeholder="璇疯緭鍏�"></el-input>
+ <el-select v-show="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="option in item.data"
+ :key="option.value"
+ :label="option.key"
+ :value="option.value">
+ </el-option>
+ </el-select>
+ <el-switch v-show="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
+ </div>
+ </el-col>
+ <el-col :span="2">
+ <div class="grid-content">
+ <i class="el-icon-close" @click="removeInput(index)"></i>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
</div>
</el-dialog>
</template>
@@ -86,81 +101,166 @@
type: "Object",
default: {},
},
- // 椤甸潰鏁版嵁娓叉煋閰嶇疆
- searchForm: {
+ conditionMapParams: {
type: "Object",
default: {},
},
- value:{
- type: "String",
- }
},
data() {
return {
// 瀵硅瘽妗嗘樉绀烘帶鍒�
isShowDialog: this.visible,
- initOptions: {},
- searchForm: {},
+ initOptions: [],
+ // 瀛楁鏄緭鍏ユ绫诲瀷鐨勬潯浠舵暟缁�
+ searchConditions: [
+ {
+ value: "=",
+ label: "绛変簬",
+ },{
+ value: "like",
+ label: "鍖呭惈",
+ },{
+ value: "!=",
+ label: "涓嶇瓑浜�",
+ },{
+ value: ">",
+ label: "澶т簬",
+ },{
+ value: "<",
+ label: "灏忎簬",
+ },
+ ],
+ // 瀛楁鏄崟閫夋垨涓嬫媺妗嗙被鍨嬬殑鏉′欢鏁扮粍
+ switchSearchConditions: [
+ {
+ value: "=",
+ label: "绛変簬",
+ },{
+ value: "!=",
+ label: "涓嶇瓑浜�",
+ },
+ ],
+ searchFormArrays: [],
}
},
watch: {
// 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙ｆ樉绀洪殣钘忕殑鍊�
visible (){
this.isShowDialog = this.visible;
+ },
+ // 瀵硅瘽妗嗗唴瀹规覆鏌撻厤缃�
+ options(){
+ // 灏唎ptions閰嶇疆璧嬪�煎埌data涓殑option涓紝閬垮厤娣辨祬鎷疯礉鐨勯棶棰樻墍浠ラ渶瑕佽浆json涔嬪悗鍐嶈祴鍊�
+ const data = JSON.stringify(this.options);
+ this.initOptions = JSON.parse(data);
+ // console.log(this.initOptions);
+ this.initOptions.forEach((item,index) => {
+ let add = {
+ queryField: String(item.queryField),
+ condition: item.fieldType=='text' ? String("like"):String("="),
+ fieldValue: item.fieldType=='truefalse' ? Boolean(false):String(''),
+ }
+ this.searchFormArrays.push(add)
+ });
+ //console.log(this.searchFormArrays);
}
},
created () {
- // 灏唎ptions閰嶇疆璧嬪�煎埌data涓殑option涓紝閬垮厤娣辨祬鎷疯礉鐨勯棶棰樻墍浠ラ渶瑕佽浆json涔嬪悗鍐嶈祴鍊�
- const data = JSON.stringify(this.options);
- this.initOptions = JSON.parse(data);
- console.log(this.searchForm);
+
},
methods: {
// 绉婚櫎鎼滅储妗�
removeInput(index){
- //console.log(this.options.column);
- this.$delete(this.initOptions.column,index);
+ //console.log(this.initOptions);
+ this.$delete(this.initOptions,index);
+ this.$delete(this.searchFormArrays,index);
},
// 閲嶇疆褰撳墠鐣岄潰鐨勮緭鍏ユ
resetInput(){
const data = JSON.stringify(this.options);
this.initOptions = JSON.parse(data);
+ let array = [];
+ this.initOptions.forEach((item,index) => {
+ let add = {
+ queryField: String(item.queryField),
+ condition:item.fieldType=='text' ? String("like"):String("="),
+ fieldValue: item.fieldType=='truefalse' ? Boolean(false):String(''),
+ }
+ array.push(add)
+ });
+ this.searchFormArrays = array;
+ //console.log(this.initOptions);
+ //console.log(this.searchFormArrays);
},
// 鎭㈠椤甸潰
recoverPage(){
this.resetInput();
this.$emit('update:visible', false);
},
- // 鎻愪氦褰撳墠椤甸潰鐨勮緭鍏�
+ // 鎻愪氦褰撳墠椤甸潰鐨勮緭鍏ョ殑鏌ヨ鏉′欢骞跺仛瀵瑰簲鐨勮繃婊や笌妫�鏌�
searchSubmit(){
- console.log(11);
+ let condtionParam = {};
+ const searchConditions = this.searchFormArrays;
+ for(let index = 0; index < searchConditions.length; index++) {
+ //console.log(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' == 'undefined');
+ if(searchConditions[index].fieldValue != '' || searchConditions[index].fieldValue+''==='false') {
+ // 瀛樺湪鐩稿悓鐨勬煡璇㈡潯浠�
+ if(condtionParam['conditionMap['+searchConditions[index].queryField+']']+''.trim() != 'undefined' ) {
+ this.$message.warning("瀛樺湪閲嶅鏌ヨ鏉′欢锛岃浠旂粏鏍稿!");
+ return false;
+ }
+ condtionParam['conditionMap['+searchConditions[index].queryField+']'] = searchConditions[index].fieldValue;
+ }
+ }
+ //鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝浼犻�掔粰鐖剁粍浠�
+ //console.log(condtionParam);
+ // if(){
+
+ // }
+ this.$emit('echoContion',condtionParam)
},
}
}
</script>
-<style lang="scss">
+<style lang="scss" scoped>
.search-total {
border-radius: 4px;
- min-height: 36px;
+ min-height: 70vh;
// margin-left: 35px;
- margin-top: -20px;
+ margin-top: -8px;
+ overflow-y: auto;
+ height: 70vh;
}
- .search-total > .el-row{
- margin-bottom: 10px;
- &:last-child {
- margin-bottom: 0;
- }
+ .dialog-search-button {
+ border-top: 1px solid #E9E7E7;
+ border-bottom: 1px solid #E9E7E7;
+ padding: 10px 10px 10px;
+ position: fixed;
+ display: block;
+ background-color: #fff;
+ top: 90px;
+ width: 50%;
+ z-index: 1000;
}
- .search-total > .el-col {
+ // .search-total > .search-content > .el-row{
+ // margin-bottom: 5px;
+ // &:last-child {
+ // margin-bottom: 0;
+ // }
+ // }
+ .search-total > .search-content {
+ margin-top: 40px;
+ }
+ .search-total > .search-content > .el-row > .el-col {
border-radius: 4px;
}
- .search-total > .el-col > .grid-content {
+ .search-total > .search-content > .el-row > .el-col > .grid-content {
border-radius: 4px;
min-height: 36px;
}
- .search-content > .el-col {
+ .search-total > .search-content > .el-row > .el-col {
margin-right: 6px;
&:last-child {
margin-right: 0;
@@ -175,6 +275,13 @@
font-size: 38px;
color: rgb(219, 52, 6);
}
+ .grid-content > .el-select {
+ width: 100%;
+ }
+ .grid-content > .el-switch {
+ line-height: 40px;
+ height: 40px;
+ }
</style>
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referSelectBtmAttrDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referSelectBtmAttrDialog.vue
index afa7747..11869f4 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referSelectBtmAttrDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referSelectBtmAttrDialog.vue
@@ -60,6 +60,7 @@
addBtn: false,
menu: false,
// refreshBtn: false,
+ disablePage: false,
searchShowBtn: false,
columnBtn: false,
dialogClickModal: false,
@@ -84,11 +85,11 @@
},{
label: '灞炴�ч暱搴�',
search: false,
- prop: 'attrLength'
+ prop: 'attributeLength'
},{
label: '灞炴�х被鍨�',
search: false,
- prop: 'attrType'
+ prop: 'attrDataTypeText'
}],
},
crudData: [],
@@ -114,32 +115,38 @@
this.options = params;
this.crudParams.crudLoading = true;
// 璋冪敤api璇锋眰
- const data = {
- total: 2,
- data: [{
- id: 'test',
- name: '娴嬭瘯',
- attrLength: 11,
- attrType: '瀛楃涓�'
- }, {
- id: 'test1',
- name: '娴嬭瘯1',
- attrLength: 12,
- attrType: '鏁板瓧'
- }]
- }
+ // const data = {
+ // total: 2,
+ // data: [{
+ // id: 'test',
+ // name: '娴嬭瘯',
+ // attrLength: 11,
+ // attrType: '瀛楃涓�'
+ // }, {
+ // id: 'test1',
+ // name: '娴嬭瘯1',
+ // attrLength: 12,
+ // attrType: '鏁板瓧'
+ // }]
+ // }
let param = {};
// 澶氫釜conditionMap杩欐牱浼犲弬
if(this.crudParams.crudQuery){
- Object.keys(crudParams.crudQuery).forEach(key=>{
- param['conditionMap['+key+']'] = crudParams.crudQuery[key];
+ Object.keys(this.crudParams.crudQuery).forEach(key=>{
+ param['conditionMap['+key+']'] = this.crudParams.crudQuery[key];
});
}
+ param['conditionMap[btmTypeId]'] = this.options.btmTypeId;
gridAttributesByBtmId(1,-1,param).then(res=>{
- console.log(res);
+ const data = res.data;
+ console.log(data.data.records);
+ this.crudParams.crudData = data.data.records;
+ this.crudParams.crudLoading = false;
+ this.$nextTick(()=>{
+ this.$refs[this.crudParams.ref].doLayout();
+ })
})
- this.crudParams.crudData = data.data;
- this.crudParams.crudLoading = false;
+
},
selectedBtmTypeAttrSrchChange(params, done){
this.crudParams.crudQuery = params;
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 9d36936..5e3a4ec 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -99,10 +99,10 @@
</basic-container>
<!-- 楂樼骇鏌ヨ瀵硅瘽妗� -->
<advanced-query
- ref="advancedQuery"
+ :ref="advancedQueryParam.ref"
:options="advancedQueryParam.options"
:visible.sync="advancedQueryParam.advancedQuerySettingBox"
- v-model="value">
+ @echoContion="echoSeniorContionMap">
</advanced-query>
<!-- 缂栫爜瑙勫垯鐩稿叧瀵硅瘽妗� -->
<el-dialog title="缂栫爜瑙勫垯浣跨敤鑼冨洿"
@@ -786,7 +786,7 @@
addSave,
refDataGridClassifySec,
} from "@/api/code/codebasic";
- import { treeTopCodeClassify, listClassifyLinkAttr } from "@/api/code/codeclassify";
+ import { listClassifyLinkAttr } from "@/api/code/codeclassify";
import { gridCodeFixedValue,addSaveCodeFixedValue,deleteCodeFixedValue,editCodeFixedValue,saveOrder } from "@/api/code/codeFixedValue";
import { treeCodeClassifyValue,addSaveCodeClassifyValue,editCodeClassifyValue,deleteCodeClassifyValue,saveCodeClassifyValueOrder } from "@/api/code/codeClassifyValue";
import { getDictionary } from "@/api/omd/enum";
@@ -799,18 +799,14 @@
import treeOption from "@/const/code/classifyTreeOptionDialog";
import classisyValueTreeOption from "@/const/code/classisyValueTreeDialog";
import parentClassifyParentOption from "@/const/code/parentClassifyParentOptionDialog";
- import referBtmOption from "@/const/code/referBtmDialog";
import fixedValueOption from "@/const/code/fixedValueMgrDialog";
import {mapGetters} from "vuex";
import func from "@/util/func";
import {MasterTable} from "@/api/GetItem";
-import referBtmTypeCrudDialog from '../../components/code-dialog-page/referBtmTypeCrudDialog.vue';
export default {
- components: { referBtmTypeCrudDialog },
data() {
return {
- value:"1",
ruleForm: {},
query: {},
loading: true,
@@ -1054,67 +1050,11 @@
// 楂樼骇鏌ヨ瀵硅瘽妗嗙浉鍏冲弬鏁�
advancedQueryParam: {
+ ref: 'advancedQuery',
advancedQuerySettingBox: false,
- searchForm: {
- name: 'advanced',
- },
- options: {
- labelWidth: '110px',
- // 鏌ヨ瀛楁
- searchfeildName: [
- {
- label: '缂栧彿',
- value: 'id',
- },
- {
- label: '鍚嶇О',
- value: 'name',
- },
- {
- label: '鐘舵��',
- value: 'status',
- },
- ],
- // 鏌ヨ鏉′欢 绛変簬銆佸寘鍚�佷笉绛変簬銆佷粙浜庘�︹��
- searchCondition: [
- {
- label: '绛変簬',
- value: '=',
- },
- {
- label: '鍖呭惈',
- value: 'like',
- },
- {
- label: '澶т簬绛変簬',
- value: '>=',
- },
- {
- label: '灏忎簬绛変簬',
- value: '<=',
- },
- {
- label: '涓嶇瓑浜�',
- value: '!=',
- },
- {
- label: '浠嬩簬',
- value: 'between',
- },
- ],
- column: [
- {
- type: 'text',
-
-
- },
- {
-
- },
- ],
- },
+ options: {},
+ //conditionMapParams: {},
},
-
};
},
@@ -1135,9 +1075,42 @@
functionId: 5,
}).then(res=>{
console.log(res.data.tableDefineVO.seniorQueryColumns);
+ this.advancedQueryParam.options = res.data.tableDefineVO.seniorQueryColumns;
})
+ // this.advancedQueryParam.options = [
+ // {
+ // data: [],
+ // title: '缂栧彿',
+ // fieldType: 'text',
+ // queryField: 'id',
+ // },{
+ // data: [],
+ // title: '鍚嶇О',
+ // fieldType: 'text',
+ // queryField: 'name',
+ // },{
+ // data: [],
+ // title: '鎻忚堪',
+ // fieldType: 'text',
+ // queryField: 'description',
+ // }, {
+ // data: [],
+ // title: '鐘舵��',
+ // fieldType: 'text',
+ // queryField: 'description',
+ // }
+ // ]
+ },
+ watch:{
+
},
methods: {
+
+ /** 楂樼骇鏌ヨ瀵硅瘽妗嗙粍浠�,缁勪欢杩斿洖鐨勫�兼槸condtionMap[field]褰㈠紡鐨勬煡璇㈡潯浠讹紝淇濈暀鍜屼箣鍓嶄竴鏍� */
+ echoSeniorContionMap(conditionMaps){
+ console.log(conditionMaps);
+
+ },
/* 鍏紡缂栬緫妗嗗唴瀹规敼鍙�,瀛愮粍浠剁紪杈戝畬鍏紡涔嬪悗鍐呭鍥炴樉鏃惰皟鐢� */
updateFormulaContent(content){
@@ -2033,8 +2006,6 @@
/** 缂栫爜瑙勫垯鐩稿叧鏂规硶 */
// 鎵撳紑楂樼骇鏌ヨ绐楀彛
openAdvancedQuery(){
- //this.$refs.advancedQuery.visible = true;
- //this.advancedQueryParam.timer = new Date().getTime()
this.advancedQueryParam.advancedQuerySettingBox = !this.advancedQueryParam.advancedQuerySettingBox;
},
// 鏌ヨ浣跨敤鑼冨洿
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java
index 4b64165..bfb44bb 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java
@@ -50,7 +50,7 @@
@GetMapping(value = "/gridAttributesByBtmId")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "鑾峰彇涓氬姟绫诲瀷鍖呭惈鐨勫睘鎬э紝涓嶅垎椤�", notes = "baseQueryObject")
- public R<Page<AttributeVO>> gridAttributesByBtmId(BaseQueryObject baseQueryObject){
+ public R<Page<BtmTypeAttributeVO>> gridAttributesByBtmId(BaseQueryObject baseQueryObject){
return R.data(codeReferBtmTypeService.gridAttributesByBtmId(baseQueryObject));
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
index 04e09cc..92b2711 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
@@ -11,6 +11,7 @@
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;import com.vci.ubcs.starter.web.pagemodel.Tree;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
import java.io.File;
import java.util.Collection;
@@ -167,7 +168,7 @@
* @param baseQueryObject 鏌ヨ瀵硅薄锛屽繀椤绘湁codeClassifyOid锛屾敮鎸乮d鍜宯ame涓ょ鏌ヨ鏉′欢
* @return 灞炴�х殑淇℃伅锛屽寘鍚粯璁ょ殑灞炴��
*/
- DataGrid<BtmTypeAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject);
+ DataGrid<BtmTypeAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject) throws ServiceException;
/**
* 鑾峰彇褰撳墠鍒嗙被鐨勯《灞傚垎绫�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferBtmTypeService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferBtmTypeService.java
index 103dac5..729c5a5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferBtmTypeService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferBtmTypeService.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vci.ubcs.omd.vo.AttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.util.BeanUtil;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.GetMapping;
@@ -25,14 +27,14 @@
* @param baseQueryObject 鏌ヨ鏉′欢
* @return 鍒楄〃鐨勫唴瀹�
*/
- Page<BtmTypeVO> referDataGrid(BaseQueryObject baseQueryObject);
+ Page<BtmTypeVO> referDataGrid(BaseQueryObject baseQueryObject) throws ServiceException;
/**
* 鑾峰彇涓氬姟绫诲瀷鍖呭惈鐨勫睘鎬э紝涓嶅垎椤�
* @param baseQueryObject 鏌ヨ瀵硅薄
* @return 灞炴�х殑淇℃伅
*/
- Page<AttributeVO> gridAttributesByBtmId(BaseQueryObject baseQueryObject);
+ Page<BtmTypeAttributeVO> gridAttributesByBtmId(BaseQueryObject baseQueryObject) throws ServiceException ;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index fd0dfdc..4c46eb9 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -22,6 +22,8 @@
import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.wrapper.CodeBasicSecWrapper;
+import com.vci.ubcs.omd.cache.EnumCache;
+import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
@@ -216,11 +218,11 @@
CodeBasicSec codeBasicSecDO = new CodeBasicSec();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDTO, codeBasicSecDO);
//text杞崲
- codeBasicSecDO.setSecTypeText(CodeSecTypeEnum.getTextByValue(codeBasicSecDTO.getSecType()));
- codeBasicSecDO.setCodeLevelTypeText(CodeLevelTypeEnum.getTextByValue(codeBasicSecDTO.getCodeLevelType()));
- codeBasicSecDO.setCodeSecLengthTypeText(CodeSecLengthTypeEnum.getTextByValue(codeBasicSecDTO.getCodeSecLengthType()));
- codeBasicSecDO.setValueCutTypeText(CodeCutTypeEnum.getValueByText(codeBasicSecDTO.getValueCutType()));
- codeBasicSecDO.setCodeGetValueTypeText(CodeGetValueTypeEnum.getValueByText(codeBasicSecDTO.getCodeGetValueType()));
+ codeBasicSecDO.setSecTypeText(EnumCache.getValue(EnumEnum.CODE_SEC_TYPE,codeBasicSecDTO.getSecType()));
+ codeBasicSecDO.setCodeLevelTypeText(EnumCache.getValue(EnumEnum.CODE_LEVEL_TYPE,codeBasicSecDTO.getCodeLevelType()));
+ codeBasicSecDO.setCodeSecLengthTypeText(EnumCache.getValue(EnumEnum.CODE_SEC_LENGTH,codeBasicSecDTO.getCodeSecLengthType()));
+ codeBasicSecDO.setValueCutTypeText(EnumCache.getValue(EnumEnum.CODE_CUT_TYPE,codeBasicSecDTO.getValueCutType()));
+ codeBasicSecDO.setCodeGetValueTypeText(EnumCache.getValue(EnumEnum.CODE_GET_VALUE_TYPE,codeBasicSecDTO.getCodeGetValueType()));
//濉厖涓�浜涢粯璁ゅ��
DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeBasicSecDO,MdmBtmTypeConstant.CODE_BASIC_SEC);
//鎺掑簭鍙凤紝榛樿绛変簬褰撳墠宸叉湁鐨勬暟閲忓姞1
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 1740d98..41877d6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -873,7 +873,7 @@
* @return 灞炴�х殑淇℃伅锛屽寘鍚粯璁ょ殑灞炴��
*/
@Override
- public DataGrid<BtmTypeAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject) {
+ public DataGrid<BtmTypeAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject) throws ServiceException{
if(baseQueryObject == null){
baseQueryObject = new BaseQueryObject();
}
@@ -897,8 +897,11 @@
Map<String,Object> condition = new HashMap<>(1);
condition.put("pkbtmtype",topClassifyVO.getBtmtypeid());
- BtmTypeVO data = btmTypeClient.getDetail(btmTypeOid).getData();
- List<BtmTypeAttributeVO> unDefaultAttributes = data.getAttributes();
+ R<BtmTypeVO> btmTypeDetail = btmTypeClient.getDetail(btmTypeOid);
+ if(btmTypeDetail.getCode() != 200){
+ throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤鍑洪敊");
+ }
+ List<BtmTypeAttributeVO> unDefaultAttributes = btmTypeDetail.getData().getAttributes();
// List<CodeOsbtmtypeattributeEntity> unDefaultAttributes = codeOsbtmtypeattributeMapper.selectByMap(condition);
// List<OsBtmTypeAttributeVO> unDefaultAttributes = btmService. (topClassifyVO.getBtmtypeid());
List<BtmTypeAttributeVO> attributeVOS = new ArrayList<>();
@@ -908,8 +911,8 @@
BeanUtils.copyProperties(attr,attributeVO);
attributeVO.setAttrDataType(attr.getAttrDataType());
attributeVO.setAttributeLength(attr.getAttributeLength());
- attributeVO.setBtmTypeId(data.getId());
- attributeVO.setBtmname(data.getName());
+ attributeVO.setBtmTypeId(btmTypeDetail.getData().getId());
+ attributeVO.setBtmname(btmTypeDetail.getData().getName());
attributeVO.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCO_FIELD_TYPE,attr.getAttrDataType()));
boolean add = true;
if(StringUtils.isNotBlank(id) && !attributeVO.getId().contains(id.replace("*",""))){
@@ -923,6 +926,25 @@
}
});
}
+ R<BtmTypeVO> btmTypeVOR = btmTypeClient.getDefaultAttrByBtmId(topClassifyVO.getBtmtypeid());
+ if(btmTypeVOR.getCode() != 200){
+ throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤鍑洪敊");
+ }
+ List<BtmTypeAttributeVO> defaultAttrVOS = btmTypeVOR.getData().getAttributes();
+ if(!CollectionUtils.isEmpty(defaultAttrVOS)){
+ defaultAttrVOS.stream().forEach(attr->{
+ boolean add = true;
+ if(StringUtils.isNotBlank(id) && !attr.getId().contains(id.replace("*",""))){
+ add = false;
+ }
+ if(StringUtils.isNotBlank(name) && !attr.getId().contains(name.replace("*",""))){
+ add = false;
+ }
+ if(add){
+ attributeVOS.add(attr);
+ }
+ });
+ }
DataGrid<BtmTypeAttributeVO> dataGrid = new DataGrid<>();
dataGrid.setData(attributeVOS);
dataGrid.setTotal(attributeVOS.size());
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java
index 4b0cc5e..62b83ca 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vci.ubcs.code.service.ICodeReferBtmTypeService;
import com.vci.ubcs.omd.feign.IAttributeClient;
+import com.vci.ubcs.omd.feign.IBtmAttributeClient;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.AttributeVO;
import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
@@ -39,12 +40,6 @@
private IBtmTypeClient btmTypeClient;
/**
- * 涓氬姟绫诲瀷灞炴�ф湇鍔�
- */
- @Resource
- private IAttributeClient attributeClient;
-
- /**
* 鑾峰彇涓氬姟绫诲瀷鍒楄〃
* @param baseQueryObject 鏌ヨ鏉′欢
* @return 鍒楄〃鐨勫唴瀹�
@@ -54,13 +49,11 @@
Map<String, String> conditionMap = baseQueryObject.getConditionMap();
conditionMap.put("domain", AppConstant.APPLICATION_NAME_CODE);
baseQueryObject.setConditionMap(conditionMap);
- Page<BtmTypeVO> refPage = null;
- try {
- refPage = btmTypeClient.getRefPage(baseQueryObject).getData();
- }catch (Exception e){
+ R<Page<BtmTypeVO>> btmTypeClientRefPage = btmTypeClient.getRefPage(baseQueryObject);
+ if(btmTypeClientRefPage.getCode() != 200){
throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒");
}
- return refPage;
+ return btmTypeClientRefPage.getData();
}
/**
@@ -69,25 +62,28 @@
* @return 灞炴�х殑淇℃伅
*/
@Override
- public Page<AttributeVO> gridAttributesByBtmId(BaseQueryObject baseQueryObject) {
+ public Page<BtmTypeAttributeVO> gridAttributesByBtmId(BaseQueryObject baseQueryObject) throws ServiceException {
String btmTypeId = baseQueryObject.getConditionMap().containsKey("btmTypeId")?baseQueryObject.getConditionMap().get("btmTypeId"):"";
if(StringUtils.isBlank(btmTypeId)){
- return new Page<AttributeVO>();
+ return new Page<>();
}
String hasDefaultAttr = baseQueryObject.getConditionMap().getOrDefault("hasDefaultAttr","false");
String attrId = baseQueryObject.getConditionMap().containsKey("name")?baseQueryObject.getConditionMap().get("name").replace("*",""):"";
String attrName = baseQueryObject.getConditionMap().containsKey("label") ? baseQueryObject.getConditionMap().get("label").replace("*","") : "";
- // TODO 鏍规嵁涓氬姟绫诲瀷id鑾峰彇鍏宠仈鐨勫睘鎬�
- List<BtmTypeAttributeVO> boAttrs = null; //attributeClient.get();
+ List<BtmTypeAttributeVO> boAttrs = null;
+ try {
+ boAttrs = btmTypeClient.getAllAttributeByBtmId(btmTypeId).getData().getAttributes();
+ }catch (Exception e){
+ throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒");
+ }
if(boAttrs == null){
boAttrs = new ArrayList<>();
}
if(BooleanEnum.TRUE.getValue().equalsIgnoreCase(hasDefaultAttr)){
// TODO 鑾峰彇榛樿鐨勫睘鎬�
List<BtmTypeAttributeVO> finalBoAttrs = boAttrs;
-
- List<BtmTypeAttributeVO> btmTypeAttributeVOS = new ArrayList<>(); //attributeClient.getDefaultAttributeVOs();
- btmTypeAttributeVOS.stream().forEach(attr->{
+ BtmTypeVO btmTypeVO = btmTypeClient.getDefaultAttrByBtmId(btmTypeId).getData();
+ btmTypeVO.getAttributes().stream().forEach(attr->{
BtmTypeAttributeVO attributeVO = new BtmTypeAttributeVO();
BeanUtil.convert(attr,attributeVO);
attributeVO.setAttributeLength(attr.getAttributeLength());
@@ -108,8 +104,9 @@
}
return usedFlag;
}).collect(Collectors.toList());
-
- return new Page<>();
+ Page<BtmTypeAttributeVO> btmTypeAttributeVOPage = new Page<>();
+ btmTypeAttributeVOPage.setRecords(attrList);
+ return btmTypeAttributeVOPage;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java
index bba0d8f..29359d0 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.code.entity.CodeRule;
+import com.vci.ubcs.code.enumpack.CodeClassifyTemplateLC;
import com.vci.ubcs.code.lifecycle.CodeRuleLC;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.omd.cache.EnumCache;
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/GroupCodeApplyApplication.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/GroupCodeApplyApplication.java
index 1368297..d88ccaa 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/GroupCodeApplyApplication.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/GroupCodeApplyApplication.java
@@ -8,7 +8,7 @@
* 闆嗗洟鐮佺敵璇锋帴鍙ｅ惎鍔ㄥ櫒
*
* @author
- * ludc
+ * xieju
*/
@UbcsCloudApplication
public class GroupCodeApplyApplication {
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreApplyFormServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreApplyFormServiceImpl.java
index 993e26a..bd627aa 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreApplyFormServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreApplyFormServiceImpl.java
@@ -1,6 +1,5 @@
package com.vci.ubcs.code.webservice.service.impl;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.webservice.mapper.DockingPreApplyFormMapper;
import com.vci.ubcs.code.webservice.entity.DockingPreApplyForm;
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
index 7799f12..a933f28 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -20,7 +20,6 @@
import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreClassifyServiceImpl.java
index b325153..c448369 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreClassifyServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.webservice.mapper.DockingPreClassifyMapper;
-import com.vci.ubcs.code.webservice.service.IDockingPreApplyFormService;
import com.vci.ubcs.code.webservice.service.IDockingPreAttrMappingService;
import com.vci.ubcs.code.webservice.service.IDockingPreClassifyService;
import com.vci.ubcs.code.webservice.service.IDockingPreViewModelService;
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
index fb328fa..0770e17 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
@@ -7,11 +7,11 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.vci.ubcs.code.feign.IMdmEngineClient;
import com.vci.ubcs.code.webservice.entity.*;
+import com.vci.ubcs.code.webservice.service.IGroupMdmInterService;
import com.vci.ubcs.code.webservice.vo.*;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.code.webservice.feign.MdmApplyGroupCodeProvider;
import com.vci.ubcs.code.webservice.mapper.DockingPreAttrMappingMapper;
-import com.vci.ubcs.code.webservice.service.*;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -55,20 +55,20 @@
* 闆嗗洟鍒嗙被鏈嶅姟
*/
@Autowired(required = false)
- private IDockingPreClassifyService dockingPreClassifyService;
+ private com.vci.ubcs.code.webservice.service.IDockingPreClassifyService dockingPreClassifyService;
/***
* 鐢宠鍗曟湇鍔�
*/
@Autowired(required = false)
- private IDockingPreApplyFormService dockingPreApplyFormService;
+ private com.vci.ubcs.code.webservice.service.IDockingPreApplyFormService dockingPreApplyFormService;
/***
* 妯″瀷瑙嗗浘鍗曟湇鍔�
*/
@Autowired(required = false)
- private IDockingPreViewModelService dockingPreViewModelService;
+ private com.vci.ubcs.code.webservice.service.IDockingPreViewModelService dockingPreViewModelService;
/***
@@ -80,14 +80,14 @@
* 灞炴�у彇鍊艰寖鍥存湇鍔�
*/
@Autowired(required = false)
- private IDockingPreAttrRangeService dockingPreAttrRangeService;
+ private com.vci.ubcs.code.webservice.service.IDockingPreAttrRangeService dockingPreAttrRangeService;
/***
* 闆嗗洟灞炴�ф湇鍔�
*/
@Autowired(required = false)
- private IDockingPreMetaAttrService dockingPreMetaAttrService;
+ private com.vci.ubcs.code.webservice.service.IDockingPreMetaAttrService dockingPreMetaAttrService;
@Autowired(required = false)
private IMdmEngineClient mdmEngineClient;
--
Gitblit v1.9.3