From e9b405657b6117a8dcfcf8505cfd5d6eccd39cc8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 30 五月 2023 18:32:57 +0800
Subject: [PATCH] code服务中部分do转vo时显示值转换改为缓存中拿值
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/EnumitemWrapper.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java | 8
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java | 7
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeShowFieldConfigService.java | 23
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeSrchCondConfigMapper.xml | 330 --------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeSrchCondConfigMapper.java | 66 -
Source/UBCS-WEB/vue.config.js | 6
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java | 9
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java | 10
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeShowFieldConfigMapper.java | 65 -
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 57 +
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeOsattributeEntity.java | 1
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeShowFieldConfigVO.java | 5
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeSrchCondConfigService.java | 32
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java | 33
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateAttrWrapper.java | 9
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml | 6
Source/UBCS-WEB/src/components/code-dialog-page/referConfigCrudDialog.vue | 283 +++++--
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/enums/EnumEnum.java | 53 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeOsattributeService.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java | 56 -
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml | 140 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeBasicSecMapper.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java | 31
Source/UBCS-WEB/src/views/code/code.vue | 64
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempbuttonWrapper.java | 7
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java | 12
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeOsbtmtypeattributeEntity.java | 1
Source/UBCS-WEB/src/components/advanced-query/advanced-query.vue | 13
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 304 ++++---
Source/UBCS-WEB/src/const/code/selectAttrOptionDialog.js | 6
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeShowFieldConfigMapper.xml | 384 ---------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 18
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java | 12
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java | 22
/dev/null | 43 -
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateWrapper.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferConfigService.java | 8
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java | 36
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java | 22
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java | 110 +-
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/EnumCache.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java | 5
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyProcessTempWrapper.java | 11
45 files changed, 857 insertions(+), 1,461 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advanced-query.vue b/Source/UBCS-WEB/src/components/advanced-query/advanced-query.vue
new file mode 100644
index 0000000..17bcab3
--- /dev/null
+++ b/Source/UBCS-WEB/src/components/advanced-query/advanced-query.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigCrudDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigCrudDialog.vue
index 54f330f..a992916 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigCrudDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigCrudDialog.vue
@@ -8,7 +8,7 @@
style="height: 115vh; margin-top: -14vh; overflow-y: hidden">
<div style="width: 100%; overflow-y: auto; height: 70vh">
<el-row style="width: 100%; height:70%">
- <el-col :style="toggleCrudWidth">
+ <el-col :style="toggleBasicCrudWidth">
<basic-container style="width: 100%;">
<avue-crud :option="referConfigCrudOption"
class="refer-config-crud"
@@ -42,8 +42,9 @@
</basic-container>
</el-col>
</el-row>
- <el-row style="width: 100%; height:30%; margin-top: 130px" v-show="srchCondParams.isShow && showAttrParams.isShow">
- <el-col v-show="srchCondParams.isShow" style="width: 40%;">
+ <el-row style="width: 100%; height:30%; margin-top: 130px">
+ <el-col
+ :style="toggleSrchCrudWidth">
<basic-container style="width: 100%; height:100%;">
<avue-crud :option="srchCondOption"
class="refer-srchcond-crud"
@@ -53,7 +54,7 @@
</avue-crud>
</basic-container>
</el-col>
- <el-col v-show="showAttrParams.isShow" style="width: 60%;">
+ <el-col v-show="showAttrParams.isShow" style="width: 60%; height: 100%;">
<basic-container style="width: 100%; height:100%;">
<avue-crud :option="showAttrOption"
class="refer-attr-crud"
@@ -121,7 +122,7 @@
},{
label: '鍙傜収鐨勪笟鍔＄被鍨�',
search: false,
- prop: 'referType'
+ prop: 'referTypeName'
},{
label: '鏄剧ず鐨勫睘鎬�',
search: false,
@@ -156,67 +157,67 @@
emptyBtn: false,
labelWidth: '150', //榛樿鏍囩瀹藉害
// 榛樿閰嶇疆灏变负鏍戝舰绫诲瀷锛屾敼浜嗕細鍑虹幇闂
- column: [{
- label: '鏍戝舰鐨勪笂绾у睘鎬�',
- prop: 'parentFieldName',
- span: 24,
- disabled: true,
- row: true,
- placeholder: ' ',
- },{
- label: '涓婄骇灞炴�у�煎搴斿睘鎬�',
- prop: 'parentUsedField',
- span: 24,
- disabled: true,
- row: true,
- placeholder: ' ',
- },{
- label: '鏍硅妭鐐圭殑鍊�',
- prop: 'parentValue',
- span: 24,
- disabled: true,
- row: true,
- placeholder: ' ',
- },
- {
- label: '鏍戝姞杞芥柟寮�',
- prop: 'loadType',
- span: 24,
- disabled: true,
- row: true,
- placeholder: ' ',
- dicData: [{
- label: '鍏ㄩ儴', value: 'all'
- }, {
- label: '閫愮骇鍔犺浇', value: 'node'
- }],
- },{
- label: '鏄惁鍙兘閫夋嫨鍙跺瓙鑺傜偣',
- prop: 'onlyLeaf',
- span: 24,
- disabled: true,
- row: true,
- placeholder: ' ',
- },{
- label: '鎺掑簭瀛楁',
- prop: 'sortField',
- span: 24,
- disabled: true,
- row: true,
- placeholder: ' ',
- },{
- label: '鎺掑簭绫诲瀷',
- prop: 'sortType',
- span: 24,
- disabled: true,
- row: true,
- placeholder: ' ',
- dicData: [{
- label: '鍗囧簭', value: 'asc'
- }, {
- label: '闄嶅簭', value: 'desc'
- }],
- },
+ column: [
+ {
+ label: '鏍戝舰鐨勪笂绾у睘鎬�',
+ prop: 'parentFieldName',
+ span: 24,
+ disabled: true,
+ row: true,
+ placeholder: ' ',
+ },{
+ label: '涓婄骇灞炴�у�煎搴斿睘鎬�',
+ prop: 'parentUsedField',
+ span: 24,
+ disabled: true,
+ row: true,
+ placeholder: ' ',
+ },{
+ label: '鏍硅妭鐐圭殑鍊�',
+ prop: 'parentValue',
+ span: 24,
+ disabled: true,
+ row: true,
+ placeholder: ' ',
+ },{
+ label: '鏍戝姞杞芥柟寮�',
+ prop: 'loadType',
+ span: 24,
+ disabled: true,
+ row: true,
+ placeholder: ' ',
+ dicData: [{
+ label: '鍏ㄩ儴', value: 'all'
+ }, {
+ label: '閫愮骇鍔犺浇', value: 'node'
+ }],
+ },{
+ label: '鏄惁鍙兘閫夋嫨鍙跺瓙鑺傜偣',
+ prop: 'onlyLeaf',
+ span: 24,
+ disabled: true,
+ row: true,
+ placeholder: ' ',
+ },{
+ label: '鎺掑簭瀛楁',
+ prop: 'sortField',
+ span: 24,
+ disabled: true,
+ row: true,
+ placeholder: ' ',
+ },{
+ label: '鎺掑簭绫诲瀷',
+ prop: 'sortType',
+ span: 24,
+ disabled: true,
+ row: true,
+ placeholder: ' ',
+ dicData: [{
+ label: '鍗囧簭', value: 'asc'
+ }, {
+ label: '闄嶅簭', value: 'desc'
+ }],
+ },
],
},
referConfigForm:{},
@@ -371,6 +372,10 @@
srchCondData: [],
isShow: true,
},
+ toggleSrchCrudWidth: {
+ width: '40%',
+ height: '100%',
+ },
//鏄剧ず鐨勫睘鎬ц〃鏍奸厤缃尯鍩�
showAttrOption: {
@@ -409,19 +414,19 @@
prop: 'title'
},{
label: '瀛楁绫诲瀷',
- prop: 'fieldType'
+ prop: 'fieldTypeText'
},{
label: '鍒楄〃鍙帓搴�',
prop: 'sort'
},{
label: '鎺掑簭瀛楁',
- prop: 'sortField'
+ prop: 'attrSortField'
},{
label: '瀛楁瀹藉害',
prop: 'width'
},{
label: '鍒楀浐瀹氫綅缃�',
- prop: 'fixedText'
+ prop: 'fixedPositionText'
},{
label: 'js鏄剧ず浠ｇ爜',
prop: 'templet'
@@ -442,10 +447,14 @@
// 鏄惁鏄剧ず鍙樺姩鐨勮〃鍗曞尯鍩�
isShowForm: true,
- toggleCrudWidth: {
+ toggleBasicCrudWidth: {
height: '100%',
width: '70%',
},
+
+ // 鏄惁鏄剧ず灞炴�ц〃鏍�
+ isShowAttrCrud: true,
+
defaultOrGridForm: ['limit','sortField','sortType'],
standForm: ['referContent','displayTable'],
treeForm: [
@@ -469,11 +478,107 @@
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹紒");
return;
}
+ let filterForm = this.filterForm(currentSeletedRow);
if(condition == "selectedSave"){
- //console.log(currentSeletedRow);
+ // 鐩存帴淇濆瓨,鎵�浠ョ洿鎺ヨ皟鐢╟ode鐣岄潰鐨勭晫闈㈠洖鏄�
+ this.$emit('echoReferConfig',filterForm);
+ // console.log(filterForm);
}else {
- //console.log(currentSeletedRow);
+ // 閫夋嫨骞朵慨鏀�,鎵цcode鏈嶅姟涓殑鎵撳紑鐣岄潰锛屾墍浠ヨ鍏堟瀯閫犲嚭鎵�闇�鐨勬暟鎹�
+ let submitForm = {
+ referBtmName: filterForm.referType,
+ referBtmId: filterForm.referTypeName,
+ referConfig: JSON.stringify(filterForm),
+ }
+ this.$emit('openReconfigInterFace',submitForm);
}
+ this.isShowReferConfigCrud = false;
+ },
+ // 杩囨护鍑哄綋鍓嶇被鍨嬫墍闇�瑕佺殑灞炴��
+ filterForm(currentRow){
+ // 闇�瑕佷繚鐣欑殑鍩虹灞炴��
+ let submittDefaultForm = [
+ 'referTypeName',
+ 'referType',
+ 'textField',
+ 'valueField',
+ 'type', //鍙傜収绐楀彛绫诲瀷
+ 'url',
+ 'backPath',
+ 'method',
+ 'height',
+ 'useFormKey',
+ 'paramForFormKey',
+ 'isMuti',
+ 'mapFields',
+ 'isOpenGlobal', //鏄惁寮�鍚叏灞�
+ 'isPersistence',
+ 'id',
+ 'name',
+ ];
+ // 闇�瑕佹牴鎹被鍨嬫坊鍔犵殑灞炴��
+ let addArray = [];
+ let newForm ={};
+ // 鏍规嵁涓嶅悓绫诲瀷杩囨护鍑轰笉鍚岀殑鐨勮〃鍗曞睘鎬�
+ if(currentRow.type == 'stand'){
+ addArray = ['referContent', 'displayTable'];
+ } else if(currentRow.type == 'default' || currentRow.type == 'grid'){
+ addArray = ['limit', 'sortField', 'sortType'];
+ } else if(currentRow.type == 'tree'){
+ addArray = [
+ "parentFieldName",
+ 'parentUsedField',
+ 'parentValue',
+ 'loadType',
+ 'onlyLeaf',
+ 'sortField',
+ 'sortType'
+ ];
+ }
+ // 鎷兼帴涓や釜鏁扮粍
+ submittDefaultForm = submittDefaultForm.concat(addArray);
+ if(currentRow.codeSrchCondConfigVOS.length > 0){
+ //console.log(currentRow.codeSrchCondConfigVOS);
+ newForm = {
+ codeSrchCondConfigVOS: currentRow.codeSrchCondConfigVOS,
+ }
+ }
+ if((currentRow.type == 'default' || currentRow.type == 'grid') && currentRow.codeShowFieldConfigVOS.length >= 0){
+ newForm = Object.assign(newForm,{codeShowFieldConfigVOS: currentRow.codeShowFieldConfigVOS});
+ }
+ // 杩囨护鍑虹┖鍊煎睘鎬у拰涓嶉渶瑕佺殑灞炴��
+ submittDefaultForm.forEach(item=>{
+ // console.log(!this.checkStringIsEmpty(currentRow[item]) || !this.checkArrayIsUndefined(currentRow[item]));
+ if((item == 'isMuti' || item == 'onlyLeaf') || (!this.checkStringIsEmpty(currentRow[item]) || !this.checkArrayIsUndefined(currentRow[item]))){
+ //console.log(item,currentRow[item]);
+ newForm = Object.assign(newForm,{[item]:currentRow[item]});
+ }
+ });
+ // console.log(newForm);
+ return newForm;
+ },
+ /**
+ * 涓虹┖
+ * @param val
+ * @returns {boolean}
+ */
+ checkStringIsEmpty(val){
+ if (
+ val === null ||
+ typeof val === 'undefined' ||
+ (typeof val === 'string' && val === "" && val !== 'undefined')
+ ) {
+ return true;
+ }
+ return false;
+ },
+ /**
+ * 鏄惁涓哄畾涔�
+ * @param val
+ * @returns {boolean}
+ */
+ checkArrayIsUndefined(val){
+ return typeof val === 'array' && (val.length === 0 || val === null || typeof val === 'undefined' || val === []);
},
referConfigOnload(){
let refer = this.referConfigParams;
@@ -494,12 +599,16 @@
this.referConfigParams.referConfigPage.total = data.total;
this.referConfigParams.referConfigData = data.records;
this.referConfigParams.referConfigLoading = false;
- //console.log(this.referConfigParams.referConfigData.length > 0);
+ //console.log(this.referConfigParams.referConfigData.length > 0);
+ // 娓叉煋鍏朵粬鍖哄煙鏁版嵁
if(this.referConfigParams.referConfigData.length > 0) {
this.$nextTick(() => {
+ // 琛ㄦ牸閿欒闂
this.$refs[this.referConfigParams.ref].doLayout()
+ // 榛樿閫変腑绗竴琛�
this.referConfigParams.referConfigSelectedRow = 0;
this.$refs[this.referConfigParams.ref].setCurrentRow(this.referConfigParams.referConfigData[0]);
+ this.referConfigParams.referConfigSelectedRowData = this.referConfigParams.referConfigData[0];
this.attrAndSrchCondOnload(this.referConfigParams.referConfigData[0]);
this.loadDefaultOrGridOrStandOrTreeForm(this.referConfigParams.referConfigData[0]);
})
@@ -544,14 +653,15 @@
currentFormData.type != 'grid') {
//鎺у埗鍙傜収閰嶇疆琛ㄦ牸鍜岃〃鍗曟樉绀烘瘮渚�
this.isShowForm = false;
- this.toggleCrudWidth.width = '100%';
+ this.toggleBasicCrudWidth.width = '100%';
}else {
this.isShowForm = true;
- this.toggleCrudWidth.width = '70%';
+ this.toggleBasicCrudWidth.width = '70%';
this.toggleFormOption(currentFormData);
}
+ this.toggleCurdWidth(currentFormData);
//console.log(this.isShowForm);
- //console.log(this.toggleCrudWidth.width);
+ //console.log(this.toggleBasicCrudWidth.width);
},
// 鏍规嵁type鐨勫彉鍔ㄥ垏鎹㈣〃鍗曠殑閰嶇疆option
@@ -560,7 +670,7 @@
let currentForm = '';
if(data.type=='default' || data.type=='grid'){
this.formOption.column = this.sortColumn;
- currentForm = 'defaultOrGridForm'
+ currentForm = 'defaultOrGridForm';
}else if(data.type == 'stand'){
this.formOption.column = this.standColumn;
currentForm = 'standForm';
@@ -569,12 +679,26 @@
currentForm = 'treeForm'
}
this.referConfigForm = {},
- console.log( this.formOption);
+ //console.log( this.formOption);
this[currentForm].forEach(item=>{
Vue.set(this.referConfigForm, item, data[item])
//this.referConfigForm = Object.assign(this.referConfigForm,{[item]:data[item]})
})
- console.log(this.referConfigForm);
+ // console.log(this.referConfigForm);
+ },
+ // 鏍规嵁type鐨勫彉鍔ㄥ垏鎹ttr琛ㄦ牸鐨勬樉绀洪殣钘忥紝璋冩暣鏌ヨ鏉′欢琛ㄦ牸鐨勫搴�
+ toggleCurdWidth(data) {
+ if(data.type=='default' || data.type=='grid'){
+ this.showAttrParams.isShow = true;
+ // 涓嶉渶瑕佹樉绀哄睘鎬ц〃鏍兼墍鏈夐渶瑕佸皢鏌ヨ璋冧环琛ㄦ牸缂╁皬涓�100%
+ this.toggleSrchCrudWidth.width = '40%';
+ }else {
+ this.showAttrParams.isShow = false;
+ // 涓嶉渶瑕佹樉绀哄睘鎬ц〃鏍兼墍鏈夐渶瑕佸皢鏌ヨ璋冧环琛ㄦ牸缂╁皬涓�100%
+ this.toggleSrchCrudWidth.width = '100%';
+ }
+ // console.log(this.toggleSrchCrudWidth);
+ // console.log(this.showAttrParams.isShow);
},
// 鏄剧ず鐨勫睘鎬у拰鏌ヨ鏉′欢鐩稿叧鏂规硶
@@ -587,6 +711,7 @@
});
this.srchCondParams.srchCondData = row.codeSrchCondConfigVOS
this.showAttrParams.showAttrData = row.codeShowFieldConfigVOS
+ //console.log(this.showAttrParams.showAttrData);
this.srchCondParams.srchCondLoading = false;
this.showAttrParams.showAttrLoading = false;
},
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
index 8fd0a67..24293a2 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -64,7 +64,7 @@
class="crud-attr"
:option="attrOption"
@cell-click="clickAttrEdit"
- :data="attrData">
+ :data="codeShowFieldConfigVOS">
<!-- 琛ㄦ牸鍐呮搷浣滄寜閽� -->
<template slot="menu" slot-scope="scope">
<el-button type="text"
@@ -90,7 +90,7 @@
</el-button>
<div class="tag-group" style="display: inline">
<el-tag
- v-for="item in attrData"
+ v-for="item in codeShowFieldConfigVOS"
v-show="item.isquery && item.title!=''"
style="margin-left: 3px"
:key="item.title"
@@ -105,12 +105,12 @@
</el-row>
</el-tab-pane>
<el-tab-pane name="second">
- <span slot="label"><i class="el-icon-search"></i>鏌ヨ鏉′欢娣诲姞</span>
+ <span slot="label"><i class="el-icon-search"></i>娣诲姞鏌ヨ鏉′欢</span>
<avue-crud
ref="crudAddCondition"
:option="addSearchCondtionOption"
@cell-click="clickAddSearchCondtionEdit"
- :data="addSearchCondtionData">
+ :data="form.codeSrchCondConfigVOS">
<!-- 琛ㄦ牸鍐呮搷浣滄寜閽� -->
<template slot="menu" slot-scope="scope">
<el-button type="text"
@@ -276,6 +276,11 @@
paramForFormKey: '',
isMuti: false,
mapFields: '',
+ isOpenGlobal: true, //鏄惁寮�鍚叏灞�
+ codeSrchCondConfigVOS: [],
+ isPersistence: true, // 鏄惁鎸佷箙鍖�
+ id: '',
+ name: '',
// 鏌ヨ鏉′欢鍒楄〃
// limit: '15',
// sortField: '',
@@ -288,7 +293,21 @@
// loadType: 'all',
// onlyLeaf: false,
},
- attrData: [],
+ // type鍒囨崲鏃跺form琛ㄥ崟灞炴�ц繘琛岀Щ闄�
+ removeFormAttr: [
+ 'limit',
+ 'sortField',
+ 'sortType',
+ 'parentFieldName',
+ 'parentUsedField',
+ 'parentValue',
+ 'loadType',
+ 'onlyLeaf',
+ 'sortType',
+ 'referContent',
+ 'displayTable',
+ ],
+ codeShowFieldConfigVOS: [],
attrOption: {
height:'180',
tip: false,
@@ -353,7 +372,7 @@
blur: (value) => this.updateAttrBlur(value),
},{
label: "鎺掑簭瀛楁",
- prop: "sortField",
+ prop: "attrSortField",
cell: true,
clearable: false,
blur: (value) => this.updateAttrBlur(value),
@@ -365,7 +384,7 @@
blur: (value) => this.updateAttrBlur(value),
},{
label: "鍒楀浐瀹氫綅缃�",
- prop: "fixedText",
+ prop: "fixedPosition",
cell: true,
type:"select",
clearable: false,
@@ -381,7 +400,7 @@
},
]
},
- addSearchCondtionData: [],
+ // addSearchCondtionData: [],
addSearchCondtionOption: {
height:'150',
tip: false,
@@ -434,6 +453,7 @@
}
]
},
+ // 涓や釜琛ㄥ崟鐨剅ef
formRefs: ['form','otherForm'],
// tabs鎺у埗
@@ -677,7 +697,7 @@
icon: 'el-icon-info',
label: '蹇呭～鐨勫弬鐓ч厤缃�',
collapse: true,
- labelWidth: '110',
+ labelWidth: '115',
prop: 'groupDdefaultOrGrid',
column: [
{
@@ -769,23 +789,11 @@
trigger: "blur",
}],
change: ({ value, column }) => {
+ // console.log("start",value);
// 澶嶅師琛ㄥ崟,鍥犱负鍏朵粬鍒嗙粍涓鏋滃瓨鍦ㄥ�硷紝鍦ㄥ垏鎹㈡椂,浼氫繚鐣欒緭鍏ョ殑瀛楁鍊兼墍浠ラ渶瑕佽繕鍘�
- let oldForm = this.form;
- this.form = {}; // 琛ㄥ崟瀵硅薄璧嬬┖
- this.form.referType = oldForm.referType
- this.form.textField = oldForm.textField
- this.form.valueField = oldForm.valueField
- this.form.type = oldForm.type //鍙傜収绐楀彛绫诲瀷
- this.form.url = oldForm.url
- this.form.backPath = oldForm.backPath
- this.form.method = oldForm.method
- this.form.height = oldForm.height
- this.form.useFormKey = oldForm.useFormKey
- this.form.paramForFormKey = oldForm.paramForFormKey
- this.form.isMuti = oldForm.isMuti
- this.form.mapFields = oldForm.mapFields
- let addFrom = {}; //鏍规嵁绫诲瀷闇�瑕佹坊鍔犵殑涓嶅悓灞炴��
- this.activeName = 'first';
+ let addFrom = {};
+ this.activeName = 'first'; // 榛樿鍒囨崲鑷崇涓�涓猼ab
+ //鏍规嵁绫诲瀷瀵筬orm琛ㄥ崟灞炴�ц繘琛岃皟鏁�
if(value == 'stand'){
addFrom = {
referContent: '',
@@ -809,72 +817,108 @@
sortField: '',
sortType: 'asc',
};
- console.log('tree');
+ // 涓嶇煡閬撲负浠�涔坱ype涓簍ree鐨勬椂鍊欎細瑙﹀彂涓ゆchange浜嬩欢
+ // 瀵艰嚧type鍒囨崲澶辫触
+ this.form.type = 'tree';
this.isDisabledTabs = false;
}else {
this.isDisabledTabs = true;
this.activeName = 'second';
}
+ // 绫诲瀷鍒囨崲鏃讹紝瀵逛笉闇�瑕佺殑灞炴�ц繘琛岀瓫闄�
+ this.removeFormAttr.forEach(attr=>{
+ // console.log(attr);
+ this.$delete(this.form,attr)
+ })
// 鍚堝苟涓や釜琛ㄥ崟
this.form = Object.assign(addFrom,this.form);
+ // console.log("endFilter",this.form.type);
//console.log(this.form);
},
+ },{
+ label: '鏄惁寮�鍚寔涔呭寲',
+ prop: 'isPersistence',
+ tip: 'true:寮�鍚寔涔呭寲锛屽褰撳墠瀹氫箟鐨勫弬鐓ч厤缃繘琛屾寔涔呭寲瀛樺偍锛屼笅娆″彲鐩存帴閫夊彇锛沠alse:浠呭褰撳墠娆＄爜娈垫柊澧炵敓鏁堛��',
+ tipPlacement: 'bottom',
+ span: 6,
+ type: 'switch',
+ },{
+ display: this.form.isPersistence | this.form.isPersistence=='true',
+ label: '缂栧彿',
+ prop: 'id',
+ rules: [{
+ required: true,
+ message: "(寮�濮嬫寔涔呭寲鏃剁紪鍙�)蹇呭～椤逛笉鑳戒负绌�",
+ trigger: "blur",
+ }],
+ span: 6,
+ },{
+ display: this.form.isPersistence | this.form.isPersistence=='true',
+ label: '鍚嶇О',
+ prop: 'name',
+ rules: [{
+ required: true,
+ message: "(寮�濮嬫寔涔呭寲鏃跺悕绉�)蹇呭～椤逛笉鑳戒负绌�",
+ trigger: "blur",
+ }],
+ span: 6,
}
+
]
},
{
- //display: this.form.type=='default'||this.form.type=='grid',
icon: 'el-icon-info',
label: '椤甸潰鍙傛暟閰嶇疆',
collapse: false,
prop: 'webConfig',
- column: [{
- label: '绐楀彛鏄剧ず鐨勯珮搴�',
- prop: 'height',
- tip: '榛樿绌虹潃锛岃缃悗琛ㄧず寮哄埗鏄剧ず杩欐牱鐨勯珮搴�',
- tipPlacement: 'right',
- span: 7,
- rules:[{
- validator: validateNumber,
- message: "绐楀彛鏄剧ず鐨勯珮搴﹀繀椤讳负鏁板�肩被鍨�",
- trigger: "blur",
- }]
- },{
- label: '杩囨护(绾ц仈)灞炴��',
- prop: 'useFormKey',
- tip: '鑾峰彇琛ㄥ崟涓婄殑鍏朵粬灞炴�х殑灞炴�х殑鍊兼潵杩囨护,鎴栬�呬娇鐢ㄦ煇涓睘鎬ф潵绾ц仈閫夋嫨',
- tipPlacement: 'right',
- span: 7,
- },{
- label: '杩囨护灞炴�ц姹傚弬鏁�',
- prop: 'paramForFormKey',
- tip: '浣跨敤杩囨护灞炴�ф椂锛屽彂閫佺粰鍚庡彴鐨勮姹傚弬鏁�',
- tipPlacement: 'right',
- span: 7,
- },{
- label: '鏄犲皠鍏朵粬灞炴��',
- prop: 'mapFields',
- tip: '閫夋嫨鏁版嵁鍚庯紝灏嗛�夋嫨鐨勬暟鎹嫹璐濆埌琛ㄥ崟閲岀殑鍏朵粬灞炴�э紝涔﹀啓鏍煎紡涓簕褰撳墠琛ㄥ崟涓婄殑灞炴��:閫夋嫨鏁版嵁閲岀殑灞炴��,XXXXx:yyyy}',
- tipPlacement: 'right',
- span: 7,
- },{
- label: '鏄惁寮�鍚叏灞�',
- prop: 'isOpenGlobal',
- tip: '寮�鍚叏灞�涔嬪悗瀵瑰叏閮ㄥ弬鐓ч厤缃暟鎹繘琛屾煡璇紝榛樿鏍规嵁绉熸埛杩涜鏌ヨ銆�',
- tipPlacement: 'right',
- type: 'switch',
- span: 7,
- },{
- label: '鏄惁澶氶��',
- type: 'switch',
- prop: 'isMuti',
- value: false,
- span: 7,
- row: true,
- }]
+ column: [
+ {
+ label: '绐楀彛鏄剧ず鐨勯珮搴�',
+ prop: 'height',
+ tip: '榛樿绌虹潃锛岃缃悗琛ㄧず寮哄埗鏄剧ず杩欐牱鐨勯珮搴�',
+ tipPlacement: 'right',
+ span: 7,
+ rules:[{
+ validator: validateNumber,
+ message: "绐楀彛鏄剧ず鐨勯珮搴﹀繀椤讳负鏁板�肩被鍨�",
+ trigger: "blur",
+ }]
+ },{
+ label: '杩囨护(绾ц仈)灞炴��',
+ prop: 'useFormKey',
+ tip: '鑾峰彇琛ㄥ崟涓婄殑鍏朵粬灞炴�х殑灞炴�х殑鍊兼潵杩囨护,鎴栬�呬娇鐢ㄦ煇涓睘鎬ф潵绾ц仈閫夋嫨',
+ tipPlacement: 'right',
+ span: 7,
+ },{
+ label: '杩囨护灞炴�ц姹傚弬鏁�',
+ prop: 'paramForFormKey',
+ tip: '浣跨敤杩囨护灞炴�ф椂锛屽彂閫佺粰鍚庡彴鐨勮姹傚弬鏁�',
+ tipPlacement: 'right',
+ span: 7,
+ },{
+ label: '鏄犲皠鍏朵粬灞炴��',
+ prop: 'mapFields',
+ tip: '閫夋嫨鏁版嵁鍚庯紝灏嗛�夋嫨鐨勬暟鎹嫹璐濆埌琛ㄥ崟閲岀殑鍏朵粬灞炴�э紝涔﹀啓鏍煎紡涓簕褰撳墠琛ㄥ崟涓婄殑灞炴��:閫夋嫨鏁版嵁閲岀殑灞炴��,XXXXx:yyyy}',
+ tipPlacement: 'right',
+ span: 7,
+ },{
+ label: '鏄惁寮�鍚叏灞�',
+ prop: 'isOpenGlobal',
+ tip: '寮�鍚叏灞�涔嬪悗瀵瑰叏閮ㄥ弬鐓ч厤缃暟鎹繘琛屾煡璇紝榛樿鏍规嵁绉熸埛杩涜鏌ヨ銆�',
+ tipPlacement: 'right',
+ type: 'switch',
+ span: 7,
+ },{
+ label: '鏄惁澶氶��',
+ type: 'switch',
+ prop: 'isMuti',
+ value: false,
+ span: 7,
+ row: true,
+ }
+ ]
},
{
- //display: this.form.type=='default'||this.form.type=='grid',
icon: 'el-icon-info',
label: '鍚庡彴鍙傛暟閰嶇疆',
collapse: false,
@@ -886,29 +930,29 @@
tip: '閫氬父涓虹┖;濡傛灉鏄垪琛紝鍚庡彴蹇呴』杩斿洖DataGrid锛屽鏋滄槸鏍戯紝鍚庡彴蹇呴』杩斿洖List<Tree>',
tipPlacement: 'right',
span: 7,
- },{
- label: '鏈嶅姟鐨勫湴鍧�',
- prop: 'backPath',
- tip: '閫氬父涓虹┖锛屽湪鏀寔寰湇鍔℃垨鑰呭垎甯冨紡閮ㄧ讲鐨勬椂鍊欐墠閰嶇疆',
- tipPlacement: 'right',
- span: 7,
- },{
- label: '璇锋眰鍚庡彴鐨勫崗璁柟寮�',
- prop: 'method',
- tip: 'HTTP鐨勫崗璁柟寮忥紝鏀寔POST,PUT,GET锛屼竴鑸兘鏄疓ET',
- tipPlacement: 'right',
- span: 7,
- value: 'GET',
- type: 'select',
- dicData: [{
- label:'GET',value: "GET"
},{
- label:'PUT',value: "PUT"
+ label: '鏈嶅姟鐨勫湴鍧�',
+ prop: 'backPath',
+ tip: '閫氬父涓虹┖锛屽湪鏀寔寰湇鍔℃垨鑰呭垎甯冨紡閮ㄧ讲鐨勬椂鍊欐墠閰嶇疆',
+ tipPlacement: 'right',
+ span: 7,
+ },{
+ label: '璇锋眰鍚庡彴鐨勫崗璁柟寮�',
+ prop: 'method',
+ tip: 'HTTP鐨勫崗璁柟寮忥紝鏀寔POST,PUT,GET锛屼竴鑸兘鏄疓ET',
+ tipPlacement: 'right',
+ span: 7,
+ value: 'GET',
+ type: 'select',
+ dicData: [{
+ label:'GET',value: "GET"
+ },{
+ label:'PUT',value: "PUT"
+ },
+ {
+ label:'POST',value: "POST"
+ }],
},
- {
- label:'POST',value: "POST"
- }],
- },
]
},
]
@@ -931,21 +975,21 @@
{
label: '姣忛〉鏄剧ず鏉℃暟',
prop: 'limit',
- span: 7,
+ span: 8,
tip: '鍒嗛〉鏃舵瘡椤垫樉绀虹殑鏁伴噺锛屼笉鍒嗛〉濉�-1',
//value: 15,
tipPlacement: 'right',
},{
label: '鎺掑簭瀛楁',
prop: 'sortField',
- span: 7,
+ span: 8,
tip: '鏌ヨ鏁版嵁鏃剁殑鎺掑簭瀛楁',
//clearable: false,
tipPlacement: 'right',
},{
label: '鎺掑簭绫诲瀷',
prop: 'sortType',
- span: 7,
+ span: 8,
dicData: [{
label: '鍗囧簭', value: 'asc'
}, {
@@ -968,14 +1012,14 @@
{
label: '鍙傝�冪殑UI涓婁笅鏂�',
prop: 'referContent',
- span: 7,
+ span: 8,
tip: '鍙湁鍙傜収绐楀彛绫诲瀷鏄痵tand鏃舵墠蹇呴』璁剧疆,涓斿湪stand绫诲瀷涓嬫墠鑳界敓鏁�',
tipPlacement: 'right',
},
{
label: '骞冲彴鐨勮〃鏍肩紪鍙�',
prop: 'displayTable',
- span: 7,
+ span: 8,
tip: '涓庡弬鐓х殑UI涓婁笅鏂囦簰鏂ワ紝鍙湁鍙傜収绐楀彛绫诲瀷鏄痵tand鏃舵墠蹇呴』璁剧疆锛屼笖鍦╯tand绫诲瀷涓嬫墠鑳界敓鏁�',
tipPlacement: 'right',
},
@@ -1076,8 +1120,7 @@
},
watch: {
// 璐煎潙锛屽垏鎹㈢被鍨嬫椂琛ㄦ牸锛岄殣钘忓啀鏄剧ず灏变細鍑虹幇琛ㄦ牸閿欎綅闂锛�
- 'form.type'(val) {
- //console.log(val);
+ 'form.type'(value) {
this.onloadAttrData();
}
},
@@ -1086,33 +1129,39 @@
// 鍗曞嚮琛ㄦ牸瀹炵幇琛ㄦ牸琛岀紪杈�
clickAttrEdit(row, column, event){
if(this.preClickAttrRow && this.preClickAttrRow != row){
- //console.log(this.attrData[this.preClickAttrRow.$index]);
- this.attrData[this.preClickAttrRow.$index].$cellEdit = false;
+ //console.log(this.codeShowFieldConfigVOS[this.preClickAttrRow.$index]);
+ this.codeShowFieldConfigVOS[this.preClickAttrRow.$index].$cellEdit = false;
}
row.$cellEdit = true;
this.preClickAttrRow = row;
},
// 灞炴�ц〃鏍艰缂栬緫澶卞幓鐒︾偣鏃朵繚瀛樻柟娉�
// updateAttrBlur(value){
- //console.log(this.attrData[0]);
+ //console.log(this.codeShowFieldConfigVOS[0]);
// },
+
// 鍗曞嚮琛ㄦ牸瀹炵幇琛ㄦ牸琛岀紪杈�
clickAddSearchCondtionEdit(row, column, event){
if(this.preClickAddSearchConditionRow && this.preClickAddSearchConditionRow != row){
- //console.log(this.attrData[this.preClickAttrRow.$index]);
- this.addSearchCondtionData[this.preClickAddSearchConditionRow.$index].$cellEdit = false;
+ //console.log(this.codeShowFieldConfigVOS[this.preClickAttrRow.$index]);
+ this.form.codeSrchCondConfigVOS[this.preClickAddSearchConditionRow.$index].$cellEdit = false;
}
row.$cellEdit = true;
this.preClickAddSearchConditionRow = row;
},
//涓婁竴涓〉闈㈠凡缁忛�変腑鍙傜収搴旂敤鐨勪笟鍔＄被鍨嬬殑鎯呭喌锛屽拰涓婁竴娆″凡缁忛厤缃繃鍙傜収閰嶇疆鐨勬儏鍐典笅杩涜椤甸潰鍒濆鍖栨覆鏌�
initPageData(val){
- console.log(val);
+ //console.log(val);
if(func.notEmpty(val.referConfig)){
this.form = JSON.parse(val.referConfig);
- //console.log(val);
+ // console.log(this.form);
+ this.form.isPersistence = this.form.isPersistence == 'true' ? true:false;
+ // 鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬩笉鍙��
this.referTypeIsReadOnly = true;
+ if((this.form.type == 'default' || this.form.type == 'grid') && (this.form.codeShowFieldConfigVOS != undefined && this.form.codeShowFieldConfigVOS.length > 0)){
+ this.codeShowFieldConfigVOS = this.form.codeShowFieldConfigVOS;
+ }
return;
}
if(func.notEmpty(val.referType)){
@@ -1127,7 +1176,6 @@
async selectedListReferConfig(){
// 鏍囪鎵�鏈夎〃鍗曟槸鍚﹂�氳繃鏍￠獙鐨勫彉閲�
let isValid = true;
-
// 閬嶅巻琛ㄥ崟鏁扮粍锛屼緷娆″姣忎釜琛ㄥ崟杩涜鏍￠獙
await this.formRefs.forEach(ref => {
this.$refs[ref].validate((valid, done, msg) => {
@@ -1142,12 +1190,11 @@
done();
})
})
-
// 濡傛灉鎵�鏈夎〃鍗曢兘鏍￠獙閫氳繃锛屾墽琛屾彁浜ゆ搷浣�
if (isValid) {
// 鏍规嵁绫诲瀷瀵筬orm琛ㄥ崟涓殑鍙傛暟杩涜杩囨护锛屽彧淇濈暀闈炵┖涓旈渶瑕佺殑灞炴��
let submitForm = this.filterForm();
- //console.log(submitForm);
+ // console.log(submitForm);
this.$emit('echoReferConfig', submitForm) // 瑙﹀彂update:data灏嗗瓙缁勪欢鍊间紶閫掔粰鐖剁粍浠�
this.isShowReferConfigForm = false;
}
@@ -1155,14 +1202,14 @@
/** 鍏跺疄閫夊彇灞炴�ц〃鏍肩殑榛樿鏁版嵁涓嶉渶瑕佸姞杞斤紝
浣嗘槸寮圭獥鎵撳紑浼氭湁琛ㄦ牸閿欒闂鎵�浠ラ渶瑕佸湪杩欒皟鐢╠oLayout鏂规硶*/
onloadAttrData(){
- this.attrData = [
+ this.codeShowFieldConfigVOS = [
{
field: 'id',
title: '缂栧彿',
fieldType: 'text',
fieldTypeText: '鏂囨湰妗�',
sort: true,
- sortField: 'id',
+ attrSortField: 'id',
width: '150',
isquery: true,
$cellEdit: false
@@ -1172,7 +1219,7 @@
fieldType: 'text',
fieldTypeText: '鏂囨湰妗�',
sort: true,
- sortField: 'name',
+ attrSortField: 'name',
width: '180',
isquery: true,
$cellEdit: false
@@ -1185,10 +1232,10 @@
// 灞炴�ч�夋嫨琛ㄦ牸涓殑绉婚櫎鎸夐挳鍔熻兘
removeCurrentRow(row,condition){
if(condition=='removeAttr'){
- this.$delete(this.attrData, row.$index);
+ this.$delete(this.codeShowFieldConfigVOS, row.$index);
return;
}
- this.$delete(this.addSearchCondtionData, row.$index);
+ this.$delete(this.form.codeSrchCondConfigVOS, row.$index);
},
// 璇ョ晫闈㈢殑鏁版嵁杩涜鍒濆鍖栧鍘�
recoveryDataAndForm(condition){
@@ -1224,7 +1271,9 @@
'paramForFormKey',
'isMuti',
'mapFields',
- 'searchCondition',
+ 'codeSrchCondConfigVOS',
+ 'isOpenGlobal', //鏄惁寮�鍚叏灞�
+ 'isPersistence',
];
let addArray = [];
let newForm ={};
@@ -1244,14 +1293,18 @@
'sortType'
];
}
+ // 寮�鍚寔涔呭寲鍙傜収閰嶇疆
+ if(oldForm.isPersistence=='true' | oldForm.isPersistence){
+ submittDefaultForm = submittDefaultForm.concat(['id','name'])
+ }
submittDefaultForm = submittDefaultForm.concat(addArray);
- if(!this.checkArrayIsUndefined(this.addSearchCondtionData)){
+ if(!this.checkArrayIsUndefined(this.form.codeSrchCondConfigVOS)){
newForm = {
- searchCondition: this.addSearchCondtionData,
+ codeSrchCondConfigVOS: this.form.codeSrchCondConfigVOS,
}
}
- if((oldForm.type == 'default' || oldForm.type == 'grid') && (this.attrData.length >= 0 && !this.checkArrayIsUndefined(this.addSearchCondtionData))){
- newForm = Object.assign(newForm,{attrData:this.attrData});
+ if((oldForm.type == 'default' || oldForm.type == 'grid') && (this.codeShowFieldConfigVOS.length >= 0 && !this.checkArrayIsUndefined(this.codeShowFieldConfigVOS))){
+ newForm = Object.assign(newForm,{codeShowFieldConfigVOS:this.codeShowFieldConfigVOS});
}
// 杩囨护鍑虹┖鍊煎睘鎬у拰涓嶉渶瑕佺殑灞炴��
submittDefaultForm.forEach(item=>{
@@ -1261,7 +1314,7 @@
newForm = Object.assign(newForm,{[item]:oldForm[item]});
}
});
- // console.log(newForm);
+ //console.log(newForm);
return newForm;
},
/**
@@ -1488,14 +1541,14 @@
}
//this.showFieldSelectList;
this.showFieldSelectList.forEach(item => {
- this.attrData.push(
+ this.codeShowFieldConfigVOS.push(
{
field: item.id,
title: item.id,
fieldType: item.attrType,
fieldTypeText: item.attrTypeText,
sort: false,
- sortField: item.id,
+ attrSortField: item.id,
width: item.attrLength,
isquery: false,
$cellEdit: false
@@ -1550,16 +1603,17 @@
this.sortFieldOnLoad();
},
selectedSearchCondition(){
- console.log(this.searchConditionSelectList);
+ // console.log(this.searchConditionSelectList);
if(this.searchConditionSelectList.length <= 0) {
this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�");
return;
}
this.searchConditionSelectList.forEach(item => {
- this.addSearchCondtionData.push(
+ this.form.codeSrchCondConfigVOS.push(
{
filterField: item.id,
filterType: '=',
+ filterTypeText: item.name,
filterValue: '',
$cellEdit: false
}
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/tableEdit.vue b/Source/UBCS-WEB/src/components/code-dialog-page/tableEdit.vue
deleted file mode 100644
index c8e44ad..0000000
--- a/Source/UBCS-WEB/src/components/code-dialog-page/tableEdit.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
- <div>
- <el-table :data="tableOptions.tableData" @cell-click="cellCilck" @cell-mouse-leave="cellMouseLeave" height="250" border style="width: 100%">
- <el-table-column v-for="(item,index) in tableOptions.options" :key="index" align="center"
- :prop="item.prop" :label="item.label" :width="item.labelWidth">
- <template slot-scope="{row}">
- <!-- 鑷畾涔夌殑瀛楁 -->
- <div v-if="item.isSlot">
- <slot :name="item.prop" :row="row"></slot>
- </div>
- <div v-else>
- <el-input v-if="row.isClickProperty == item.prop" v-model="row[item.prop]" placeholder="璇疯緭鍏ュ唴瀹�" @change="valChange"></el-input>
- <span v-else>{{row[item.prop]}}</span>
- </div>
- </template>
- <!-- 琛ㄦ牸鍐呮搷浣滄寜閽� -->
- <template slot="menu" slot-scope="{scope}">
- <el-button type="text"
- size="small"
- icon="el-icon-search"
- plain
- @click="scope.row.isquery=!scope.row.isquery">
- {{scope.row.isquery ? "鍙栨秷蹇�熸煡璇�":"蹇�熸煡璇�"}}
- </el-button>
- <el-button type="text"
- size="small"
- icon="el-icon-minus"
- plain
- @click="removeCurrentRow(scope.row,'removeAttr')">绉婚櫎
- </el-button>
- </template>
- <!-- 琛ㄦ牸宸︿笂鏂规寜閽尯鍩� -->
- <template slot="menuLeft" slot-scope="scope">
- <el-button type="primary"
- size="small"
- icon="el-icon-plus"
- @click="openSelectionTable('selectAttr')">閫夋嫨灞炴��
- </el-button>
- <div class="tag-group" style="display: inline">
- <el-tag
- v-for="item in attrData"
- v-show="item.isquery && item.title!=''"
- style="margin-left: 3px"
- :key="item.title"
- type="info"
- size="small"
- effect="dark">
- {{ item.title }}
- </el-tag>
- </div>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </template>
- <script>
- export default {
- name: "tableEdit",
- props:{
- tableOptions:{
- type:Object,
- default(){
- return {}
- }
- }
- },
- data(){
- return{}
- },
- methods:{
- //鍗曞嚮鍗曞厓鏍煎紑鍚紪杈�
- cellCilck(row, column, cell, event){
- this.$set(row, "isClickProperty", column.property);
- console.log(row,column,cell,event);
- },
- //榧犳爣绂诲紑鍗曞厓鏍硷紝缂栬緫鍏抽棴
- cellMouseLeave(row){
- this.$set(row, "isClickProperty", "");
- },
- //缂栬緫鍗曞厓鏍煎�煎彉鍖�
- valChange(val){
- this.$emit("editTable",val)
- }
- }
- }
- </script>
-
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/const/code/selectAttrOptionDialog.js b/Source/UBCS-WEB/src/const/code/selectAttrOptionDialog.js
index 2437b44..c03a7aa 100644
--- a/Source/UBCS-WEB/src/const/code/selectAttrOptionDialog.js
+++ b/Source/UBCS-WEB/src/const/code/selectAttrOptionDialog.js
@@ -11,6 +11,8 @@
viewBtn: false,
selection: true,
menu: false,
+ columnBtn: false,
+ searchShowBtn: false, // 琛ㄦ牸鎼滅储鏄鹃殣鎸夐挳
dialogClickModal: false,
highlightCurrentRow: true,
column: [
@@ -30,12 +32,12 @@
},
{
label: "灞炴�ч暱搴�",
- prop: "attrLength",
+ prop: "attrlength",
search: false,
},
{
label: "灞炴�х被鍨�",
- prop: "attributeDataTypeText",
+ prop: "attributedatatypetext",
search: false,
}
]
diff --git a/Source/UBCS-WEB/src/const/code/selectattroption.js b/Source/UBCS-WEB/src/const/code/selectattroption.js
deleted file mode 100644
index 6aa7405..0000000
--- a/Source/UBCS-WEB/src/const/code/selectattroption.js
+++ /dev/null
@@ -1,43 +0,0 @@
-export default {
- with: '60%',
- calcHeight: 30,
- tip: false,
- editBtn: false,
- addBtn: false,
- searchShow: true,
- searchMenuSpan: 5,
- disablePage: false,
- border: true,
- index: true,
- viewBtn: false,
- selection: true,
- menu: false,
- dialogClickModal: false,
- highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
- column: [
- {
- label: "灞炴�ц嫳鏂囧悕绉�",
- prop: "id",
- search: true,
- searchLabelWidth: 100,
- searchSpan: 7,
- },
- {
- label: "灞炴�т腑鏂囧悕绉�",
- prop: "name",
- search: true,
- searchLabelWidth: 100,
- searchSpan: 7,
- },
- {
- label: "灞炴�ч暱搴�",
- prop: "description",
- search: false,
- },
- {
- label: "灞炴�х被鍨�",
- prop: "attributeDataTypeText",
- search: false,
- }
- ]
-}
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 5703cc0..7ca7a33 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -259,7 +259,7 @@
size="small"
icon="el-icon-plus"
:disabled="selectionList.length <= 0"
- @click="addBasicCodeSec">
+ @click="openAddBasicCodeSec">
鏂� 澧�
</el-button>
<el-button type="danger"
@@ -680,7 +680,7 @@
:option="attrOption"
:table-loading="selectAttrOptionLoading"
ref="selectionAttrCrud"
- @search-change="selectAttrOptionSearchChange"
+ @search-change="selectAttrSearchChange"
@search-reset="searchAttrReset"
@row-click="selectionAttrRowClick"
@selection-change="selectionChangeAttr">
@@ -760,11 +760,13 @@
<!-- 绗簩灞傚璇濇,鑷畾涔夊弬鐓ч厤缃瓼orm缁勪欢 -->
<refer-config-form-dialog
ref="referConfigFormDialog"
- @echoReferConfig="echoReferConfig" >
+ @echoReferConfig="echoReferConfig">
</refer-config-form-dialog>
- <!-- 绗簩灞傚璇濇,鐩存帴閫夋嫨鍙傜収閰嶇疆curd缁勪欢 -->
+ <!-- 绗簩灞傚璇濇,鐩存帴閫夋嫨鍙傜収閰嶇疆crud缁勪欢 -->
<refer-config-crud-dialog
- ref="referConfigCrudDialog">
+ ref="referConfigCrudDialog"
+ @openReconfigInterFace="openReconfigInterFace"
+ @echoReferConfig="echoReferConfig">
</refer-config-crud-dialog>
</el-dialog>
@@ -1121,6 +1123,7 @@
/* 寮曠敤鐮佹鍙傜収閰嶇疆,瀛愮粍浠跺～瀹屽弬鐓ч厤缃箣鍚庡唴瀹瑰洖鏄炬椂璋冪敤 */
echoReferConfig(content){
+ // console.log(content.referTypeName);
this.form.referBtmId = content.referType;
this.form.referBtmName = content.referTypeName;
//杞崲鎴怞SON瀛楃涓茶繘琛岀埗缁勪欢鍥炴樉
@@ -1274,19 +1277,13 @@
//杩欏効杩橀渶瑕佸畬鍠�
this.selectAttrOptionLoading = true;
listClassifyLinkAttr({"page": 1,"limit": -1,'conditionMap[codeClassifyOid]':this.currentSelectTreeData.oid}).then(res=>{
- //console.log(res.data.data);
- //閫犲亣鏁版嵁
- let dataInfo =[
- {"id":"address","name":"浼氳瀹ゅ湴鍧�","oid":"058D840D-1010-A7DE-7C52-B39C03CE89C1","attrLength":"150","description":"","attributeDataTypeText":"瀛楃涓�"},
- {"id":"businesslicensetype","name":"钀ヤ笟鎵х収绫诲瀷","oid":"BDAC6D3E-1827-35A0-F3CA-0E58A43F6A07","attrLength":"255","description":"钀ヤ笟鎵х収绫诲瀷","attributeDataTypeText":"瀛楃涓�"},
- {"id":"certificatenumber","name":"淇濆瘑璇佺紪鍙�","oid":"E2BC8332-A721-3713-26C3-C9F6340C2C1D","attrLength":"255","description":"淇濆瘑璇佺紪鍙�","attributeDataTypeText":"瀛楃涓�"},
- ]
- this.selectattrData = dataInfo;
- this.selectAttrOptionLoading = false;
+ console.log(res.data.data);
+ this.selectattrData = res.data.data;
+ this.selectAttrOptionLoading = false;
})
},
// 鐐瑰嚮鎼滅储鍚庤Е鍙戣浜嬩欢
- selectAttrOptionSearchChange(params, done) {
+ selectAttrSearchChange(params, done) {
this.query = params;
//console.log(params); //杩欏効闇�瑕佹敼
this.loadlistClassifyLinkAttr(Object.assign(params,{'conditionMap[codeClassifyOid]':this.currentSelectTreeData.oid}));
@@ -1663,7 +1660,7 @@
// this.changeSectypeFormItems(null);
},
// 鎵撳紑鏂板绐楀彛
- addBasicCodeSec(){
+ openAddBasicCodeSec(){
if(!this.tipsMessage(this.selectionList)){
return;
}
@@ -1709,10 +1706,10 @@
if(this.form.oid == '' || this.form.oid == null){
if(this.checkForm()){
addSave(this.form).then(() => {
- this.$message({
- type: "success",
- message: "鎿嶄綔鎴愬姛!"
- });
+ this.$message({
+ type: "success",
+ message: "鎿嶄綔鎴愬姛!"
+ });
}, error => {
window.console.log(error);
});
@@ -2373,7 +2370,6 @@
});
},
-
/** 绗竴灞傚璇濇鐩稿叧鏂规硶 */
// 鎵撳紑浜屽眰瀵硅瘽妗嗘柟娉�
openAttrSelectOrGetValue(condition){
@@ -2389,20 +2385,26 @@
this.refreshReferBtmDataChange();
}else if(condition === 'referConfig'){
if(func.notEmpty(this.form.referConfig) || func.notEmpty(this.form.referBtmName)){
- this.$refs.referConfigFormDialog.isShowReferConfigForm = true;
- let value = {
- referTypeName: this.form.referBtmName,
- referType: this.form.referBtmId,
- referConfig: this.form.referConfig,
- }
- this.$refs.referConfigFormDialog.initPageData(value);
+ this.openReconfigInterFace(this.form);
}else{
this.openTipsChooseOrCust();
}
//this.$refs.referConfigFormDialog.onloadAttrData();
}
},
- // 鎵撳紑鑷畾涔夊弬鐓ч厤缃垨鐩存帴閫夋嫨鍙傜収閰嶇疆鐣岄潰
+
+ // 褰撳墠宸插瓨鍦ㄧ紪杈戣繃鐨勫弬灞曢厤缃紝鎵�浠ョ洿鎺ユ墦寮�鍙傜収閰嶇疆鐣岄潰
+ openReconfigInterFace(preReferConfigForm){
+ // console.log(preReferConfigForm);
+ this.$refs.referConfigFormDialog.isShowReferConfigForm = true;
+ let value = {
+ referTypeName: preReferConfigForm.referBtmName,
+ referType: preReferConfigForm.referBtmId,
+ referConfig: preReferConfigForm.referConfig,
+ }
+ this.$refs.referConfigFormDialog.initPageData(value);
+ },
+ // 鎵撳紑鑷畾涔夊弬鐓ч厤缃垨鐩存帴閫夋嫨鍙傜収閰嶇疆鐨勬彁绀烘
openTipsChooseOrCust(){
this.$confirm('璇烽�夋嫨鍙傜収閰嶇疆鐨勫畾涔夋柟寮忥紵','鍙傜収閰嶇疆鐨勬柟寮�', {
distinguishCancelAndClose: true,
@@ -2511,7 +2513,7 @@
serialStart: row!=null&&row.serialStart != '' ? row.serialStart:1, //娴佹按鍙疯捣濮嬪��
serialStep: row!=null&&row.serialStep != '' ? row.serialStep:1, //娴佹按鐨勬闀�
codeFillType: row!=null&&row.codeFillType != '' ? row.codeFillType:'code_fill_right', //缂栫爜琛ヤ綅鏂瑰紡
- codeFillSeparatorSelect: row!=null&&row.codeFillSeparatorSelect != '' ? row.codeFillSeparatorSelect:0, //琛ヤ綅鏃剁殑瀛楃锛岄�変腑鐨勪笅鎷夋鐨勪笅鏍�
+ codeFillSeparatorSelect: row!=null&&row.codeFillSeparator != '' ? row.codeFillSeparatorSelect:0, //琛ヤ綅鏃剁殑瀛楃锛岄�変腑鐨勪笅鎷夋鐨勪笅鏍�
codeFillSeparator: row!=null&&row.codeFillSeparator != '' ? row.codeFillSeparator:0, //琛ヤ綅鏃剁殑瀛楃
codeFillLength: row!=null&&row.codeFillLength != '' ? row.codeFillLength:'', //濉厖闀垮害
codeFillLimit: row!=null&&row.codeFillLimit != '' ? row.codeFillLimit:'', //娴佹按涓婇檺
@@ -2570,7 +2572,7 @@
},
//鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇�
loadCodeSecType(){
- getDictionary({code: "codeBasicSecType"}).then(res=>{
+ getDictionary({code: "codeSecType"}).then(res=>{
this.sectypeList = res.data.data;
})
this.loadCodeSecLength();
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 146a89c..afa341a 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,9 +26,9 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- target: 'http://localhost:37000',
- // target: 'http://192.168.3.7:37000',
- // target: 'http://dev.vci-tech.com:37000',
+ target: 'http://localhost:37000',
+ //target: 'http://192.168.3.7:37000',
+ //target: 'http://dev.vci-tech.com:37000',
//target: 'http://192.168.1.51:37000/',
//杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
// target: 'https://saber.bladex.vip/api',
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeOsattributeEntity.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeOsattributeEntity.java
index d79bed8..c0b753d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeOsattributeEntity.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeOsattributeEntity.java
@@ -97,5 +97,4 @@
@ApiModelProperty(value = "鍙栧�艰寖鍥�")
private String range;
-
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeOsbtmtypeattributeEntity.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeOsbtmtypeattributeEntity.java
index 4c0a4df..92070a7 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeOsbtmtypeattributeEntity.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeOsbtmtypeattributeEntity.java
@@ -45,7 +45,6 @@
*/
private static final long serialVersionUID = -4431848943790920077L;
-
@JsonSerialize(
using = ToStringSerializer.class
)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
index 30c4034..4ff4161 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
@@ -151,9 +151,9 @@
private String referTypeName;
/**
- * 鎵�灞為鍩�
+ * 鏄惁寮�鍚叏灞�
*/
- private String doMain;
+ private String isOpenGlobal;
/**
* 鎺掑簭
@@ -161,6 +161,11 @@
private Integer orderNum;
/**
+ * 鏄惁寮�鍚寔涔呭寲
+ */
+ private String isPersistence;
+
+ /**
* 鏄剧ず鐨勫睘鎬�-鏄剧ず瀵硅薄
*/
@TableField(exist = false)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java
index 2493e14..4d66c38 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java
@@ -1,10 +1,14 @@
package com.vci.ubcs.code.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.yulichang.annotation.EntityMapping;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
+
+import java.io.Serializable;
/**
* 缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鏄剧ず灞炴�ч厤缃�
@@ -15,11 +19,17 @@
@Data
@TableName("PL_CODE_SHOWFIELDCONFIG")
@ApiModel(value = "CodeShowFieldConfig瀵硅薄", description = "缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鏄剧ず灞炴�ч厤缃�")
-public class CodeShowFieldConfig extends BaseModel {
+public class CodeShowFieldConfig implements Serializable {
private static final long serialVersionUID = -71135592796848692L;
/**
+ * 涓婚敭
+ */
+ @TableId(value = "OID",type = IdType.ASSIGN_UUID)
+ private String oid;
+
+ /**
* 鍒楀瓧娈�
*/
private String field;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java
index 72855b5..7dff2bc 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java
@@ -1,5 +1,7 @@
package com.vci.ubcs.code.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
@@ -15,11 +17,17 @@
@Data
@TableName("PL_CODE_SRCHCONDCONFIG")
@ApiModel(value = "CodeSrchCondConfig瀵硅薄", description = "缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鎼滅储鏉′欢閰嶇疆")
-public class CodeSrchCondConfig extends BaseModel {
+public class CodeSrchCondConfig {
private static final long serialVersionUID = -51655155561881523L;
/**
+ * 涓婚敭
+ */
+ @TableId(value = "OID",type = IdType.ASSIGN_UUID)
+ private String oid;
+
+ /**
* 绛涢�夊瓧娈�
*/
private String filterField;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeShowFieldConfigVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeShowFieldConfigVO.java
index ea63cc9..e00a345 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeShowFieldConfigVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeShowFieldConfigVO.java
@@ -19,11 +19,6 @@
private static final long serialVersionUID = -71135592796848692L;
/**
- * 鍏宠仈鐨勫弬鐓ч厤缃甶d
- */
- private String configOid;
-
- /**
* 瀛楁绫诲瀷-鏄剧ず鏂囨湰
*/
private String fieldTypeText;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/EnumCache.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/EnumCache.java
index ba9f2ac..cc8674a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/EnumCache.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/EnumCache.java
@@ -73,7 +73,6 @@
return getValue(name.getName(), nameChild);
}
-
/**
* 鑾峰彇瀛楀吀鍊�
*
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/enums/EnumEnum.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/enums/EnumEnum.java
index bfa9ab6..283d057 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/enums/EnumEnum.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/enums/EnumEnum.java
@@ -88,6 +88,59 @@
* 鐢ㄦ埛骞冲彴
*/
USER_TYPE("user_type"),
+ /**
+ * codeSecType 鐮佸�肩被鍨�
+ */
+ CODE_SEC_TYPE("codeSecType"),
+ /**
+ * 灞傜骇鐮佹鐨勫眰绾х被鍨�
+ */
+ CODE_LEVEL_TYPE("codeLevelType"),
+ /**
+ * 鐮佹闀垮害绫诲瀷
+ */
+ CODE_SEC_LENGTH("codeSecLength"),
+ /**
+ * 鍊兼埅鍙栫被鍨�
+ */
+ CODE_CUT_TYPE("codeCutType"),
+ /**
+ * 鍊兼埅鍙栫被鍨�
+ */
+ CODE_GET_VALUE_TYPE("codeGetValueType"),
+ /**
+ * 鍒嗙被涓殑娴佺▼妯℃澘鐢ㄩ��
+ */
+ CODE_CLASSIFY_PROCESS_USE("codeClassifyProcessUse"),
+ /**
+ * 灞炴�х被鍨�
+ */
+ VCO_FIELD_TYPE("vciFieldType"),
+ /**
+ * 绐楀彛绫诲瀷
+ */
+ CODE_REFER_CONFIG_TYPE("codeReferConfigType"),
+ /**
+ * 缂栫爜瑙勫垯鐨勭敓鍛藉懆鏈�
+ */
+ CODE_RULE_LC("codeRuleLC"),
+ /**
+ * 鍙傜収閰嶇疆涓敤鍒扮殑瀛楁绫诲瀷
+ */
+ CODE_REFER_CONFIG_FIELD_TYPE("codeReferConfigFieldType"),
+ /**
+ * 鍙傜収閰嶇疆涓敤鍒扮殑鍒楀浐瀹氫綅缃�
+ */
+ CODE_REFER_CONFIG_FIXED("codeReferConfigFixed"),
+ /**
+ * 绛涢�夌被鍨�
+ */
+ CODE_REFER_CONFIG_FILTER_TYPE("codeReferConfigFilterType"),
+ /**
+ * 妯℃澘鐨勬寜閽敤閫�
+ */
+ CODE_TEMPLATE_BUTTON_USE("codeTemplateButtonUse"),
+
;
final String name;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java
index 6fce916..62c6dad 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java
@@ -52,6 +52,11 @@
*/
public static final String CODE_KEY_ATTR_REPEAT_RULE = "codekeyattrrepeat";
+ /**
+ * 鍙傜収閰嶇疆
+ */
+ public static final String CODE_REFER_CONFIG = "codereferconfig";
+
/**
* 鐩镐技鏌ヨ瑙勫垯
*/
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
index 2be97e5..0af732b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
@@ -2,22 +2,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.code.dto.CodeReferConfigDTO;
-import com.vci.ubcs.code.entity.CodeReferConfig;
-import com.vci.ubcs.code.service.CodeReferConfigService;
+import com.vci.ubcs.code.service.ICodeReferConfigService;
import com.vci.ubcs.code.vo.CodeReferConfigVO;
-import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
-import java.util.Map;
/**
* 鍙傜収閰嶇疆琛�(CodeReferConfig)琛ㄦ帶鍒跺眰
@@ -33,7 +25,7 @@
* 鏈嶅姟瀵硅薄
*/
@Resource
- private CodeReferConfigService codeReferconfigService;
+ private ICodeReferConfigService codeReferconfigService;
/**
* 鍒嗛〉鏌ヨ
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeBasicSecMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeBasicSecMapper.java
index 3b04b04..2c2ba9e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeBasicSecMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeBasicSecMapper.java
@@ -27,10 +27,10 @@
/**
* 鎵归噺鎻掑叆
- * @param codeBasicSecList
+ //* @param codeBasicSecList
* @return
*/
- Long insertBatch(@Param("entities") List<CodeBasicSec> codeBasicSecList);
+ // Long insertBatch(@Param("entities") List<CodeBasicSec> codeBasicSecList);
List<String> getOidByCodeclassifysecOid(@Param("codeClassifySecOid") String codeClassifySecOid);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeShowFieldConfigMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeShowFieldConfigMapper.java
index 405c5f8..91cd2d7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeShowFieldConfigMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeShowFieldConfigMapper.java
@@ -15,71 +15,6 @@
*/
public interface CodeShowFieldConfigMapper extends BaseMapper<CodeShowFieldConfig> {
- /**
- * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
- *
- * @param oid 涓婚敭
- * @return 瀹炰緥瀵硅薄
- */
- CodeShowFieldConfig queryById(String oid);
-
- /**
- * 鏌ヨ鎸囧畾琛屾暟鎹�
- *
- * @param plCodeShowfieldconfig 鏌ヨ鏉′欢
- * @param pageable 鍒嗛〉瀵硅薄
- * @return 瀵硅薄鍒楄〃
- */
- List<CodeShowFieldConfig> queryAllByLimit(CodeShowFieldConfig plCodeShowfieldconfig, @Param("pageable") Pageable pageable);
-
- /**
- * 缁熻鎬昏鏁�
- *
- * @param plCodeShowfieldconfig 鏌ヨ鏉′欢
- * @return 鎬昏鏁�
- */
- long count(CodeShowFieldConfig plCodeShowfieldconfig);
-
- /**
- * 鏂板鏁版嵁
- *
- * @param plCodeShowfieldconfig 瀹炰緥瀵硅薄
- * @return 褰卞搷琛屾暟
- */
- int insert(CodeShowFieldConfig plCodeShowfieldconfig);
-
- /**
- * 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
- *
- * @param entities List<CodeShowFieldConfig> 瀹炰緥瀵硅薄鍒楄〃
- * @return 褰卞搷琛屾暟
- */
- int insertBatch(@Param("entities") List<CodeShowFieldConfig> entities);
-
- /**
- * 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
- *
- * @param entities List<CodeShowFieldConfig> 瀹炰緥瀵硅薄鍒楄〃
- * @return 褰卞搷琛屾暟
- * @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
- */
- int insertOrUpdateBatch(@Param("entities") List<CodeShowFieldConfig> entities);
-
- /**
- * 淇敼鏁版嵁
- *
- * @param plCodeShowfieldconfig 瀹炰緥瀵硅薄
- * @return 褰卞搷琛屾暟
- */
- int update(CodeShowFieldConfig plCodeShowfieldconfig);
-
- /**
- * 閫氳繃涓婚敭鍒犻櫎鏁版嵁
- *
- * @param oid 涓婚敭
- * @return 褰卞搷琛屾暟
- */
- int deleteById(String oid);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeSrchCondConfigMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeSrchCondConfigMapper.java
index cda731d..e7e1299 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeSrchCondConfigMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeSrchCondConfigMapper.java
@@ -14,71 +14,5 @@
*/
public interface CodeSrchCondConfigMapper extends BaseMapper<CodeSrchCondConfig> {
- /**
- * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
- *
- * @param oid 涓婚敭
- * @return 瀹炰緥瀵硅薄
- */
- CodeSrchCondConfig queryById(String oid);
-
- /**
- * 鏌ヨ鎸囧畾琛屾暟鎹�
- *
- * @param plCodeSrchcondconfig 鏌ヨ鏉′欢
- * @param pageable 鍒嗛〉瀵硅薄
- * @return 瀵硅薄鍒楄〃
- */
- List<CodeSrchCondConfig> queryAllByLimit(CodeSrchCondConfig plCodeSrchcondconfig, @Param("pageable") Pageable pageable);
-
- /**
- * 缁熻鎬昏鏁�
- *
- * @param plCodeSrchcondconfig 鏌ヨ鏉′欢
- * @return 鎬昏鏁�
- */
- long count(CodeSrchCondConfig plCodeSrchcondconfig);
-
- /**
- * 鏂板鏁版嵁
- *
- * @param plCodeSrchcondconfig 瀹炰緥瀵硅薄
- * @return 褰卞搷琛屾暟
- */
- int insert(CodeSrchCondConfig plCodeSrchcondconfig);
-
- /**
- * 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
- *
- * @param entities List<CodeSrchCondConfig> 瀹炰緥瀵硅薄鍒楄〃
- * @return 褰卞搷琛屾暟
- */
- int insertBatch(@Param("entities") List<CodeSrchCondConfig> entities);
-
- /**
- * 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
- *
- * @param entities List<CodeSrchCondConfig> 瀹炰緥瀵硅薄鍒楄〃
- * @return 褰卞搷琛屾暟
- * @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
- */
- int insertOrUpdateBatch(@Param("entities") List<CodeSrchCondConfig> entities);
-
- /**
- * 淇敼鏁版嵁
- *
- * @param plCodeSrchcondconfig 瀹炰緥瀵硅薄
- * @return 褰卞搷琛屾暟
- */
- int update(CodeSrchCondConfig plCodeSrchcondconfig);
-
- /**
- * 閫氳繃涓婚敭鍒犻櫎鏁版嵁
- *
- * @param oid 涓婚敭
- * @return 褰卞搷琛屾暟
- */
- int deleteById(String oid);
-
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java
index 6ad2c7f..32b507a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java
@@ -161,6 +161,14 @@
List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSec> codeBasicSecDOs, boolean hasFixedValue) throws VciBaseException;
/**
+ * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
+ * @param codeBasicSecDOs 鏁版嵁瀵硅薄鍒楄〃
+ * @return 鏄剧ず瀵硅薄
+ * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
+ */
+ List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSec> codeBasicSecDOs) throws VciBaseException;
+
+ /**
* 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
* @param codeBasicSecDO 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeOsattributeService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeOsattributeService.java
index dbf55a4..9d694ee 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeOsattributeService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeOsattributeService.java
@@ -41,7 +41,6 @@
*/
IPage<CodeOsattributeVO> selectCodeOsattributePage(IPage<CodeOsattributeVO> page, CodeOsattributeVO CodeOsattribute);
-
boolean isDefaultAttr(String selectKey);
Map<String, CodeOsattributeVO> getDefaultAttributeVOMap();
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeReferConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferConfigService.java
similarity index 79%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeReferConfigService.java
rename to Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferConfigService.java
index 234c29c..9a189c7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeReferConfigService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferConfigService.java
@@ -1,18 +1,12 @@
package com.vci.ubcs.code.service;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
import com.vci.ubcs.code.dto.CodeReferConfigDTO;
import com.vci.ubcs.code.entity.CodeReferConfig;
import com.vci.ubcs.code.vo.CodeReferConfigVO;
-import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
-import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
import java.util.List;
@@ -22,7 +16,7 @@
* @author ludc
* @since 2023-05-19 17:47:59
*/
-public interface CodeReferConfigService extends MPJBaseService<CodeReferConfig> {
+public interface ICodeReferConfigService extends MPJBaseService<CodeReferConfig> {
/**
* 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeShowFieldConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeShowFieldConfigService.java
similarity index 68%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeShowFieldConfigService.java
rename to Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeShowFieldConfigService.java
index 0cfca8b..8de2d10 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeShowFieldConfigService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeShowFieldConfigService.java
@@ -3,9 +3,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.CodeShowFieldConfig;
import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
-import jdk.internal.dynalink.linker.LinkerServices;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
import java.util.List;
@@ -15,15 +12,7 @@
* @author ludc
* @since 2023-05-19 17:58:56
*/
-public interface CodeShowFieldConfigService extends IService<CodeShowFieldConfig> {
-
- /**
- * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
- *
- * @param oid 涓婚敭
- * @return 瀹炰緥瀵硅薄
- */
- CodeShowFieldConfig queryById(String oid);
+public interface ICodeShowFieldConfigService extends IService<CodeShowFieldConfig> {
/**
* 鏂板鏁版嵁
@@ -39,15 +28,7 @@
* @param codeShowFieldConfigVOS 瀹炰緥瀵硅薄
* @return 瀹炰緥瀵硅薄
*/
- boolean insertBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS);
-
- /**
- * 淇敼鏁版嵁
- *
- * @param codeShowFieldConfig 瀹炰緥瀵硅薄
- * @return 瀹炰緥瀵硅薄
- */
- boolean update(CodeShowFieldConfig codeShowFieldConfig);
+ boolean insertBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS, String oid);
/**
* 鎵归噺淇敼鏁版嵁
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeSrchCondConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeSrchCondConfigService.java
similarity index 60%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeSrchCondConfigService.java
rename to Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeSrchCondConfigService.java
index 1e4a91a..ead0f39 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeSrchCondConfigService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeSrchCondConfigService.java
@@ -1,10 +1,7 @@
package com.vci.ubcs.code.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.CodeShowFieldConfig;
import com.vci.ubcs.code.entity.CodeSrchCondConfig;
-import com.vci.ubcs.code.entity.CodeSrchCondConfig;
-import com.vci.ubcs.code.service.impl.CodeSrchCondConfigServiceImpl;
import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -17,24 +14,7 @@
* @author ludc
* @since 2023-05-19 17:58:56
*/
-public interface CodeSrchCondConfigService extends IService<CodeSrchCondConfig> {
-
- /**
- * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
- *
- * @param oid 涓婚敭
- * @return 瀹炰緥瀵硅薄
- */
- CodeSrchCondConfig queryById(String oid);
-
- /**
- * 鍒嗛〉鏌ヨ
- *
- * @param codeSrchCondConfig 绛涢�夋潯浠�
- * @param pageRequest 鍒嗛〉瀵硅薄
- * @return 鏌ヨ缁撴灉
- */
- Page<CodeSrchCondConfig> queryByPage(CodeSrchCondConfig codeSrchCondConfig, PageRequest pageRequest);
+public interface ICodeSrchCondConfigService extends IService<CodeSrchCondConfig> {
/**
* 鏂板鏁版嵁
@@ -50,15 +30,7 @@
* @param codeSrchCondConfigVOS 瀹炰緥瀵硅薄
* @return 瀹炰緥瀵硅薄
*/
- boolean insertBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS);
-
- /**
- * 淇敼鏁版嵁
- *
- * @param codeSrchCondConfig 瀹炰緥瀵硅薄
- * @return 瀹炰緥瀵硅薄
- */
- boolean update(CodeSrchCondConfig codeSrchCondConfig);
+ boolean insertBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS, String oid);
/**
* 鎵归噺鈥斺�斾慨鏀规暟鎹�
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 9bfc72b..fd0dfdc 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
@@ -16,10 +16,8 @@
import com.vci.ubcs.code.mapper.CodeBasicSecMapper;
import com.vci.ubcs.code.mapper.CodeClassifyValueMapper;
import com.vci.ubcs.code.mapper.CodeFixedValueMapper;
-import com.vci.ubcs.code.service.ICodeBasicSecService;
-import com.vci.ubcs.code.service.ICodeClassifyValueService;
-import com.vci.ubcs.code.service.ICodeFixedValueService;
-import com.vci.ubcs.code.service.ICodeRuleService;
+import com.vci.ubcs.code.service.*;
+import com.vci.ubcs.code.vo.CodeReferConfigVO;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
@@ -83,6 +81,9 @@
@Resource
private ICodeClassifyValueService codeClassifyValueService;
+
+ @Resource
+ private ICodeReferConfigService codeReferConfigService;
@Resource
private IDictBizClient iDictBizClient;
@@ -237,15 +238,22 @@
&& StringUtils.isBlank(codeBasicSecDO.getCodeFillSeparator())){
throw new VciBaseException("褰撹ˉ浣嶆柟寮忎负宸﹁ˉ浣嶆垨鑰呭彸琛ヤ綅鐨勬椂鍊欙紝琛ヤ綅瀛楃涓嶈兘涓虹┖");
}
+ CodeReferConfigVO codeReferConfigVO = null;
//寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸垽鏂弬鐓х殑淇℃伅鏄惁姝ｇ‘
if(CodeSecTypeEnum.CODE_REFER_SEC.getValue().equalsIgnoreCase(codeBasicSecDO.getSecType())){
if(StringUtils.isBlank(codeBasicSecDO.getReferConfig())){
throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸～鍐� 鍙傜収閰嶇疆 鐨勫唴瀹�");
}
try{
- JSONObject.parseObject(codeBasicSecDO.getReferConfig(), UIFormReferVO.class);
+ //JSONObject.parseObject(codeBasicSecDO.getReferConfig(), UIFormReferVO.class);
+ codeReferConfigVO = JSONObject.parseObject(codeBasicSecDO.getReferConfig(), CodeReferConfigVO.class);
+ // 灏嗗弬鐓ч厤缃繘琛屾寔涔呭寲锛岀粰鐢ㄦ埛鎻愪緵鍙彲閫夋嫨鍙傜収閰嶇疆鐨勬柟寮�
+
}catch (Throwable e){
throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝鍙傜収閰嶇疆鐨勫唴瀹圭殑鏍煎紡涓嶆纭�,",new String[0],e);
+ }
+ if(codeReferConfigVO.getIsPersistence()=="true"){
+ codeReferConfigService.insert(codeReferConfigVO);
}
}
boolean resBoolean = codeBasicSecMapper.insert(codeBasicSecDO) > 0;
@@ -731,6 +739,27 @@
}
/**
+ * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
+ *
+ * @param codeBasicSecDOs 鏁版嵁瀵硅薄鍒楄〃
+ * @return 鏄剧ず瀵硅薄
+ * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
+ */
+ @Override
+ public List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSec> codeBasicSecDOs) throws VciBaseException {
+ List<CodeBasicSecVO> voList = new ArrayList<CodeBasicSecVO>();
+ if (!CollectionUtils.isEmpty(codeBasicSecDOs)) {
+ for (CodeBasicSec s : codeBasicSecDOs) {
+ CodeBasicSecVO vo = codeBasicSecDO2VO(s);
+ if (vo != null) {
+ voList.add(vo);
+ }
+ }
+ }
+ return voList;
+ }
+
+ /**
* 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
*
* @param codeBasicSecDO 鏁版嵁瀵硅薄
@@ -739,14 +768,26 @@
*/
@Override
public CodeBasicSecVO codeBasicSecDO2VO(CodeBasicSec codeBasicSecDO) throws VciBaseException {
- CodeBasicSecVO vo = new CodeBasicSecVO();
+ CodeBasicSecVO codeBasicSecVO = new CodeBasicSecVO();
if (codeBasicSecDO != null) {
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDO, vo);
+ BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecVO, codeBasicSecVO);
+ codeBasicSecVO.setSecTypeText(CodeSecTypeEnum.getTextByValue(codeBasicSecVO.getSecType()));
+ codeBasicSecVO.setCodeLevelTypeText(CodeLevelTypeEnum.getTextByValue(codeBasicSecVO.getCodeLevelType()));
+ codeBasicSecVO.setCodeSecLengthTypeText(CodeSecLengthTypeEnum.getTextByValue(codeBasicSecVO.getCodeSecLengthType()));
+ codeBasicSecVO.setValueCutTypeText(CodeCutTypeEnum.getValueByText(codeBasicSecVO.getValueCutType()));
+ codeBasicSecVO.setCodeGetValueTypeText(CodeGetValueTypeEnum.getValueByText(codeBasicSecVO.getCodeGetValueType()));
+ // 濡傛灉鏄垎绫荤爜娈甸渶瑕佹煡璇㈡墍灞炲垎绫荤殑涓枃鍚嶇О
+ if(codeBasicSecDO.getSecType().equals("codeclassifysec") && Func.isNotEmpty(codeBasicSecDO.getParentClassifySecOid())){
+ CodeBasicSec codeBasicSec = codeBasicSecMapper.selectOne(Wrappers.<CodeBasicSec>query().lambda()
+ .eq(CodeBasicSec::getOid, codeBasicSecDO.getParentClassifySecOid())
+ .eq(CodeBasicSec::getSecType, codeBasicSecDO.getSecType()));
+ codeBasicSecVO.setParentClassifySecText(codeBasicSec.getName());
+ }
//濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
if (true) {
//vo.setLcStatusText({lcStatusFullClassName}.getTextByValue(vo.getLcStatus()));
}
}
- return vo;
+ return codeBasicSecVO;
}
}
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 c9cf1ad..71c4338 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
@@ -19,6 +19,7 @@
import com.vci.ubcs.code.po.CodeClassifyPO;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.ICodeKeyAttrRepeatService;
+import com.vci.ubcs.code.service.ICodeOsattributeService;
import com.vci.ubcs.code.service.ICodeRuleService;
import com.vci.ubcs.code.vo.CodeOsattributeVO;
import com.vci.ubcs.code.vo.CodeOsbtmtypeVO;
@@ -55,6 +56,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -86,7 +88,11 @@
@Resource
private IBtmTypeClient btmTypeClient;
-
+ /**
+ * 灞炴�ф湇鍔�
+ */
+// @Autowired
+// private OsAttributeServiceI attributeService;
/**
* 鏃ュ織
@@ -267,7 +273,6 @@
return codeClassifyMapper.checkHasChild(oid.trim());
}
-
/**
* 鍒犻櫎涓婚搴撳垎绫�
* @param codeClassify 涓婚搴撳垎绫绘暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
@@ -372,7 +377,6 @@
return codeClassifyDO2VOs(codeClassifyDOList);
}
-
/**
* 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
* @param oidCollections 涓婚敭鐨勯泦鍚�
@@ -391,7 +395,6 @@
}
return codeClassifyList;
}
-
/**
* 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
@@ -906,7 +909,7 @@
condition.put("pkbtmtype",topClassifyVO.getBtmtypeid());
List<CodeOsbtmtypeattributeEntity> unDefaultAttributes = codeOsbtmtypeattributeMapper.selectByMap(condition);
-// List<OsBtmTypeAttributeVO> unDefaultAttributes = btmService. (topClassifyVO.getBtmtypeid());
+ // List<OsBtmTypeAttributeVO> unDefaultAttributes = btmService. (topClassifyVO.getBtmtypeid());
List<CodeOsattributeVO> attributeVOS = new ArrayList<>();
if(!CollectionUtils.isEmpty(unDefaultAttributes)){
unDefaultAttributes.stream().forEach(attr->{
@@ -916,6 +919,7 @@
attributeVO.setAttrlength(Short.valueOf(attr.getAttributelength()));
attributeVO.setBtmtypeid(attr.getReferbtmtypeid());
attributeVO.setBtmtypename(attr.getReferbtmtypename());
+ attributeVO.setAttributedatatypetext(attr.getReferbtmtypename());
boolean add = true;
if(StringUtils.isNotBlank(id) && !attributeVO.getId().contains(id.replace("*",""))){
add = false;
@@ -928,8 +932,8 @@
}
});
}
-// if(!CollectionUtils.isEmpty(attributeService.getDefaultAttributeVOs())){
-// attributeService.getDefaultAttributeVOs().stream().forEach(attr->{
+// if(!CollectionUtils.isEmpty(codeOsattributeService.getDefaultAttributeVOs())){
+// codeOsattributeService.getDefaultAttributeVOs().stream().forEach(attr->{
// boolean add = true;
// if(StringUtils.isNotBlank(id) && !attr.getId().contains(id.replace("*",""))){
// add = false;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
index d03683d..2b538e9 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
@@ -3,51 +3,37 @@
import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
import com.vci.ubcs.code.dto.CodeReferConfigDTO;
import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.mapper.CodeReferConfigMapper;
-import com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper;
-import com.vci.ubcs.code.service.CodeReferConfigService;
-import com.vci.ubcs.code.service.CodeShowFieldConfigService;
-import com.vci.ubcs.code.service.CodeSrchCondConfigService;
+import com.vci.ubcs.code.service.ICodeReferConfigService;
+import com.vci.ubcs.code.service.ICodeShowFieldConfigService;
+import com.vci.ubcs.code.service.ICodeSrchCondConfigService;
import com.vci.ubcs.code.vo.CodeReferConfigVO;
-import com.vci.ubcs.code.wrapper.CodeClassifyProcessTempWrapper;
import com.vci.ubcs.code.wrapper.CodeReferConfigWraper;
-import com.vci.ubcs.code.wrapper.CodeShowFieldConfigWraper;
-import com.vci.ubcs.code.wrapper.CodeSrchCondConfigWraper;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
-import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
-import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.stereotype.Service;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.TS_NOT_PROCESS;
@@ -58,16 +44,16 @@
* @since 2023-05-19 17:48:02
*/
@Service("CodeReferconfigService")
-public class CodeReferConfigServiceImpl extends MPJBaseServiceImpl<CodeReferConfigMapper,CodeReferConfig> implements CodeReferConfigService {
+public class CodeReferConfigServiceImpl extends MPJBaseServiceImpl<CodeReferConfigMapper,CodeReferConfig> implements ICodeReferConfigService {
@Resource
private CodeReferConfigMapper codeReferconfigMapper;
@Resource
- private CodeShowFieldConfigService codeShowFieldConfigService;
+ private ICodeShowFieldConfigService ICodeShowFieldConfigService;
@Resource
- private CodeSrchCondConfigService codeSrchCondConfigService;
+ private ICodeSrchCondConfigService ICodeSrchCondConfigService;
/**
* 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
@@ -81,12 +67,20 @@
return CodeReferConfigWraper.build().entityVO(codeReferConfig);
}
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param bladeQueryObject 绛涢�夋潯浠�
+ * @return 鏌ヨ缁撴灉
+ */
@Override
public IPage<CodeReferConfigVO> queryByJoinPage(BladeQueryObject bladeQueryObject) {
CodeReferConfig codeReferConfig = new CodeReferConfig();
// 鏍规嵁绉熸埛杩涜鍖哄垎瀵瑰簲鐨勫弬鐓ч厤缃�
Map<String, Object> conditionMap = bladeQueryObject.getConditionMap();
+ // 鏌ヨ鎵�灞炵鎴蜂笅鐨勫拰寮�鍚叏灞�鐨勫弬鐓ч厤缃俊鎭�
conditionMap.put("tenantId",AuthUtil.getTenantId());
+ conditionMap.put("isOpenGlobal","true");
BeanMap beanMap = BeanMap.create(codeReferConfig);
beanMap.putAll(conditionMap);
// 娣诲姞榛樿鎺掑簭瀛楁,鏍规嵁鏃堕棿杩涜鎺掑簭
@@ -96,12 +90,6 @@
return CodeReferConfigWraper.build().pageVO(codeReferConfigs);
}
- /**
- * 鍒嗛〉鏌ヨ
- *
- * @param codeReferConfigVO 绛涢�夋潯浠�
- * @return 鏌ヨ缁撴灉
- */
@Override
public List<CodeReferConfigVO> queryByList(CodeReferConfigVO codeReferConfigVO) {
codeReferConfigVO.setTenantId(AuthUtil.getTenantId());
@@ -126,18 +114,25 @@
if (StringUtils.isBlank(codeReferConfigVO.getReferType())){
throw new VciBaseException("鍙傜収閰嶇疆涓嶈兘涓虹┖");
}
- Long count = countCodeReferConfig(codeReferConfigVO);
- if(count > 0){
- throw new VciBaseException("宸插瓨鍦ㄧ浉鍚岀殑鍙傜収閰嶇疆");
- }
-
- CodeReferConfig CodeReferConfig = Objects.requireNonNull(BeanUtil.copy(codeReferConfigVO, CodeReferConfig.class));
- boolean resInsertReferConfig = this.codeReferconfigMapper.insert(CodeReferConfig) > 0;
+ // Long count = countCodeReferConfig(codeReferConfigVO);
+ // if(count > 0){
+ // throw new VciBaseException("宸插瓨鍦ㄧ浉鍚岀殑鍙傜収閰嶇疆");
+ // }
+ CodeReferConfig codeReferConfig = CodeReferConfigWraper.build().entityDO(codeReferConfigVO);
+ codeReferConfig.setOid(VciBaseUtil.getPk().toUpperCase());
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeReferConfig, MdmBtmTypeConstant.CODE_REFER_CONFIG);
+ codeReferConfig.setTenantId(AuthUtil.getTenantId());
+ boolean resInsertReferConfig = this.codeReferconfigMapper.insert(codeReferConfig) > 0;
if (!resInsertReferConfig) {
return R.fail("鏂板鍙傜収閰嶇疆澶辫触锛�");
}
- codeShowFieldConfigService.insertBatch(codeReferConfigVO.getCodeShowFieldConfigVOS());
- codeSrchCondConfigService.insertBatch(codeReferConfigVO.getCodeSrchCondConfigVOS());
+ // 涓婚敭鍥炲～
+ if(Func.isNotEmpty(codeReferConfig.getCodeShowFieldConfigs())){
+ ICodeShowFieldConfigService.insertBatch(codeReferConfigVO.getCodeShowFieldConfigVOS(),codeReferConfig.getOid());
+ }
+ if(Func.isNotEmpty(codeReferConfig.getCodeSrchCondConfigs())){
+ ICodeSrchCondConfigService.insertBatch(codeReferConfigVO.getCodeSrchCondConfigVOS(),codeReferConfig.getOid());
+ }
return R.data(codeReferConfigVO);
}
@@ -148,12 +143,17 @@
*/
private Long countCodeReferConfig(CodeReferConfigVO codeReferConfigVO) {
String templateName = codeReferConfigVO.getName();
- if (StringUtils.isBlank(templateName)){
- throw new VciBaseException("鍙傜収閰嶇疆鍚嶇О涓嶈兘涓虹┖");
+ String templateId = codeReferConfigVO.getId();
+ if (StringUtils.isBlank(templateName) && StringUtils.isBlank(templateId)){
+ throw new VciBaseException("鍙傜収閰嶇疆缂栧彿鍜屽悕绉颁笉鑳戒负绌�");
}
LambdaQueryWrapper<CodeReferConfig> wrapper = Wrappers.<CodeReferConfig>query()
.lambda().eq(CodeReferConfig::getId, codeReferConfigVO.getId())
- .eq(CodeReferConfig::getTenantId, codeReferConfigVO.getTenantId());
+ .eq(CodeReferConfig::getTenantId, codeReferConfigVO.getTenantId())
+ .or(true)
+ .eq(CodeReferConfig::getIsOpenGlobal,"true") // 鏌ヨ寮�鍚叏灞�鐨勫弬鐓ч厤缃�
+ .eq(CodeReferConfig::getId,templateId)
+ .eq(CodeReferConfig::getName,templateName);
Long count = codeReferconfigMapper.selectCount(wrapper);
return count;
}
@@ -165,18 +165,18 @@
private MPJLambdaWrapper<CodeReferConfig> getMPJLambdaWrapper(){
MPJLambdaWrapper<CodeReferConfig> mpjLambdaWrapper = new MPJLambdaWrapper<>(CodeReferConfig.class)
.selectAll(CodeReferConfig.class)
- // .select(CodeShowFieldConfig::getField
-// ,CodeShowFieldConfig::getTitle
-// ,CodeShowFieldConfig::getFieldType
-// ,CodeShowFieldConfig::getSort
-// ,CodeShowFieldConfig::getAttrSortField
-// ,CodeShowFieldConfig::getWidth
-// ,CodeShowFieldConfig::getFixedPosition
-// ,CodeShowFieldConfig::getTemplet)
-// .select(
-// CodeSrchCondConfig::getFilterType,
-// CodeSrchCondConfig::getFilterField,
-// CodeSrchCondConfig::getFilterValue)
+ // .select(CodeShowFieldConfig::getField
+ // ,CodeShowFieldConfig::getTitle
+ // ,CodeShowFieldConfig::getFieldType
+ // ,CodeShowFieldConfig::getSort
+ // ,CodeShowFieldConfig::getAttrSortField
+ // ,CodeShowFieldConfig::getWidth
+ // ,CodeShowFieldConfig::getFixedPosition
+ // ,CodeShowFieldConfig::getTemplet)
+ // .select(
+ // CodeSrchCondConfig::getFilterType,
+ // CodeSrchCondConfig::getFilterField,
+ // CodeSrchCondConfig::getFilterValue)
.selectCollection(CodeShowFieldConfig.class, CodeReferConfig::getCodeShowFieldConfigs)
.selectCollection(CodeSrchCondConfig.class, CodeReferConfig::getCodeSrchCondConfigs)
.leftJoin(CodeShowFieldConfig.class, CodeShowFieldConfig::getReferConfigOid,CodeReferConfig::getOid)
@@ -197,8 +197,8 @@
if (!resUpdateReferConfig) {
return R.fail("鍙傜収閰嶇疆淇敼澶辫触锛�");
}
- this.codeShowFieldConfigService.updateBatch(codeReferConfigVO.getCodeShowFieldConfigVOS());
- this.codeSrchCondConfigService.updateBatch(codeReferConfigVO.getCodeSrchCondConfigVOS());
+ this.ICodeShowFieldConfigService.updateBatch(codeReferConfigVO.getCodeShowFieldConfigVOS());
+ this.ICodeSrchCondConfigService.updateBatch(codeReferConfigVO.getCodeSrchCondConfigVOS());
return R.data(codeReferConfigVO);
}
@@ -222,8 +222,8 @@
if (!resDeleteReferConfig) {
return R.fail("鍙傜収閰嶇疆鍒犻櫎澶辫触锛�");
}
- this.codeShowFieldConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
- this.codeSrchCondConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
+ this.ICodeShowFieldConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
+ this.ICodeSrchCondConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
return R.status(resDeleteReferConfig);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
index dca1922..577f289 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
@@ -1,19 +1,14 @@
package com.vci.ubcs.code.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.CodeShowFieldConfig;
import com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper;
-import com.vci.ubcs.code.service.CodeShowFieldConfigService;
+import com.vci.ubcs.code.service.ICodeShowFieldConfigService;
import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
import com.vci.ubcs.code.wrapper.CodeShowFieldConfigWraper;
-import org.springblade.core.mp.support.Query;
import org.springframework.stereotype.Service;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -26,21 +21,10 @@
* @since 2023-05-19 17:58:56
*/
@Service("CodeShowFieldConfigService")
-public class CodeShowFieldConfigServiceImpl extends ServiceImpl<CodeShowFieldConfigMapper,CodeShowFieldConfig> implements CodeShowFieldConfigService {
+public class CodeShowFieldConfigServiceImpl extends ServiceImpl<CodeShowFieldConfigMapper,CodeShowFieldConfig> implements ICodeShowFieldConfigService {
@Resource
private CodeShowFieldConfigMapper codeShowFieldConfigMapper;
-
- /**
- * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
- *
- * @param oid 涓婚敭
- * @return 瀹炰緥瀵硅薄
- */
- @Override
- public CodeShowFieldConfig queryById(String oid) {
- return this.codeShowFieldConfigMapper.queryById(oid);
- }
/**
* 鏂板鏁版嵁
@@ -55,23 +39,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean insertBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {
- List<CodeShowFieldConfig> codeShowFieldConfigs = CodeShowFieldConfigWraper.build().listDO(codeShowFieldConfigVOS);
+ public boolean insertBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS, String oid) {
+ List<CodeShowFieldConfig> codeShowFieldConfigs = CodeShowFieldConfigWraper.build().listDO(codeShowFieldConfigVOS,oid);
boolean b = this.saveOrUpdateBatch(codeShowFieldConfigs);
return b;
}
-
- /**
- * 淇敼鏁版嵁
- *
- * @param codeShowFieldConfig 瀹炰緥瀵硅薄
- * @return 瀹炰緥瀵硅薄
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public boolean update(CodeShowFieldConfig codeShowFieldConfig) {
- return this.codeShowFieldConfigMapper.update(codeShowFieldConfig)>0;
- }
@Override
public boolean updateBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
index b34a1a7..31082d8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
@@ -1,28 +1,18 @@
package com.vci.ubcs.code.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.CodeShowFieldConfig;
import com.vci.ubcs.code.entity.CodeSrchCondConfig;
-import com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper;
import com.vci.ubcs.code.mapper.CodeSrchCondConfigMapper;
-import com.vci.ubcs.code.service.CodeSrchCondConfigService;
+import com.vci.ubcs.code.service.ICodeSrchCondConfigService;
import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
import com.vci.ubcs.code.wrapper.CodeSrchCondConfigWraper;
-import org.apache.cxf.endpoint.ServerImpl;
import org.springframework.stereotype.Service;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.Collection;
import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
/**
* 寮曠敤鐮佹锛屽弬鐓ч厤缃晫闈紝鏌ヨ鏉′欢閰嶇疆琛�(CodeSrchCondConfigService)琛ㄦ湇鍔″疄鐜扮被
@@ -31,34 +21,10 @@
* @since 2023-05-19 17:58:56
*/
@Service("CodeSrchCondConfigService")
-public class CodeSrchCondConfigServiceImpl extends ServiceImpl<CodeSrchCondConfigMapper, CodeSrchCondConfig> implements CodeSrchCondConfigService {
+public class CodeSrchCondConfigServiceImpl extends ServiceImpl<CodeSrchCondConfigMapper, CodeSrchCondConfig> implements ICodeSrchCondConfigService {
@Resource
private CodeSrchCondConfigMapper codeSrchcondconfigMapper;
-
- /**
- * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
- * codeSrchcondconfig
- * @param oid 涓婚敭
- * @return 瀹炰緥瀵硅薄
- */
- @Override
- public CodeSrchCondConfig queryById(String oid) {
- return this.codeSrchcondconfigMapper.queryById(oid);
- }
-
- /**
- * 鍒嗛〉鏌ヨ
- *
- * @param codeSrchcondconfig 绛涢�夋潯浠�
- * @param pageRequest 鍒嗛〉瀵硅薄
- * @return 鏌ヨ缁撴灉
- */
- @Override
- public Page<CodeSrchCondConfig> queryByPage(CodeSrchCondConfig codeSrchcondconfig, PageRequest pageRequest) {
- long total = this.codeSrchcondconfigMapper.count(codeSrchcondconfig);
- return new PageImpl<>(this.codeSrchcondconfigMapper.queryAllByLimit(codeSrchcondconfig, pageRequest), pageRequest, total);
- }
/**
* 鏂板鏁版嵁
@@ -72,21 +38,11 @@
}
@Override
- public boolean insertBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS) {
- List<CodeSrchCondConfig> codeSrchCondConfigs = CodeSrchCondConfigWraper.build().listDO(codeSrchCondConfigVOS);
+ @Transactional(rollbackFor = Exception.class)
+ public boolean insertBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS, String oid) {
+ List<CodeSrchCondConfig> codeSrchCondConfigs = CodeSrchCondConfigWraper.build().listDO(codeSrchCondConfigVOS,oid);
return this.saveOrUpdateBatch(codeSrchCondConfigs);
}
-
- /**
- * 淇敼鏁版嵁
- *
- * @param codeSrchcondconfig 瀹炰緥瀵硅薄
- * @return 瀹炰緥瀵硅薄
- */
- @Override
- public boolean update(CodeSrchCondConfig codeSrchcondconfig) {
- return this.codeSrchcondconfigMapper.update(codeSrchcondconfig)>0;
- }
@Override
public boolean updateBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java
index 9864da5..c58fd2e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java
@@ -17,12 +17,15 @@
* Author: Chill 搴勯獮 (smallchill@163.com)
*/
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.code.entity.CodeBasicSec;
-import com.vci.ubcs.code.enumpack.*;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
+import com.vci.ubcs.omd.cache.EnumCache;
+import com.vci.ubcs.omd.enums.EnumEnum;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
+import javax.annotation.Resource;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -40,15 +43,23 @@
}
@Override
- public CodeBasicSecVO entityVO(CodeBasicSec codeBasicSec) {
- CodeBasicSecVO codeBasicSecVO = Objects.requireNonNull(BeanUtil.copy(codeBasicSec, CodeBasicSecVO.class));
-
- //codeBasicSecVO.setLcStatusText(CodeRuleLC.getTextByValue(codeBasicSec.getLcStatus()));
- codeBasicSecVO.setSecTypeText(CodeSecTypeEnum.getTextByValue(codeBasicSec.getSecType()));
- codeBasicSecVO.setCodeLevelTypeText(CodeLevelTypeEnum.getTextByValue(codeBasicSec.getCodeLevelType()));
- codeBasicSecVO.setCodeSecLengthTypeText(CodeSecLengthTypeEnum.getTextByValue(codeBasicSec.getCodeSecLengthType()));
- codeBasicSecVO.setValueCutTypeText(CodeCutTypeEnum.getValueByText(codeBasicSec.getValueCutType()));
- codeBasicSecVO.setCodeGetValueTypeText(CodeGetValueTypeEnum.getValueByText(codeBasicSec.getCodeGetValueType()));
+ public CodeBasicSecVO entityVO(CodeBasicSec codeBasicSecDO) {
+ CodeBasicSecVO codeBasicSecVO = Objects.requireNonNull(BeanUtil.copy(codeBasicSecDO, CodeBasicSecVO.class));
+ if(StringUtils.isNotBlank(codeBasicSecDO.getSecType())){
+ codeBasicSecVO.setSecTypeText(EnumCache.getValue(EnumEnum.CODE_SEC_TYPE,codeBasicSecDO.getSecType()));
+ }
+ if(StringUtils.isNotBlank(codeBasicSecDO.getCodeLevelType())){
+ codeBasicSecVO.setCodeLevelTypeText(EnumCache.getValue(EnumEnum.CODE_LEVEL_TYPE,codeBasicSecDO.getCodeLevelType()));
+ }
+ if(StringUtils.isNotBlank(codeBasicSecDO.getCodeSecLengthType())){
+ codeBasicSecVO.setCodeSecLengthTypeText(EnumCache.getValue(EnumEnum.CODE_SEC_LENGTH,codeBasicSecDO.getCodeSecLengthType()));
+ }
+ if(StringUtils.isNotBlank(codeBasicSecDO.getValueCutType())){
+ codeBasicSecVO.setValueCutTypeText(EnumCache.getValue(EnumEnum.CODE_CUT_TYPE,codeBasicSecDO.getValueCutType()));
+ }
+ if(StringUtils.isNotBlank(codeBasicSecDO.getCodeGetValueType())){
+ codeBasicSecVO.setCodeGetValueTypeText(EnumCache.getValue(EnumEnum.CODE_GET_VALUE_TYPE,codeBasicSecDO.getCodeGetValueType()));
+ }
//codeBasicSecVO.setParentClassifySecText();
//codeBasicSecVO.setSecretGradeText();
return codeBasicSecVO;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyProcessTempWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyProcessTempWrapper.java
index c35d782..97f43f2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyProcessTempWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyProcessTempWrapper.java
@@ -1,8 +1,11 @@
package com.vci.ubcs.code.wrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.code.entity.CodeClassifyProcessTemp;
import com.vci.ubcs.code.enumpack.CodeClassifyProcessUseEnum;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
+import com.vci.ubcs.omd.cache.EnumCache;
+import com.vci.ubcs.omd.enums.EnumEnum;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -17,12 +20,10 @@
@Override
public CodeClassifyProcessTempVO entityVO(CodeClassifyProcessTemp codeClassifyProcessTemp) {
CodeClassifyProcessTempVO codeClassifyProcessTempVO = Objects.requireNonNull(BeanUtil.copy(codeClassifyProcessTemp, CodeClassifyProcessTempVO.class));
- codeClassifyProcessTempVO.setCodeProcessUseText(CodeClassifyProcessUseEnum.getTextByValue(codeClassifyProcessTemp.getCodeProcessUse()));
-
-
+ if(StringUtils.isNotBlank(codeClassifyProcessTemp.getCodeProcessUse())){
+ codeClassifyProcessTempVO.setCodeProcessUseText(EnumCache.getValue(EnumEnum.CODE_CLASSIFY_PROCESS_USE,codeClassifyProcessTemp.getCodeProcessUse()));
+ }
return codeClassifyProcessTempVO;
}
-
-
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateAttrWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateAttrWrapper.java
index e6f4d47..293997b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateAttrWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateAttrWrapper.java
@@ -16,8 +16,11 @@
*/
package com.vci.ubcs.code.wrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.code.entity.CodeClassifyTemplateAttr;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
+import com.vci.ubcs.omd.cache.EnumCache;
+import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -38,9 +41,9 @@
@Override
public CodeClassifyTemplateAttrVO entityVO(CodeClassifyTemplateAttr CodeClstempattr) {
CodeClassifyTemplateAttrVO codeClassifyTemplateAttrVO = Objects.requireNonNull(BeanUtil.copy(CodeClstempattr, CodeClassifyTemplateAttrVO.class));
-
- codeClassifyTemplateAttrVO.setAttributeDataTypeText(VciFieldTypeEnum.getTextByValue(CodeClstempattr.getAttributeDataType()));
-
+ if(StringUtils.isNotBlank(CodeClstempattr.getAttributeDataType())){
+ codeClassifyTemplateAttrVO.setAttributeDataTypeText( EnumCache.getValue(EnumEnum.VCO_FIELD_TYPE,CodeClstempattr.getAttributeDataType()));
+ }
return codeClassifyTemplateAttrVO;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateWrapper.java
index 3688d3a..0b31fca 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateWrapper.java
@@ -38,12 +38,10 @@
@Override
public CodeClassifyTemplateVO entityVO(CodeClassifyTemplate plCodeClstemplate) {
CodeClassifyTemplateVO plCodeClstemplateVO = Objects.requireNonNull(BeanUtil.copy(plCodeClstemplate, CodeClassifyTemplateVO.class));
-
//User createUser = UserCache.getUser(plCodeClstemplate.getCreateUser());
//User updateUser = UserCache.getUser(plCodeClstemplate.getUpdateUser());
//plCodeClstemplateVO.setCreateUserName(createUser.getName());
//plCodeClstemplateVO.setUpdateUserName(updateUser.getName());
-
return plCodeClstemplateVO;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java
index e8ba21f..71efccf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java
@@ -1,14 +1,18 @@
package com.vci.ubcs.code.wrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.code.entity.CodeReferConfig;
import com.vci.ubcs.code.enumpack.CodeReferConfigTypeEnum;
import com.vci.ubcs.code.vo.CodeReferConfigVO;
+import com.vci.ubcs.omd.cache.EnumCache;
+import com.vci.ubcs.omd.enums.EnumEnum;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 鍙傜収閰嶇疆-鍖呰绫�,杩斿洖瑙嗗浘灞傛墍闇�鐨勫瓧娈�
@@ -25,7 +29,9 @@
@Override
public CodeReferConfigVO entityVO(CodeReferConfig codeReferConfig) {
CodeReferConfigVO codeReferConfigVO = Objects.requireNonNull(BeanUtil.copy(codeReferConfig, CodeReferConfigVO.class));
- codeReferConfigVO.setTypeText(CodeReferConfigTypeEnum.getTextByValue(codeReferConfig.getType()));
+ if(StringUtils.isNotBlank(codeReferConfig.getType())){
+ codeReferConfigVO.setTypeText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_TYPE,codeReferConfig.getType()));
+ }
if(Func.isNotEmpty(codeReferConfig.getCodeSrchCondConfigs())){
codeReferConfigVO.setCodeSrchCondConfigVOS(CodeSrchCondConfigWraper.build().listVO(codeReferConfig.getCodeSrchCondConfigs()));
}
@@ -37,4 +43,18 @@
return codeReferConfigVO;
}
+ public CodeReferConfig entityDO(CodeReferConfigVO codeReferConfigVO) {
+ CodeReferConfig codeReferConfig = Objects.requireNonNull(BeanUtil.copy(codeReferConfigVO, CodeReferConfig.class));
+ //codeReferConfig.setType(CodeReferConfigTypeEnum.getValueByText(codeReferConfigVO.getTypeText()));
+ if(Func.isNotEmpty(codeReferConfigVO.getCodeSrchCondConfigVOS())){
+ codeReferConfig.setCodeSrchCondConfigs(CodeSrchCondConfigWraper.build().listDO(codeReferConfigVO.getCodeSrchCondConfigVOS()));
+ }
+ if(Func.isNotEmpty(codeReferConfigVO.getCodeShowFieldConfigVOS())){
+ codeReferConfig.setCodeShowFieldConfigs(CodeShowFieldConfigWraper.build().listDO(codeReferConfigVO.getCodeShowFieldConfigVOS()));
+ }
+ // codeReferConfigVO.setCodeSrchCondConfigVOS(null);
+ // codeReferConfigVO.setCodeShowFieldConfigVOS(null);
+ return codeReferConfig;
+ }
+
}
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 8aed258..ac76c7c 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
@@ -16,9 +16,12 @@
*/
package com.vci.ubcs.code.wrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.code.entity.CodeRule;
import com.vci.ubcs.code.lifecycle.CodeRuleLC;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import com.vci.ubcs.omd.cache.EnumCache;
+import com.vci.ubcs.omd.enums.EnumEnum;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -41,7 +44,9 @@
@Override
public CodeRuleVO entityVO(CodeRule codeRule) {
CodeRuleVO codeRuleVO = Objects.requireNonNull(BeanUtil.copy(codeRule, CodeRuleVO.class));
- codeRuleVO.setLcStatusText(CodeRuleLC.getTextByValue(codeRuleVO.getLcStatus()));
+ if(StringUtils.isNotBlank(codeRuleVO.getLcStatus())){
+ codeRuleVO.setLcStatusText(EnumCache.getValue(EnumEnum.CODE_RULE_LC,codeRuleVO.getLcStatus()));
+ }
return codeRuleVO;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java
index 3014c3e..5ecbcf5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.code.wrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.code.entity.CodeShowFieldConfig;
import com.vci.ubcs.code.entity.CodeSrchCondConfig;
import com.vci.ubcs.code.enumpack.CodeReferConfigFieldTypeEnum;
@@ -7,6 +8,8 @@
import com.vci.ubcs.code.vo.CodeReferConfigVO;
import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
+import com.vci.ubcs.omd.cache.EnumCache;
+import com.vci.ubcs.omd.enums.EnumEnum;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -27,19 +30,39 @@
@Override
public CodeShowFieldConfigVO entityVO(CodeShowFieldConfig codeShowFieldConfig) {
CodeShowFieldConfigVO codeShowFieldConfigVO = Objects.requireNonNull(BeanUtil.copy(codeShowFieldConfig, CodeShowFieldConfigVO.class));
- codeShowFieldConfigVO.setFieldTypeText(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfig.getField()));
- codeShowFieldConfigVO.setFixedPositionText(CodeReferConfigFixedEnum.getTextByValue(codeShowFieldConfig.getFixedPosition()));
-
+ if(StringUtils.isNotBlank(codeShowFieldConfig.getFixedPosition())){
+ codeShowFieldConfigVO.setFixedPositionText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_FIXED,codeShowFieldConfig.getFixedPosition()));
+ }
+ if(StringUtils.isNotBlank(codeShowFieldConfig.getFieldType())){
+ codeShowFieldConfigVO.setFieldTypeText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_FIELD_TYPE,codeShowFieldConfig.getFieldType()));
+ }
return codeShowFieldConfigVO;
+ }
+
+ public CodeShowFieldConfig entityDOsetReferConfigOid(CodeShowFieldConfigVO codeShowFieldConfigVO,String oid) {
+ CodeShowFieldConfig codeShowFieldConfig = entityDO(codeShowFieldConfigVO);
+ codeShowFieldConfig.setReferConfigOid(oid);
+ return codeShowFieldConfig;
}
public CodeShowFieldConfig entityDO(CodeShowFieldConfigVO codeShowFieldConfigVO) {
CodeShowFieldConfig codeShowFieldConfig = Objects.requireNonNull(BeanUtil.copy(codeShowFieldConfigVO, CodeShowFieldConfig.class));
- codeShowFieldConfig.setFieldType(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFieldTypeText()));
- codeShowFieldConfig.setFixedPosition(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFixedPositionText()));
+ if(StringUtils.isNotBlank(codeShowFieldConfigVO.getFieldTypeText())){
+ codeShowFieldConfig.setFieldType(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFieldTypeText()));
+ }
+ if(StringUtils.isNotBlank(codeShowFieldConfigVO.getFixedPositionText())){
+ codeShowFieldConfig.setFixedPosition(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFixedPositionText()));
+ }
+ if(StringUtils.isNotBlank(codeShowFieldConfigVO.getFieldTypeText())){
+ codeShowFieldConfig.setFieldType(CodeReferConfigFieldTypeEnum.getValueByText(codeShowFieldConfigVO.getFieldTypeText()));
+ }
return codeShowFieldConfig;
}
+ public List<CodeShowFieldConfig> listDO(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS,String oid) {
+ return (List)codeShowFieldConfigVOS.stream().map(item->entityDOsetReferConfigOid(item,oid)).collect(Collectors.toList());
+ }
+
public List<CodeShowFieldConfig> listDO(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {
return (List)codeShowFieldConfigVOS.stream().map(this::entityDO).collect(Collectors.toList());
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java
index f4f4a7f..1ab477f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.code.wrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.code.entity.CodeReferConfig;
import com.vci.ubcs.code.entity.CodeShowFieldConfig;
import com.vci.ubcs.code.entity.CodeSrchCondConfig;
@@ -8,6 +9,8 @@
import com.vci.ubcs.code.vo.CodeReferConfigVO;
import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
+import com.vci.ubcs.omd.cache.EnumCache;
+import com.vci.ubcs.omd.enums.EnumEnum;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -28,13 +31,24 @@
@Override
public CodeSrchCondConfigVO entityVO(CodeSrchCondConfig codeSrchCondConfig) {
CodeSrchCondConfigVO codeSrchCondConfigVO = Objects.requireNonNull(BeanUtil.copy(codeSrchCondConfig, CodeSrchCondConfigVO.class));
- codeSrchCondConfigVO.setFilterTypeText(CodeReferConfigFilterTypeEnum.getTextByValue(codeSrchCondConfig.getFilterType()));
+ if(StringUtils.isNotBlank(codeSrchCondConfigVO.getFilterType())){
+ codeSrchCondConfigVO.setFilterTypeText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_FILTER_TYPE,codeSrchCondConfig.getFilterType()));
+ }
return codeSrchCondConfigVO;
+ }
+
+ public CodeSrchCondConfig entityDOsetReferConfigOid(CodeSrchCondConfigVO codeSrchCondConfigVO,String oid) {
+ CodeSrchCondConfig codeSrchCondConfig = entityDO(codeSrchCondConfigVO);
+ codeSrchCondConfig.setReferConfigOid(oid);
+ return codeSrchCondConfig;
}
public CodeSrchCondConfig entityDO(CodeSrchCondConfigVO codeSrchCondConfigVO) {
CodeSrchCondConfig codeSrchCondConfig = Objects.requireNonNull(BeanUtil.copy(codeSrchCondConfigVO, CodeSrchCondConfig.class));
- codeSrchCondConfig.setFilterType(CodeReferConfigFieldTypeEnum.getTextByValue(codeSrchCondConfigVO.getFilterTypeText()));
+ if(StringUtils.isNotBlank(codeSrchCondConfigVO.getFilterTypeText())){
+ codeSrchCondConfig.setFilterType(CodeReferConfigFieldTypeEnum.getTextByValue(codeSrchCondConfigVO.getFilterTypeText()));
+ }
+ codeSrchCondConfig.setReferConfigOid(codeSrchCondConfigVO.getOid());
return codeSrchCondConfig;
}
@@ -42,4 +56,8 @@
return (List)codeSrchCondConfigVOS.stream().map(this::entityDO).collect(Collectors.toList());
}
+ public List<CodeSrchCondConfig> listDO(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS,String oid) {
+ return (List)codeSrchCondConfigVOS.stream().map(item->entityDOsetReferConfigOid(item,oid)).collect(Collectors.toList());
+ }
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempbuttonWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempbuttonWrapper.java
index 1a2d263..db4c4ef 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempbuttonWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempbuttonWrapper.java
@@ -16,9 +16,12 @@
*/
package com.vci.ubcs.code.wrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.code.entity.CodeClassifyTemplateButton;
import com.vci.ubcs.code.enumpack.CodeButtonUseEnum;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateButtonVO;
+import com.vci.ubcs.omd.cache.EnumCache;
+import com.vci.ubcs.omd.enums.EnumEnum;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import java.util.Objects;
@@ -39,7 +42,9 @@
public CodeClassifyTemplateButtonVO entityVO(CodeClassifyTemplateButton CodeTempbuttonDO) {
CodeClassifyTemplateButtonVO codeClassifyTemplateButtonVO = Objects.requireNonNull(BeanUtil.copy(CodeTempbuttonDO, CodeClassifyTemplateButtonVO.class));
- codeClassifyTemplateButtonVO.setButtonUseText(CodeButtonUseEnum.getTextByValue(CodeTempbuttonDO.getButtonUse()));
+ if(StringUtils.isNotBlank(CodeTempbuttonDO.getButtonUse())){
+ codeClassifyTemplateButtonVO.setButtonUseText(EnumCache.getValue(EnumEnum.CODE_TEMPLATE_BUTTON_USE,CodeTempbuttonDO.getButtonUse()));
+ }
return codeClassifyTemplateButtonVO;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml
index c11871c..1c52c2b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml
@@ -57,6 +57,7 @@
<result property="customCodeSerialClass" column="CUSTOMCODESERIALCLASS" jdbcType="VARCHAR"/>
<result property="matchClassifyValueFlag" column="MATCHCLASSIFYVALUEFLAG" jdbcType="VARCHAR"/>
<result property="parentClassifySecOid" column="PARENTCLASSIFYSECOID" jdbcType="VARCHAR"/>
+ <result property="parentClassifySecText" column="b__name" jdbcType="VARCHAR"/>
<result property="nullableFlag" column="NULLABLEFLAG" jdbcType="VARCHAR"/>
<result property="componentCodeFlag" column="COMPONENTCODEFLAG" jdbcType="VARCHAR"/>
<result property="serialDependFlag" column="SERIALDEPENDFLAG" jdbcType="VARCHAR"/>
@@ -70,71 +71,71 @@
</resultMap>
<select id="selectCodeBasicSecPage" resultMap="CodeBasicsecMap">
- select PL_CODE_BASICSEC.oid,
- PL_CODE_BASICSEC.revisionoid,
- PL_CODE_BASICSEC.nameoid,
- PL_CODE_BASICSEC.btmname,
- PL_CODE_BASICSEC.lastr,
- PL_CODE_BASICSEC.firstr,
- PL_CODE_BASICSEC.lastv,
- PL_CODE_BASICSEC.firstv,
- PL_CODE_BASICSEC.creator,
- PL_CODE_BASICSEC.createtime,
- PL_CODE_BASICSEC.lastmodifier,
- PL_CODE_BASICSEC.lastmodifytime,
- PL_CODE_BASICSEC.revisionrule,
- PL_CODE_BASICSEC.versionrule,
- PL_CODE_BASICSEC.revisionseq,
- PL_CODE_BASICSEC.revisionvalue,
- PL_CODE_BASICSEC.versionseq,
- PL_CODE_BASICSEC.versionvalue,
- PL_CODE_BASICSEC.lctid,
- PL_CODE_BASICSEC.lcstatus,
- PL_CODE_BASICSEC.ts,
- PL_CODE_BASICSEC.id,
- PL_CODE_BASICSEC.name,
- PL_CODE_BASICSEC.description,
- PL_CODE_BASICSEC.owner,
- PL_CODE_BASICSEC.copyfromversion,
- PL_CODE_BASICSEC.codefillseparator,
- PL_CODE_BASICSEC.codeseclength,
- PL_CODE_BASICSEC.valuecuttype,
- PL_CODE_BASICSEC.codefilltype,
- PL_CODE_BASICSEC.refervalueinfo,
- PL_CODE_BASICSEC.referattributeid,
- PL_CODE_BASICSEC.getvalueclass,
- PL_CODE_BASICSEC.displayflag,
- PL_CODE_BASICSEC.parentclassifysecoid,
- PL_CODE_BASICSEC.serialstep,
- PL_CODE_BASICSEC.serialdependflag,
- PL_CODE_BASICSEC.filtersql,
- PL_CODE_BASICSEC.codedateformatstr,
- PL_CODE_BASICSEC.refercodeclassifyoid,
- PL_CODE_BASICSEC.codeleveltype,
- PL_CODE_BASICSEC.codeseclengthtype,
- PL_CODE_BASICSEC.referattributename,
- PL_CODE_BASICSEC.referbtmname,
- PL_CODE_BASICSEC.codefillflag,
- PL_CODE_BASICSEC.valuecutlength,
- PL_CODE_BASICSEC.codegetvaluetype,
- PL_CODE_BASICSEC.referbtmid,
- PL_CODE_BASICSEC.codefilltypetext,
- PL_CODE_BASICSEC.codelevelvalue,
- PL_CODE_BASICSEC.codefilllength,
- PL_CODE_BASICSEC.customcodeserialclass,
- PL_CODE_BASICSEC.matchclassifyvalueflag,
- PL_CODE_BASICSEC.sectype,
- PL_CODE_BASICSEC.pkcoderule,
- PL_CODE_BASICSEC.ordernum,
- PL_CODE_BASICSEC.referconfig,
- PL_CODE_BASICSEC.serialstart,
- PL_CODE_BASICSEC.componentcodeflag,
- PL_CODE_BASICSEC.serialdependorder,
- PL_CODE_BASICSEC.nullableflag,
- PL_CODE_BASICSEC.codefilllimit,
- btm_codebasicsec_1.name as b__name,
- platformbtm_codeclassify.name as c__name,
- COUNT(*) OVER () "##VCI_COUNT_VCI##"
+ SELECT PL_CODE_BASICSEC.oid,
+ PL_CODE_BASICSEC.revisionoid,
+ PL_CODE_BASICSEC.nameoid,
+ PL_CODE_BASICSEC.btmname,
+ PL_CODE_BASICSEC.lastr,
+ PL_CODE_BASICSEC.firstr,
+ PL_CODE_BASICSEC.lastv,
+ PL_CODE_BASICSEC.firstv,
+ PL_CODE_BASICSEC.creator,
+ PL_CODE_BASICSEC.createtime,
+ PL_CODE_BASICSEC.lastmodifier,
+ PL_CODE_BASICSEC.lastmodifytime,
+ PL_CODE_BASICSEC.revisionrule,
+ PL_CODE_BASICSEC.versionrule,
+ PL_CODE_BASICSEC.revisionseq,
+ PL_CODE_BASICSEC.revisionvalue,
+ PL_CODE_BASICSEC.versionseq,
+ PL_CODE_BASICSEC.versionvalue,
+ PL_CODE_BASICSEC.lctid,
+ PL_CODE_BASICSEC.lcstatus,
+ PL_CODE_BASICSEC.ts,
+ PL_CODE_BASICSEC.id,
+ PL_CODE_BASICSEC.name,
+ PL_CODE_BASICSEC.description,
+ PL_CODE_BASICSEC.owner,
+ PL_CODE_BASICSEC.copyfromversion,
+ PL_CODE_BASICSEC.codefillseparator,
+ PL_CODE_BASICSEC.codeseclength,
+ PL_CODE_BASICSEC.valuecuttype,
+ PL_CODE_BASICSEC.codefilltype,
+ PL_CODE_BASICSEC.refervalueinfo,
+ PL_CODE_BASICSEC.referattributeid,
+ PL_CODE_BASICSEC.getvalueclass,
+ PL_CODE_BASICSEC.displayflag,
+ PL_CODE_BASICSEC.parentclassifysecoid,
+ PL_CODE_BASICSEC.serialstep,
+ PL_CODE_BASICSEC.serialdependflag,
+ PL_CODE_BASICSEC.filtersql,
+ PL_CODE_BASICSEC.codedateformatstr,
+ PL_CODE_BASICSEC.refercodeclassifyoid,
+ PL_CODE_BASICSEC.codeleveltype,
+ PL_CODE_BASICSEC.codeseclengthtype,
+ PL_CODE_BASICSEC.referattributename,
+ PL_CODE_BASICSEC.referbtmname,
+ PL_CODE_BASICSEC.codefillflag,
+ PL_CODE_BASICSEC.valuecutlength,
+ PL_CODE_BASICSEC.codegetvaluetype,
+ PL_CODE_BASICSEC.referbtmid,
+ PL_CODE_BASICSEC.codefilltypetext,
+ PL_CODE_BASICSEC.codelevelvalue,
+ PL_CODE_BASICSEC.codefilllength,
+ PL_CODE_BASICSEC.customcodeserialclass,
+ PL_CODE_BASICSEC.matchclassifyvalueflag,
+ PL_CODE_BASICSEC.sectype,
+ PL_CODE_BASICSEC.pkcoderule,
+ PL_CODE_BASICSEC.ordernum,
+ PL_CODE_BASICSEC.referconfig,
+ PL_CODE_BASICSEC.serialstart,
+ PL_CODE_BASICSEC.componentcodeflag,
+ PL_CODE_BASICSEC.serialdependorder,
+ PL_CODE_BASICSEC.nullableflag,
+ PL_CODE_BASICSEC.codefilllimit,
+ btm_codebasicsec_1.name as b__name,
+ platformbtm_codeclassify.name as c__name,
+ COUNT(*) OVER () "##VCI_COUNT_VCI##"
from PL_CODE_BASICSEC
left join pl_code_basicsec btm_codebasicsec_1
on btm_codebasicsec_1.oid = PL_CODE_BASICSEC.parentclassifysecoid
@@ -166,7 +167,7 @@
</select>
- <insert id="insertBatch" keyProperty="oid" useGeneratedKeys="true">
+ <!-- <insert id="insertBatch" keyProperty="oid" useGeneratedKeys="true">
insert into PL_CODE_BASICSEC(REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME,
LASTMODIFIER, LASTMODIFYTIME, REVISIONRULE, VERSIONRULE, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE,
LCTID, LCSTATUS, TS, ID, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, SECTYPE, PKCODERULE, ORDERNUM,
@@ -194,12 +195,7 @@
#{entity.referattributename}, #{entity.referattributeid}, #{entity.referbtmname}, #{entity.referbtmid}
from dual
</foreach>
- </insert>
-
- <select id="countByCondition" resultType="java.lang.Long">
-
-
- </select>
+ </insert>-->
<select id="getOidByCodeclassifysecOid" resultType="java.lang.String">
SELECT OID
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
index 6216656..3238bb9 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
@@ -121,6 +121,9 @@
<if test="codeReferConfig.tenantId != null and codeReferConfig.tenantId != ''">
PCR.TENANTID = #{codeReferConfig.tenantId}
</if>
+ <if test="codeReferConfig.isOpenGlobal != null and codeReferConfig.isOpenGlobal != ''">
+ OR PCR.ISOPENGLOBAL = #{codeReferConfig.isOpenGlobal}
+ </if>
<if test="codeReferConfig.name != null and codeReferConfig.name != ''">
and NAME like CONCAT(CONCAT('%', #{codeReferConfig.name}), '%')
</if>
@@ -141,7 +144,8 @@
PCS.ATTRSORTFIELD,
PCS.WIDTH,
PCS.FIXEDPOSITION,
- PCS.TEMPLET
+ PCS.TEMPLET,
+ PCS.ISQUERY
FROM PL_CODE_REFERCONFIG PCR
LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID)
temp WHERE temp.REFERCONFIGOID = #{oid}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeShowFieldConfigMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeShowFieldConfigMapper.xml
index 6afa54d..cbb3e04 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeShowFieldConfigMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeShowFieldConfigMapper.xml
@@ -3,395 +3,19 @@
<mapper namespace="com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper">
<resultMap type="com.vci.ubcs.code.entity.CodeShowFieldConfig" id="PlCodeShowfieldconfigMap">
- <result property="oid" column="OID" jdbcType="VARCHAR"/>
- <result property="revisionOid" column="REVISIONOID" jdbcType="VARCHAR"/>
- <result property="nameOid" column="NAMEOID" jdbcType="VARCHAR"/>
- <result property="btmname" column="BTMNAME" jdbcType="VARCHAR"/>
- <result property="lastR" column="LASTR" jdbcType="VARCHAR"/>
- <result property="firstR" column="FIRSTR" jdbcType="VARCHAR"/>
- <result property="lastV" column="LASTV" jdbcType="VARCHAR"/>
- <result property="firstV" column="FIRSTV" jdbcType="VARCHAR"/>
- <result property="creator" column="CREATOR" jdbcType="VARCHAR"/>
- <result property="createTime" column="CREATETIME" jdbcType="VARCHAR"/>
- <result property="revisionSeq" column="REVISIONSEQ" jdbcType="INTEGER"/>
- <result property="revisionValue" column="REVISIONVALUE" jdbcType="VARCHAR"/>
- <result property="versionSeq" column="VERSIONSEQ" jdbcType="INTEGER"/>
- <result property="versionValue" column="VERSIONVALUE" jdbcType="VARCHAR"/>
- <result property="lctid" column="LCTID" jdbcType="VARCHAR"/>
- <result property="lcStatus" column="LCSTATUS" jdbcType="VARCHAR"/>
- <result property="ts" column="TS" jdbcType="VARCHAR"/>
- <result property="name" column="NAME" jdbcType="VARCHAR"/>
- <result property="description" column="DESCRIPTION" jdbcType="VARCHAR"/>
- <result property="owner" column="OWNER" jdbcType="VARCHAR"/>
- <result property="copyFromVersion" column="COPYFROMVERSION" jdbcType="VARCHAR"/>
+ <id column="OID" property="oid"/>
<result property="orderNum" column="ORDERNUM" jdbcType="INTEGER"/>
<result property="field" column="FIELD" jdbcType="VARCHAR"/>
<result property="title" column="TITLE" jdbcType="VARCHAR"/>
<result property="fieldType" column="FIELDTYPE" jdbcType="VARCHAR"/>
<result property="sort" column="SORT" jdbcType="VARCHAR"/>
- <result property="sortField" column="SORTFIELD" jdbcType="VARCHAR"/>
+ <result property="attrSortField" column="ATTRSORTFIELD" jdbcType="VARCHAR"/>
<result property="width" column="WIDTH" jdbcType="INTEGER"/>
- <result property="fixedText" column="FIXEDTEXT" jdbcType="VARCHAR"/>
+ <result property="fixedPosition" column="FIXEDPOSITION" jdbcType="VARCHAR"/>
<result property="templet" column="TEMPLET" jdbcType="VARCHAR"/>
+ <result property="isQuery" column="ISQUERY" jdbcType="VARCHAR"/>
</resultMap>
- <!--鏌ヨ鍗曚釜-->
- <select id="queryById" resultMap="PlCodeShowfieldconfigMap">
- select
- OID, REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE, LCTID, LCSTATUS, TS, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, ORDERNUM, FIELD, TITLE, FIELDTYPE, SORT, SORTFIELD, WIDTH, FIXEDTEXT, TEMPLET
- from PL_CODE_SHOWFIELDCONFIG
- where OID = #{oid}
- </select>
-
- <!--鏌ヨ鎸囧畾琛屾暟鎹�-->
- <select id="queryAllByLimit" resultMap="PlCodeShowfieldconfigMap">
- select
- OID, REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE, LCTID, LCSTATUS, TS, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, ORDERNUM, FIELD, TITLE, FIELDTYPE, SORT, SORTFIELD, WIDTH, FIXEDTEXT, TEMPLET
- from PL_CODE_SHOWFIELDCONFIG
- <where>
- <if test="oid != null and oid != ''">
- and OID = #{oid}
- </if>
- <if test="revisionoid != null and revisionoid != ''">
- and REVISIONOID = #{revisionoid}
- </if>
- <if test="nameoid != null and nameoid != ''">
- and NAMEOID = #{nameoid}
- </if>
- <if test="btmname != null and btmname != ''">
- and BTMNAME = #{btmname}
- </if>
- <if test="lastr != null and lastr != ''">
- and LASTR = #{lastr}
- </if>
- <if test="firstr != null and firstr != ''">
- and FIRSTR = #{firstr}
- </if>
- <if test="lastv != null and lastv != ''">
- and LASTV = #{lastv}
- </if>
- <if test="firstv != null and firstv != ''">
- and FIRSTV = #{firstv}
- </if>
- <if test="creator != null and creator != ''">
- and CREATOR = #{creator}
- </if>
- <if test="createtime != null and createtime != ''">
- and CREATETIME = #{createtime}
- </if>
- <if test="revisionseq != null">
- and REVISIONSEQ = #{revisionseq}
- </if>
- <if test="revisionvalue != null and revisionvalue != ''">
- and REVISIONVALUE = #{revisionvalue}
- </if>
- <if test="versionseq != null">
- and VERSIONSEQ = #{versionseq}
- </if>
- <if test="versionvalue != null and versionvalue != ''">
- and VERSIONVALUE = #{versionvalue}
- </if>
- <if test="lctid != null and lctid != ''">
- and LCTID = #{lctid}
- </if>
- <if test="lcstatus != null and lcstatus != ''">
- and LCSTATUS = #{lcstatus}
- </if>
- <if test="ts != null and ts != ''">
- and TS = #{ts}
- </if>
- <if test="name != null and name != ''">
- and NAME = #{name}
- </if>
- <if test="description != null and description != ''">
- and DESCRIPTION = #{description}
- </if>
- <if test="owner != null and owner != ''">
- and OWNER = #{owner}
- </if>
- <if test="copyfromversion != null and copyfromversion != ''">
- and COPYFROMVERSION = #{copyfromversion}
- </if>
- <if test="ordernum != null">
- and ORDERNUM = #{ordernum}
- </if>
- <if test="field != null and field != ''">
- and FIELD = #{field}
- </if>
- <if test="title != null and title != ''">
- and TITLE = #{title}
- </if>
- <if test="fieldtype != null and fieldtype != ''">
- and FIELDTYPE = #{fieldtype}
- </if>
- <if test="sort != null and sort != ''">
- and SORT = #{sort}
- </if>
- <if test="sortfield != null and sortfield != ''">
- and SORTFIELD = #{sortfield}
- </if>
- <if test="width != null">
- and WIDTH = #{width}
- </if>
- <if test="fixedtext != null and fixedtext != ''">
- and FIXEDTEXT = #{fixedtext}
- </if>
- <if test="templet != null and templet != ''">
- and TEMPLET = #{templet}
- </if>
- </where>
- limit #{pageable.offset}, #{pageable.pageSize}
- </select>
-
- <!--缁熻鎬昏鏁�-->
- <select id="count" resultType="java.lang.Long">
- select count(1)
- from PL_CODE_SHOWFIELDCONFIG
- <where>
- <if test="oid != null and oid != ''">
- and OID = #{oid}
- </if>
- <if test="revisionoid != null and revisionoid != ''">
- and REVISIONOID = #{revisionoid}
- </if>
- <if test="nameoid != null and nameoid != ''">
- and NAMEOID = #{nameoid}
- </if>
- <if test="btmname != null and btmname != ''">
- and BTMNAME = #{btmname}
- </if>
- <if test="lastr != null and lastr != ''">
- and LASTR = #{lastr}
- </if>
- <if test="firstr != null and firstr != ''">
- and FIRSTR = #{firstr}
- </if>
- <if test="lastv != null and lastv != ''">
- and LASTV = #{lastv}
- </if>
- <if test="firstv != null and firstv != ''">
- and FIRSTV = #{firstv}
- </if>
- <if test="creator != null and creator != ''">
- and CREATOR = #{creator}
- </if>
- <if test="createtime != null and createtime != ''">
- and CREATETIME = #{createtime}
- </if>
- <if test="revisionseq != null">
- and REVISIONSEQ = #{revisionseq}
- </if>
- <if test="revisionvalue != null and revisionvalue != ''">
- and REVISIONVALUE = #{revisionvalue}
- </if>
- <if test="versionseq != null">
- and VERSIONSEQ = #{versionseq}
- </if>
- <if test="versionvalue != null and versionvalue != ''">
- and VERSIONVALUE = #{versionvalue}
- </if>
- <if test="lctid != null and lctid != ''">
- and LCTID = #{lctid}
- </if>
- <if test="lcstatus != null and lcstatus != ''">
- and LCSTATUS = #{lcstatus}
- </if>
- <if test="ts != null and ts != ''">
- and TS = #{ts}
- </if>
- <if test="name != null and name != ''">
- and NAME = #{name}
- </if>
- <if test="description != null and description != ''">
- and DESCRIPTION = #{description}
- </if>
- <if test="owner != null and owner != ''">
- and OWNER = #{owner}
- </if>
- <if test="copyfromversion != null and copyfromversion != ''">
- and COPYFROMVERSION = #{copyfromversion}
- </if>
- <if test="ordernum != null">
- and ORDERNUM = #{ordernum}
- </if>
- <if test="field != null and field != ''">
- and FIELD = #{field}
- </if>
- <if test="title != null and title != ''">
- and TITLE = #{title}
- </if>
- <if test="fieldtype != null and fieldtype != ''">
- and FIELDTYPE = #{fieldtype}
- </if>
- <if test="sort != null and sort != ''">
- and SORT = #{sort}
- </if>
- <if test="sortfield != null and sortfield != ''">
- and SORTFIELD = #{sortfield}
- </if>
- <if test="width != null">
- and WIDTH = #{width}
- </if>
- <if test="fixedtext != null and fixedtext != ''">
- and FIXEDTEXT = #{fixedtext}
- </if>
- <if test="templet != null and templet != ''">
- and TEMPLET = #{templet}
- </if>
- </where>
- </select>
-
- <!--鏂板鎵�鏈夊垪-->
- <insert id="insert" keyProperty="oid" useGeneratedKeys="true">
- insert into PL_CODE_SHOWFIELDCONFIG(REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE, LCTID, LCSTATUS, TS, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, ORDERNUM, FIELD, TITLE, FIELDTYPE, SORT, SORTFIELD, WIDTH, FIXEDTEXT, TEMPLET)
- values (#{revisionoid}, #{nameoid}, #{btmname}, #{lastr}, #{firstr}, #{lastv}, #{firstv}, #{creator}, #{createtime}, #{revisionseq}, #{revisionvalue}, #{versionseq}, #{versionvalue}, #{lctid}, #{lcstatus}, #{ts}, #{name}, #{description}, #{owner}, #{copyfromversion}, #{ordernum}, #{field}, #{title}, #{fieldtype}, #{sort}, #{sortfield}, #{width}, #{fixedtext}, #{templet})
- </insert>
-
- <insert id="insertBatch" keyProperty="oid" useGeneratedKeys="true">
- insert into PL_CODE_SHOWFIELDCONFIG(REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE, LCTID, LCSTATUS, TS, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, ORDERNUM, FIELD, TITLE, FIELDTYPE, SORT, SORTFIELD, WIDTH, FIXEDTEXT, TEMPLET)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.revisionoid}, #{entity.nameoid}, #{entity.btmname}, #{entity.lastr}, #{entity.firstr}, #{entity.lastv}, #{entity.firstv}, #{entity.creator}, #{entity.createtime}, #{entity.revisionseq}, #{entity.revisionvalue}, #{entity.versionseq}, #{entity.versionvalue}, #{entity.lctid}, #{entity.lcstatus}, #{entity.ts}, #{entity.name}, #{entity.description}, #{entity.owner}, #{entity.copyfromversion}, #{entity.ordernum}, #{entity.field}, #{entity.title}, #{entity.fieldtype}, #{entity.sort}, #{entity.sortfield}, #{entity.width}, #{entity.fixedtext}, #{entity.templet})
- </foreach>
- </insert>
-
- <insert id="insertOrUpdateBatch" keyProperty="oid" useGeneratedKeys="true">
- insert into PL_CODE_SHOWFIELDCONFIG(REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE, LCTID, LCSTATUS, TS, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, ORDERNUM, FIELD, TITLE, FIELDTYPE, SORT, SORTFIELD, WIDTH, FIXEDTEXT, TEMPLET)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.revisionoid}, #{entity.nameoid}, #{entity.btmname}, #{entity.lastr}, #{entity.firstr}, #{entity.lastv}, #{entity.firstv}, #{entity.creator}, #{entity.createtime}, #{entity.revisionseq}, #{entity.revisionvalue}, #{entity.versionseq}, #{entity.versionvalue}, #{entity.lctid}, #{entity.lcstatus}, #{entity.ts}, #{entity.name}, #{entity.description}, #{entity.owner}, #{entity.copyfromversion}, #{entity.ordernum}, #{entity.field}, #{entity.title}, #{entity.fieldtype}, #{entity.sort}, #{entity.sortfield}, #{entity.width}, #{entity.fixedtext}, #{entity.templet})
- </foreach>
- on duplicate key update
- REVISIONOID = values(REVISIONOID),
- NAMEOID = values(NAMEOID),
- BTMNAME = values(BTMNAME),
- LASTR = values(LASTR),
- FIRSTR = values(FIRSTR),
- LASTV = values(LASTV),
- FIRSTV = values(FIRSTV),
- CREATOR = values(CREATOR),
- CREATETIME = values(CREATETIME),
- REVISIONSEQ = values(REVISIONSEQ),
- REVISIONVALUE = values(REVISIONVALUE),
- VERSIONSEQ = values(VERSIONSEQ),
- VERSIONVALUE = values(VERSIONVALUE),
- LCTID = values(LCTID),
- LCSTATUS = values(LCSTATUS),
- TS = values(TS),
- NAME = values(NAME),
- DESCRIPTION = values(DESCRIPTION),
- OWNER = values(OWNER),
- COPYFROMVERSION = values(COPYFROMVERSION),
- ORDERNUM = values(ORDERNUM),
- FIELD = values(FIELD),
- TITLE = values(TITLE),
- FIELDTYPE = values(FIELDTYPE),
- SORT = values(SORT),
- SORTFIELD = values(SORTFIELD),
- WIDTH = values(WIDTH),
- FIXEDTEXT = values(FIXEDTEXT),
- TEMPLET = values(TEMPLET)
- </insert>
-
- <!--閫氳繃涓婚敭淇敼鏁版嵁-->
- <update id="update">
- update PL_CODE_SHOWFIELDCONFIG
- <set>
- <if test="revisionoid != null and revisionoid != ''">
- REVISIONOID = #{revisionoid},
- </if>
- <if test="nameoid != null and nameoid != ''">
- NAMEOID = #{nameoid},
- </if>
- <if test="btmname != null and btmname != ''">
- BTMNAME = #{btmname},
- </if>
- <if test="lastr != null and lastr != ''">
- LASTR = #{lastr},
- </if>
- <if test="firstr != null and firstr != ''">
- FIRSTR = #{firstr},
- </if>
- <if test="lastv != null and lastv != ''">
- LASTV = #{lastv},
- </if>
- <if test="firstv != null and firstv != ''">
- FIRSTV = #{firstv},
- </if>
- <if test="creator != null and creator != ''">
- CREATOR = #{creator},
- </if>
- <if test="createtime != null and createtime != ''">
- CREATETIME = #{createtime},
- </if>
- <if test="revisionseq != null">
- REVISIONSEQ = #{revisionseq},
- </if>
- <if test="revisionvalue != null and revisionvalue != ''">
- REVISIONVALUE = #{revisionvalue},
- </if>
- <if test="versionseq != null">
- VERSIONSEQ = #{versionseq},
- </if>
- <if test="versionvalue != null and versionvalue != ''">
- VERSIONVALUE = #{versionvalue},
- </if>
- <if test="lctid != null and lctid != ''">
- LCTID = #{lctid},
- </if>
- <if test="lcstatus != null and lcstatus != ''">
- LCSTATUS = #{lcstatus},
- </if>
- <if test="ts != null and ts != ''">
- TS = #{ts},
- </if>
- <if test="name != null and name != ''">
- NAME = #{name},
- </if>
- <if test="description != null and description != ''">
- DESCRIPTION = #{description},
- </if>
- <if test="owner != null and owner != ''">
- OWNER = #{owner},
- </if>
- <if test="copyfromversion != null and copyfromversion != ''">
- COPYFROMVERSION = #{copyfromversion},
- </if>
- <if test="ordernum != null">
- ORDERNUM = #{ordernum},
- </if>
- <if test="field != null and field != ''">
- FIELD = #{field},
- </if>
- <if test="title != null and title != ''">
- TITLE = #{title},
- </if>
- <if test="fieldtype != null and fieldtype != ''">
- FIELDTYPE = #{fieldtype},
- </if>
- <if test="sort != null and sort != ''">
- SORT = #{sort},
- </if>
- <if test="sortfield != null and sortfield != ''">
- SORTFIELD = #{sortfield},
- </if>
- <if test="width != null">
- WIDTH = #{width},
- </if>
- <if test="fixedtext != null and fixedtext != ''">
- FIXEDTEXT = #{fixedtext},
- </if>
- <if test="templet != null and templet != ''">
- TEMPLET = #{templet},
- </if>
- </set>
- where OID = #{oid}
- </update>
-
- <!--閫氳繃涓婚敭鍒犻櫎-->
- <delete id="deleteById">
- delete from PL_CODE_SHOWFIELDCONFIG where OID = #{oid}
- </delete>
</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeSrchCondConfigMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeSrchCondConfigMapper.xml
index 4557d3a..95368ed 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeSrchCondConfigMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeSrchCondConfigMapper.xml
@@ -3,340 +3,12 @@
<mapper namespace="com.vci.ubcs.code.mapper.CodeSrchCondConfigMapper">
<resultMap type="com.vci.ubcs.code.entity.CodeSrchCondConfig" id="PlCodeSrchcondconfigMap">
- <result property="oid" column="OID" jdbcType="VARCHAR"/>
- <result property="revisionOid" column="REVISIONOID" jdbcType="VARCHAR"/>
- <result property="nameOid" column="NAMEOID" jdbcType="VARCHAR"/>
- <result property="btmname" column="BTMNAME" jdbcType="VARCHAR"/>
- <result property="lastR" column="LASTR" jdbcType="VARCHAR"/>
- <result property="firstR" column="FIRSTR" jdbcType="VARCHAR"/>
- <result property="lastV" column="LASTV" jdbcType="VARCHAR"/>
- <result property="firstV" column="FIRSTV" jdbcType="VARCHAR"/>
- <result property="creator" column="CREATOR" jdbcType="VARCHAR"/>
- <result property="createTime" column="CREATETIME" jdbcType="VARCHAR"/>
- <result property="revisionSeq" column="REVISIONSEQ" jdbcType="INTEGER"/>
- <result property="revisionValue" column="REVISIONVALUE" jdbcType="VARCHAR"/>
- <result property="versionSeq" column="VERSIONSEQ" jdbcType="INTEGER"/>
- <result property="versionValue" column="VERSIONVALUE" jdbcType="VARCHAR"/>
- <result property="lctid" column="LCTID" jdbcType="VARCHAR"/>
- <result property="lcStatus" column="LCSTATUS" jdbcType="VARCHAR"/>
- <result property="ts" column="TS" jdbcType="VARCHAR"/>
- <result property="name" column="NAME" jdbcType="VARCHAR"/>
- <result property="description" column="DESCRIPTION" jdbcType="VARCHAR"/>
- <result property="owner" column="OWNER" jdbcType="VARCHAR"/>
- <result property="copyFromVersion" column="COPYFROMVERSION" jdbcType="VARCHAR"/>
+ <id column="OID" property="oid"/>
<result property="orderNum" column="ORDERNUM" jdbcType="INTEGER"/>
<result property="filterField" column="FILTERFIELD" jdbcType="VARCHAR"/>
<result property="filterType" column="FILTERTYPE" jdbcType="VARCHAR"/>
<result property="filterValue" column="FILTERVALUE" jdbcType="VARCHAR"/>
</resultMap>
-
- <!--鏌ヨ鍗曚釜-->
- <select id="queryById" resultMap="PlCodeSrchcondconfigMap">
- select
- OID, REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE, LCTID, LCSTATUS, TS, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, ORDERNUM, FILTERFIELD, FILTERTYPE, FILTERVALUE
- from PL_CODE_SRCHCONDCONFIG
- where OID = #{oid}
- </select>
-
- <!--鏌ヨ鎸囧畾琛屾暟鎹�-->
- <select id="queryAllByLimit" resultMap="PlCodeSrchcondconfigMap">
- select
- OID, REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE, LCTID, LCSTATUS, TS, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, ORDERNUM, FILTERFIELD, FILTERTYPE, FILTERVALUE
- from PL_CODE_SRCHCONDCONFIG
- <where>
- <if test="oid != null and oid != ''">
- and OID = #{oid}
- </if>
- <if test="revisionoid != null and revisionoid != ''">
- and REVISIONOID = #{revisionoid}
- </if>
- <if test="nameoid != null and nameoid != ''">
- and NAMEOID = #{nameoid}
- </if>
- <if test="btmname != null and btmname != ''">
- and BTMNAME = #{btmname}
- </if>
- <if test="lastr != null and lastr != ''">
- and LASTR = #{lastr}
- </if>
- <if test="firstr != null and firstr != ''">
- and FIRSTR = #{firstr}
- </if>
- <if test="lastv != null and lastv != ''">
- and LASTV = #{lastv}
- </if>
- <if test="firstv != null and firstv != ''">
- and FIRSTV = #{firstv}
- </if>
- <if test="creator != null and creator != ''">
- and CREATOR = #{creator}
- </if>
- <if test="createtime != null and createtime != ''">
- and CREATETIME = #{createtime}
- </if>
- <if test="revisionseq != null">
- and REVISIONSEQ = #{revisionseq}
- </if>
- <if test="revisionvalue != null and revisionvalue != ''">
- and REVISIONVALUE = #{revisionvalue}
- </if>
- <if test="versionseq != null">
- and VERSIONSEQ = #{versionseq}
- </if>
- <if test="versionvalue != null and versionvalue != ''">
- and VERSIONVALUE = #{versionvalue}
- </if>
- <if test="lctid != null and lctid != ''">
- and LCTID = #{lctid}
- </if>
- <if test="lcstatus != null and lcstatus != ''">
- and LCSTATUS = #{lcstatus}
- </if>
- <if test="ts != null and ts != ''">
- and TS = #{ts}
- </if>
- <if test="name != null and name != ''">
- and NAME = #{name}
- </if>
- <if test="description != null and description != ''">
- and DESCRIPTION = #{description}
- </if>
- <if test="owner != null and owner != ''">
- and OWNER = #{owner}
- </if>
- <if test="copyfromversion != null and copyfromversion != ''">
- and COPYFROMVERSION = #{copyfromversion}
- </if>
- <if test="ordernum != null">
- and ORDERNUM = #{ordernum}
- </if>
- <if test="filterfield != null and filterfield != ''">
- and FILTERFIELD = #{filterfield}
- </if>
- <if test="filtertype != null and filtertype != ''">
- and FILTERTYPE = #{filtertype}
- </if>
- <if test="filtervalue != null and filtervalue != ''">
- and FILTERVALUE = #{filtervalue}
- </if>
- </where>
- limit #{pageable.offset}, #{pageable.pageSize}
- </select>
-
- <!--缁熻鎬昏鏁�-->
- <select id="count" resultType="java.lang.Long">
- select count(1)
- from PL_CODE_SRCHCONDCONFIG
- <where>
- <if test="oid != null and oid != ''">
- and OID = #{oid}
- </if>
- <if test="revisionoid != null and revisionoid != ''">
- and REVISIONOID = #{revisionoid}
- </if>
- <if test="nameoid != null and nameoid != ''">
- and NAMEOID = #{nameoid}
- </if>
- <if test="btmname != null and btmname != ''">
- and BTMNAME = #{btmname}
- </if>
- <if test="lastr != null and lastr != ''">
- and LASTR = #{lastr}
- </if>
- <if test="firstr != null and firstr != ''">
- and FIRSTR = #{firstr}
- </if>
- <if test="lastv != null and lastv != ''">
- and LASTV = #{lastv}
- </if>
- <if test="firstv != null and firstv != ''">
- and FIRSTV = #{firstv}
- </if>
- <if test="creator != null and creator != ''">
- and CREATOR = #{creator}
- </if>
- <if test="createtime != null and createtime != ''">
- and CREATETIME = #{createtime}
- </if>
- <if test="revisionseq != null">
- and REVISIONSEQ = #{revisionseq}
- </if>
- <if test="revisionvalue != null and revisionvalue != ''">
- and REVISIONVALUE = #{revisionvalue}
- </if>
- <if test="versionseq != null">
- and VERSIONSEQ = #{versionseq}
- </if>
- <if test="versionvalue != null and versionvalue != ''">
- and VERSIONVALUE = #{versionvalue}
- </if>
- <if test="lctid != null and lctid != ''">
- and LCTID = #{lctid}
- </if>
- <if test="lcstatus != null and lcstatus != ''">
- and LCSTATUS = #{lcstatus}
- </if>
- <if test="ts != null and ts != ''">
- and TS = #{ts}
- </if>
- <if test="name != null and name != ''">
- and NAME = #{name}
- </if>
- <if test="description != null and description != ''">
- and DESCRIPTION = #{description}
- </if>
- <if test="owner != null and owner != ''">
- and OWNER = #{owner}
- </if>
- <if test="copyfromversion != null and copyfromversion != ''">
- and COPYFROMVERSION = #{copyfromversion}
- </if>
- <if test="ordernum != null">
- and ORDERNUM = #{ordernum}
- </if>
- <if test="filterfield != null and filterfield != ''">
- and FILTERFIELD = #{filterfield}
- </if>
- <if test="filtertype != null and filtertype != ''">
- and FILTERTYPE = #{filtertype}
- </if>
- <if test="filtervalue != null and filtervalue != ''">
- and FILTERVALUE = #{filtervalue}
- </if>
- </where>
- </select>
-
- <!--鏂板鎵�鏈夊垪-->
- <insert id="insert" keyProperty="oid" useGeneratedKeys="true">
- insert into PL_CODE_SRCHCONDCONFIG(REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE, LCTID, LCSTATUS, TS, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, ORDERNUM, FILTERFIELD, FILTERTYPE, FILTERVALUE)
- values (#{revisionoid}, #{nameoid}, #{btmname}, #{lastr}, #{firstr}, #{lastv}, #{firstv}, #{creator}, #{createtime}, #{revisionseq}, #{revisionvalue}, #{versionseq}, #{versionvalue}, #{lctid}, #{lcstatus}, #{ts}, #{name}, #{description}, #{owner}, #{copyfromversion}, #{ordernum}, #{filterfield}, #{filtertype}, #{filtervalue})
- </insert>
-
- <insert id="insertBatch" keyProperty="oid" useGeneratedKeys="true">
- insert into PL_CODE_SRCHCONDCONFIG(REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE, LCTID, LCSTATUS, TS, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, ORDERNUM, FILTERFIELD, FILTERTYPE, FILTERVALUE)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.revisionoid}, #{entity.nameoid}, #{entity.btmname}, #{entity.lastr}, #{entity.firstr}, #{entity.lastv}, #{entity.firstv}, #{entity.creator}, #{entity.createtime}, #{entity.revisionseq}, #{entity.revisionvalue}, #{entity.versionseq}, #{entity.versionvalue}, #{entity.lctid}, #{entity.lcstatus}, #{entity.ts}, #{entity.name}, #{entity.description}, #{entity.owner}, #{entity.copyfromversion}, #{entity.ordernum}, #{entity.filterfield}, #{entity.filtertype}, #{entity.filtervalue})
- </foreach>
- </insert>
-
- <insert id="insertOrUpdateBatch" keyProperty="oid" useGeneratedKeys="true">
- insert into PL_CODE_SRCHCONDCONFIG(REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE, LCTID, LCSTATUS, TS, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, ORDERNUM, FILTERFIELD, FILTERTYPE, FILTERVALUE)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.revisionoid}, #{entity.nameoid}, #{entity.btmname}, #{entity.lastr}, #{entity.firstr}, #{entity.lastv}, #{entity.firstv}, #{entity.creator}, #{entity.createtime}, #{entity.revisionseq}, #{entity.revisionvalue}, #{entity.versionseq}, #{entity.versionvalue}, #{entity.lctid}, #{entity.lcstatus}, #{entity.ts}, #{entity.name}, #{entity.description}, #{entity.owner}, #{entity.copyfromversion}, #{entity.ordernum}, #{entity.filterfield}, #{entity.filtertype}, #{entity.filtervalue})
- </foreach>
- on duplicate key update
- REVISIONOID = values(REVISIONOID),
- NAMEOID = values(NAMEOID),
- BTMNAME = values(BTMNAME),
- LASTR = values(LASTR),
- FIRSTR = values(FIRSTR),
- LASTV = values(LASTV),
- FIRSTV = values(FIRSTV),
- CREATOR = values(CREATOR),
- CREATETIME = values(CREATETIME),
- REVISIONSEQ = values(REVISIONSEQ),
- REVISIONVALUE = values(REVISIONVALUE),
- VERSIONSEQ = values(VERSIONSEQ),
- VERSIONVALUE = values(VERSIONVALUE),
- LCTID = values(LCTID),
- LCSTATUS = values(LCSTATUS),
- TS = values(TS),
- NAME = values(NAME),
- DESCRIPTION = values(DESCRIPTION),
- OWNER = values(OWNER),
- COPYFROMVERSION = values(COPYFROMVERSION),
- ORDERNUM = values(ORDERNUM),
- FILTERFIELD = values(FILTERFIELD),
- FILTERTYPE = values(FILTERTYPE),
- FILTERVALUE = values(FILTERVALUE)
- </insert>
-
- <!--閫氳繃涓婚敭淇敼鏁版嵁-->
- <update id="update">
- update PL_CODE_SRCHCONDCONFIG
- <set>
- <if test="revisionoid != null and revisionoid != ''">
- REVISIONOID = #{revisionoid},
- </if>
- <if test="nameoid != null and nameoid != ''">
- NAMEOID = #{nameoid},
- </if>
- <if test="btmname != null and btmname != ''">
- BTMNAME = #{btmname},
- </if>
- <if test="lastr != null and lastr != ''">
- LASTR = #{lastr},
- </if>
- <if test="firstr != null and firstr != ''">
- FIRSTR = #{firstr},
- </if>
- <if test="lastv != null and lastv != ''">
- LASTV = #{lastv},
- </if>
- <if test="firstv != null and firstv != ''">
- FIRSTV = #{firstv},
- </if>
- <if test="creator != null and creator != ''">
- CREATOR = #{creator},
- </if>
- <if test="createtime != null and createtime != ''">
- CREATETIME = #{createtime},
- </if>
- <if test="revisionseq != null">
- REVISIONSEQ = #{revisionseq},
- </if>
- <if test="revisionvalue != null and revisionvalue != ''">
- REVISIONVALUE = #{revisionvalue},
- </if>
- <if test="versionseq != null">
- VERSIONSEQ = #{versionseq},
- </if>
- <if test="versionvalue != null and versionvalue != ''">
- VERSIONVALUE = #{versionvalue},
- </if>
- <if test="lctid != null and lctid != ''">
- LCTID = #{lctid},
- </if>
- <if test="lcstatus != null and lcstatus != ''">
- LCSTATUS = #{lcstatus},
- </if>
- <if test="ts != null and ts != ''">
- TS = #{ts},
- </if>
- <if test="name != null and name != ''">
- NAME = #{name},
- </if>
- <if test="description != null and description != ''">
- DESCRIPTION = #{description},
- </if>
- <if test="owner != null and owner != ''">
- OWNER = #{owner},
- </if>
- <if test="copyfromversion != null and copyfromversion != ''">
- COPYFROMVERSION = #{copyfromversion},
- </if>
- <if test="ordernum != null">
- ORDERNUM = #{ordernum},
- </if>
- <if test="filterfield != null and filterfield != ''">
- FILTERFIELD = #{filterfield},
- </if>
- <if test="filtertype != null and filtertype != ''">
- FILTERTYPE = #{filtertype},
- </if>
- <if test="filtervalue != null and filtervalue != ''">
- FILTERVALUE = #{filtervalue},
- </if>
- </set>
- where OID = #{oid}
- </update>
-
- <!--閫氳繃涓婚敭鍒犻櫎-->
- <delete id="deleteById">
- delete from PL_CODE_SRCHCONDCONFIG where OID = #{oid}
- </delete>
</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java
index 837353b..c5ad867 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java
@@ -79,4 +79,5 @@
attribute.setTs(now);
return attribute;
}
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/EnumitemWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/EnumitemWrapper.java
index 885903d..60b79d2 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/EnumitemWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/EnumitemWrapper.java
@@ -54,6 +54,7 @@
}
return enumItemVO;
}
+
public List<EnumVO> listNodeVO(List<EnumItem> list) {
List<EnumItem> collect = list.stream().map(omdEnumItem -> BeanUtil.copy(omdEnumItem, EnumItem.class)).collect(Collectors.toList());
return ForestNodeMerger.merge((List)collect);
--
Gitblit v1.9.3