From a598f579e21d4dcc30b5d8fa1737f24f4dd90012 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 27 七月 2023 17:38:16 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 18 +++
Source/UBCS-WEB/src/views/wel/Statistic.vue | 11 +
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 10 +
Source/UBCS-WEB/vue.config.js | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IRevisionRuleClient.java | 6
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java | 4
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java | 6
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 4
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 180 ++++++++++++++++++++++++-----------
10 files changed, 171 insertions(+), 74 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 0aae92f..b677b5a 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -84,7 +84,8 @@
console.log(this.idData)
getTreeList({'conditionMap[id]':this.idData }).then(res=>{
console.log(res)
- this.Treedata=res.data
+ this.Treedata=res.data;
+ console.log('Treedata',this.Treedata)
const [firstProperty] = res.data;
this.ModifyProperties(this.Treedata, 'text', 'label');
this.codeClassifyOid=firstProperty.oid;
@@ -162,6 +163,7 @@
},
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
+ console.log('CloneTreeAvueform',this.CloneTreeAvueform)
try {
this.nodeClickList = data;
this.tableHeadDataFateher=[]
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 24b66f7..1dd85a5 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,7 +1,7 @@
<template>
<div>
- <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag"class="app">
-
+ <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag" class="app">
+ <el-button-group>
<!--鏂板-->
<el-button v-if="attrEditVisible == false && attrFlagChiledren==false && (!checkStatus || crudLCStatus=='Editing')" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">娣诲姞 {{ msg }}</el-button>
<!-- 鍏ㄥ睆缂栬緫-->
@@ -10,31 +10,38 @@
<el-button v-if="!checkStatus || crudLCStatus=='Editing'" icon="el-icon-info" size="small" @click="ruleAddHandler">楠岃瘉瑙勫垯</el-button>
<!-- 灞炴�у垎缁�-->
<el-button v-if="!checkStatus || crudLCStatus=='Editing'" icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
-
-
+ </el-button-group>
+ <el-button-group>
+ <!--鏂板-->
<!-- 鍒嗙被娉ㄥ叆-->
<el-button v-if="!checkStatus || crudLCStatus=='Editing'" icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
<!-- 缁勫悎瑙勫垯-->
- <el-button v-if="!checkStatus || crudLCStatus=='Editing'" size="small" @click="isShowHandler">缁勫悎瑙勫垯</el-button>
+ <el-button v-if="!checkStatus || crudLCStatus=='Editing'" icon="el-icon-film" size="small" @click="isShowHandler">缁勫悎瑙勫垯</el-button>
<!-- 鏋氫妇娉ㄥ叆-->
- <el-button v-if="!checkStatus || crudLCStatus=='Editing'" size="small" @click="enmuVisHandle">鏋氫妇娉ㄥ叆</el-button>
+ <el-button v-if="!checkStatus || crudLCStatus=='Editing'" icon="el-icon-c-scale-to-original" size="small" @click="enmuVisHandle">鏋氫妇娉ㄥ叆</el-button>
<!-- 绾ц仈灞炴��-->
- <el-button v-if="!checkStatus|| crudLCStatus=='Editing'" size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
+ <el-button v-if="!checkStatus|| crudLCStatus=='Editing'" icon="el-icon-coin" size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
+ </el-button-group>
+ <el-button-group>
<!-- 棰勮鎺掑簭-->
<el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
-
-
+ <!--鏂板-->
<!-- 淇濆瓨-->
<el-button v-if="!checkStatus|| crudLCStatus=='Editing'" size="small" @click="addsHandler" icon="el-icon-check">淇濆瓨</el-button>
<!-- 鍒犻櫎-->
<el-button v-if="!checkStatus || crudLCStatus=='Editing'" size="small" @click="CrudRemove" icon="el-icon-delete">鍒犻櫎</el-button>
<!-- 閲嶇疆-->
<el-button size="small" @click="reset" icon="el-icon-refresh-right">閲嶇疆</el-button>
+ </el-button-group>
+ <el-button-group>
<!-- 鍚屾鍒板叾浠栨ā鏉�-->
<el-button size="small"@click="syncHandle" icon="el-icon-share">鍚屾鍒板叾浠栨ā鏉�</el-button>
+ </el-button-group>
+ <el-button-group>
<!-- 缂栫爜鐢宠棰勮-->
- <el-button size="small" @click="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
+ <el-button size="small" icon="el-icon-view" @click="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
+ </el-button-group>
<!-- 楠岃瘉瑙勫垯-->
</div>
<!-- 寮圭獥-->
@@ -115,23 +122,23 @@
<div style="padding-top: 15px;padding-left: 35px">
<el-form ref="injectForm" label-width="80px">
<el-form-item label="娉ㄥ叆绫诲瀷">
- <el-radio-group v-model="injectOption.type">
- <el-radio label="鍒嗙被鍚嶇О"></el-radio>
- <el-radio label="鍒嗙被浠ｅ彿"></el-radio>
+ <el-radio-group v-model="injectOption.classifyInvokeAttr">
+ <el-radio label="name">鍒嗙被鍚嶇О</el-radio>
+ <el-radio label="id">鍒嗙被浠ｅ彿</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="灞傜骇璁剧疆">
- <el-radio-group v-model="injectOption.set">
- <el-radio label="鏈�灏忓眰"></el-radio>
- <el-radio label="鎸囧畾灞�"></el-radio>
- <el-input-number v-if="this.injectOption.set == '鎸囧畾灞�'" v-model="injectOption.injectNum" :max="10" :min="0"
+ <el-radio-group v-model="injectOption.classifyInvokeLevel">
+ <el-radio label="min">鏈�灏忓眰</el-radio>
+ <el-radio label="max">鎸囧畾灞�</el-radio>
+ <el-input-number v-if="this.injectOption.classifyInvokeLevel == 'max'" v-model="injectOption.classifyNumber" :max="10" :min="0"
controls-position="right"></el-input-number>
</el-radio-group>
</el-form-item>
<el-form-item label="鍙慨鏀�">
- <el-radio-group v-model="injectOption.change">
- <el-radio label="鏄�"></el-radio>
- <el-radio label="鍚�"></el-radio>
+ <el-radio-group v-model="injectOption.classifyInvokeEditFlag">
+ <el-radio label="true">鏄�</el-radio>
+ <el-radio label="false">鍚�</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
@@ -246,6 +253,7 @@
@selection-change="selectionChange"
v-if="this.crudArrayFlag"
ref="referAttrCrud"
+ v-loading="loading"
>
<el-table-column
type="selection"
@@ -354,10 +362,48 @@
},
deep:true,
immediate:true
- }
+ },
+ 'injectOption.classifyInvokeAttr': function(newVal) {
+ console.log('newVal',newVal)
+ if (newVal === "name") {
+ this.injectOption.classifyInvokeAttrName='鍒嗙被鍚嶇О'
+ } else if (newVal === "id") {
+ this.injectOption.classifyInvokeAttrName='鍒嗙被浠ｅ彿'
+ }
+ return '';
+ },
+ // ProData: {
+ // handler(newVal, oldVal) {
+ // if(this.initializing){
+ // this.ProData = newVal.map((item) => {
+ // if (item.classifyInvokeAttr !=='') { // 妫�鏌lassifyInvokeText灞炴�ф槸鍚﹀瓨鍦�
+ // item = {
+ // ...item,
+ // classifyInvokeText: {
+ // classifyInvokeText: {
+ // "娉ㄥ叆绫诲瀷": item.classifyInvokeAttr,
+ // "娉ㄥ叆绫诲瀷鍚嶇О": item.classifyInvokeAttrName,
+ // "灞傜骇璁剧疆": item.classifyInvokeLevel,
+ // "鏄惁鍙慨鏀�": item.classifyInvokeEditFlag
+ // }
+ // }
+ // }
+ // }
+ // return item;
+ // });
+ // }
+ // this.initializing = false;
+ // console.log('ProData',this.ProData)
+ // console.log('newVal',newVal)
+ // },
+ // deep: true,
+ // immediate:true
+ // },
},
data() {
return {
+ initializing:false,
+ loading:false,
referConfigText:"",
referConfigVisble:false,
referConfigOption:{
@@ -787,11 +833,12 @@
addvisible: false,
//鍒嗙被娉ㄥ叆option
injectOption: {
- type: "鍒嗙被鍚嶇О",
- set: "鏈�灏忓眰",
- change: "鏄�",
+ classifyInvokeAttrName:'鍒嗙被鍚嶇О',
+ classifyInvokeAttr: "name",
+ classifyInvokeEditFlag: "true",
+ classifyInvokeLevel:'min',
//鍒嗙被娉ㄥ叆璁℃暟鍣�
- injectNum: 0,
+ classifyNumber:0,
},
// 灞炴�ч獙璇佽緭鍏ユ
RulesForm: {
@@ -1220,15 +1267,9 @@
},
{
label: "鍒嗙被娉ㄥ叆",
- prop: "classifyInvokeLevelName",
+ prop: "classifyInvokeText",
cell: false,
edit: 'refer'
- },
- {
- label: "鍒嗙被娉ㄥ叆",
- prop: "classifyInvokeLevel",
- cell: false,
- edit: 'referName',
},
{
label: "鏋氫妇娉ㄥ叆",
@@ -1357,7 +1398,7 @@
oids.push(ele.oid);
});
return oids.join(",");
- }
+ },
},
mounted() {
},
@@ -1435,7 +1476,12 @@
CrudRend() {
if (this.crudOid != '') {
gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.crudOid}).then(res => {
- this.ProData = res.data.data;
+ this.loading=true
+ setTimeout(() => {
+ this.ProData = res.data.data;
+ this.loading=false
+ }, 1000);
+
}).catch(res => {
this.$message.error(res)
})
@@ -1579,7 +1625,7 @@
}
console.log('--',this.referConfigOption)
// this.$refs.referConfigFormDialog.onloadAttrData();
- }else if(column.property == 'classifyInvokeLevelName'){
+ }else if(column.property == 'classifyInvokeText'){
this.injectVisible=true;
}else if(column.property == 'componentRule'){
if(this.CurrentCell){
@@ -1730,35 +1776,58 @@
} else if (this.attrSelectList.length < 1) {
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉挎暟鎹�')
} else if (this.attrSelectList.length === 1) {
+ console.log(this.injectOption)
this.injectVisible = true;
-
}
},
//鍒嗙被娉ㄥ叆淇濆瓨
injectAddHandle() {
+ // 瀹氫箟灞曠ず绫诲瀷
let data = {
- "娉ㄥ叆绫诲瀷": this.injectOption.type,
- "娉ㄥ叆绫诲瀷鍚嶇О": this.injectOption.set,
- "灞傜骇璁剧疆": this.injectOption.injectNum,
- "鏄惁鍙慨鏀�": this.injectOption.change
+ "娉ㄥ叆绫诲瀷": this.injectOption.classifyInvokeAttr,
+ "娉ㄥ叆绫诲瀷鍚嶇О": this.injectOption.classifyInvokeAttrName,
+ "灞傜骇璁剧疆": this.injectOption.classifyInvokeLevel=='max'?this.injectOption.classifyNumber :'min',
+ "鏄惁鍙慨鏀�": this.injectOption.classifyInvokeEditFlag
}
+ //鍗曞厓鏍肩紪杈戣祴鍊间竴閬�
if(this.CurrentCell){
- this.$set(this.CurrentCell, "classifyInvokeLevelName", data);
- this.$set(this.CurrentCell, "classifyInvokeLevel", JSON.stringify(this.injectOption));
+ //濡傛灉鏄寚瀹氬眰璧嬪�间负鏁板瓧
+ if(this.CurrentCell.classifyInvokeLevel!== 'min'){
+ this.CurrentCell.classifyInvokeLevel=this.injectOption.classifyNumber
+ }
+ //鍏朵綑姝ｅ父璧嬪��
+ this.CurrentCell.classifyInvokeAttr=this.injectOption.classifyInvokeAttr,
+ this.CurrentCell.classifyInvokeAttrName=this.injectOption.classifyInvokeAttrName,
+ this.CurrentCell.classifyInvokeEditFlag=this.injectOption.classifyInvokeEditFlag,
+ this.$set(this.CurrentCell, "classifyInvokeText", data);
this.injectHandleReset()
}else {
- this.$set(this.attrSelectList[0], 'classifyInvokeLevelName', data);
- this.$set(this.attrSelectList[0], 'classifyInvokeLevel', JSON.stringify(this.injectOption));
+ //鍕鹃�夋搷浣�
+ for (const key in this.injectOption) {
+ this.attrSelectList[0][key] = this.injectOption[key];
+ //濡傛灉鏄寚瀹氬眰璧嬪�间负鏁板瓧
+ if(this.injectOption.classifyInvokeLevel !== 'min'){
+ this.attrSelectList[0].classifyInvokeLevel=this.injectOption.classifyNumber
+ }
+ this.$set(this.attrSelectList[0],'classifyInvokeText',data)
+ }
this.injectHandleReset()
}
- this.injectVisible = false
+ if(this.injectOption.classifyInvokeLevel !== 'min'){
+ this.injectOption.classifyInvokeLevel=this.injectOption.classifyNumber;
+ }else {
+ this.injectOption.classifyNumber=0;
+ }
+ this.injectVisible = false;
+
},
//鍒嗙被娉ㄥ叆娓呯┖
injectHandleReset() {
- this.injectOption.type = "鍒嗙被鍚嶇О";
- this.injectOption.set = "鏈�灏忓眰";
- this.injectOption.change = "鏄�";
- this.injectOption.injectNum = "0";
+ this.injectOption.classifyInvokeAttrName = "鍒嗙被鍚嶇О";
+ this.injectOption.classifyInvokeAttr = "name";
+ this.injectOption.classifyInvokeLevel = "min";
+ this.injectOption.classifyInvokeEditFlag = "true";
+ this.injectOption.classifyNumber = "0";
},
// 鍒嗙被娉ㄥ叆鍙栨秷
injectRemove() {
@@ -1778,12 +1847,7 @@
},
//琛ㄦ牸閲嶇疆
reset() {
- // this.CrudRend(
- this.referConfigVisble=true;
- this.referConfigOption = {
- referConfig: 'confing',
- }
- console.log(this.referConfigOption)
+ this.CrudRend()
},
//鍚屾鍒板叾浠栨ā鏉�
syncHandle() {
@@ -1865,7 +1929,11 @@
<style scoped lang="scss" >
.app {
/deep/ .el-button {
- margin: 0 10px 10px 0;
+ //margin: 0 10px 10px 0;
}
}
+.el-button-group {
+ margin-right: 10px;
+ margin-bottom: 10px;
+}
</style>
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 50f38a3..d2ceea3 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -931,6 +931,24 @@
this.crudArray=selection;
gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': row.oid}).then(res => {
this.ProData = res.data.data;
+ //鍒嗙被娉ㄥ叆鏁版嵁鏍煎紡
+ this.ProData = res.data.data.map((item) => {
+ //濡傛灉鍒嗙被娉ㄥ叆classifyInvokeAttr涓虹┖璇存槑鏄垵濮嬬姸鎬�
+ if(item.classifyInvokeAttr !== ''){
+ if (!item.hasOwnProperty('classifyInvokeText')) { // 妫�鏌lassifyInvokeText灞炴�ф槸鍚﹀瓨鍦�
+ item = {
+ ...item,
+ classifyInvokeText: {
+ "娉ㄥ叆绫诲瀷": item.classifyInvokeAttr,
+ "娉ㄥ叆绫诲瀷鍚嶇О": item.classifyInvokeAttrName,
+ "灞傜骇璁剧疆": item.classifyInvokeLevel,
+ "鏄惁鍙慨鏀�": item.classifyInvokeEditFlag
+ }
+ };
+ }
+ }
+ return item;
+ });
}).catch(res => {
this.$message.error(res)
})
diff --git a/Source/UBCS-WEB/src/views/wel/Statistic.vue b/Source/UBCS-WEB/src/views/wel/Statistic.vue
index f95cb3d..32fb7dd 100644
--- a/Source/UBCS-WEB/src/views/wel/Statistic.vue
+++ b/Source/UBCS-WEB/src/views/wel/Statistic.vue
@@ -1,7 +1,7 @@
<template>
<div>
<el-row :gutter="20">
- <el-col :span="3" v-for="item in listMyTask">
+ <el-col :xs="8" :sm="8" :md="8" :lg="6" :xl="4" v-for="item in listMyTask">
<div class="box" :style="item.style">
{{item.name}}
<div><avue-count-up class="value" :end="item.count"></avue-count-up></div>
@@ -130,13 +130,14 @@
</script>
<style scoped>
+.el-col{margin-bottom: 0}
.box{
text-align: center;
background: rgb(235, 238, 245);
color: #303133;
- height: 74px;
+ height: 70px;
margin: 10px 0!important;
- padding: 15px 20px;
+ padding: 15px 10px;
position: relative;
border-radius: 4px;
box-sizing: border-box;
@@ -145,6 +146,8 @@
.value{
font-size: 12px;
opacity: .69;
- line-height: 24px;
+ line-height: 20px;
+ margin-top: 5px;
+ display: block;
}
</style>
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 54a1f5d..433ecc0 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://localhost:37000',
// target: 'http://192.168.1.51:37000',
- // target: 'http://dev.vci-tech.com:37000',
+ target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
// target: 'http://192.168.3.7:37000',
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IRevisionRuleClient.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IRevisionRuleClient.java
index ef2da98..0faa41c 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IRevisionRuleClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IRevisionRuleClient.java
@@ -7,6 +7,8 @@
import org.springblade.core.tool.api.R;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.Collection;
@@ -79,8 +81,8 @@
* @param ids 瀵硅薄鑻辨枃鍚嶇О 浣嗘槸涓嶈兘瓒呰繃1000
* @return 涓氬姟瀵硅薄
*/
- @GetMapping(GET_BY_IDS)
- R<List<RevisionRuleVO>> selectByIdCollection(List<String> ids);
+ @PostMapping(GET_BY_IDS)
+ R<List<RevisionRuleVO>> selectByIdCollection(@RequestBody List<String> ids);
/**
* 鎵归噺鏍规嵁涓婚敭鑾峰彇鐗堟湰瑙勫垯
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
index 7bf46f2..d3a16ac 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
@@ -1342,10 +1342,10 @@
}
}
}
- }else {
+ }else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, result);
}
- } else {
+ } else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, "");
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 64840b2..805f22c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -740,7 +740,7 @@
conditionMap.put(queryKey, queryValue);
} else {
//涓虹┖鐨勬椂鍊欎笉浠ｈ〃涓嶆牎楠岋紝鍙槸涓嶅幓闄ょ浉鍏崇殑淇℃伅
- conditionMap.put("t." + attrId, value);
+ conditionMap.put("t." + attrId, "'" +value+ "'");
}
}
}
@@ -3296,7 +3296,7 @@
throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲瀛楁淇℃伅锛岃妫�鏌ワ紒");
}
Set<String> existFild = allAttributeByBtmId.getData().getAttributes().stream().map(btmTypeAttributeVO -> {
- return btmTypeAttributeVO.getId();
+ return btmTypeAttributeVO.getId().toLowerCase();
}).collect(Collectors.toSet());
//灏哹ean杞负map,mybatis缁熶竴澶勭悊
List<Map<String, String>> maps = new ArrayList<>();
@@ -3401,8 +3401,10 @@
bo.setVersionRule(String.valueOf(listR.getData().get(0).getVersionRule()));
if (StringUtils.isNotBlank(listR.getData().get(0).getRevisionRuleId())) {
R<List<RevisionRuleVO>> revisionRuleVO = revisionRuleClient
- .selectByIdCollection(Collections.singletonList(listR.getData().get(0).getRevisionRuleId()));
- bo.setRevisionValue(revisionRuleVO.getData().get(0).getStartCode());
+ .selectByIdCollection(Collections.singletonList(listR.getData().get(0).getRevisionRuleId().toLowerCase()));
+ if(revisionRuleVO.getData().size() != 0 ){
+ bo.setRevisionValue(revisionRuleVO.getData().get(0).getStartCode());
+ }
}
bo.setRevisionSeq(1);
bo.setVersionSeq(1);
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java
index 164d400..aeca2c2 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java
@@ -16,6 +16,8 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@@ -88,8 +90,8 @@
* @return 涓氬姟瀵硅薄
*/
@Override
- @GetMapping(GET_BY_IDS)
- public R<List<RevisionRuleVO>> selectByIdCollection(List<String> ids) {
+ @PostMapping(GET_BY_IDS)
+ public R<List<RevisionRuleVO>> selectByIdCollection(@RequestBody List<String> ids) {
return R.data(service.listRevisionRuleByIdCollection(ids));
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
index 87b7531..36184a5 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
@@ -194,7 +194,7 @@
if ("oid".equals(id)){
vo.setNullableFlag(false);
}
- if (Arrays.asList("createtime","lastmodifytime","owner").contains(id)){
+ if (Arrays.asList("createtime","lastmodifytime","ts").contains(id)){
vo.setAttrDataType(VciFieldTypeEnum.VTDateTime.name());
vo.setAttributeLength(6);
}else {
--
Gitblit v1.9.3