From ee7d7c29b8d95f0adab3bd9d93fdb1af51565a2d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 03 八月 2023 20:54:48 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/views/system/tenant.vue | 1
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 2
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java | 5 -
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 27 ++++++---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 20 +-----
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue | 2
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 24 ++-----
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 4 +
Source/UBCS-WEB/src/views/MasterData/items.vue | 8 ++
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java | 5 +
Source/UBCS-WEB/src/views/work/process/leave/detail.vue | 11 ++-
Source/UBCS-WEB/src/components/template/FlowPath.vue | 3
Source/UBCS-WEB/src/components/template/Stage.vue | 1
Source/UBCS-WEB/src/views/work/process/leave/form.vue | 2
Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeAttributeMapper.xml | 6 +-
Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 9 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 25 ++++----
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 10 +-
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 1
Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java | 12 ++-
21 files changed, 97 insertions(+), 82 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 767e02d..471114a 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -531,6 +531,10 @@
if (this.disabledProp.includes(formItem.field)) {
formItem.readOnly = true;
}
+ if(formItem.field=='lcstatus'){
+ formItem.field=formItem.field+'_text';
+ formItem.readOnly=true;
+ }
// 璁剧疆琛ㄥ崟鏍￠獙鐨勮鍒欙紝鏂囨湰
let message = "璇烽�夋嫨";
let trigger = "change";
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index b876bab..8d79684 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -133,7 +133,14 @@
})
if(this.radio === 0){
if(this.selectRow.length<=0){
- this.$message.warning('璇烽�夋嫨瑕佸鍑虹殑妯℃澘')
+ this.ids=this.tableData.map(item => item.oid).join(',')
+ exportCode({codeClassifyOid:this.codeClassifyOid,...this.exportArr,limit:-1}).then(res=>{
+ // console.log('res',res)
+ if(res){
+ func.downloadFileByBlob(res);
+ this.escHandler()
+ }
+ })
}else {
//宸查�夋嫨澶氶��
const selectList=[]
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 71634a4..a127460 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -88,6 +88,7 @@
this.codeClassifyOid=firstProperty.oid;
this.coderuleoid=firstProperty.attributes.coderuleoid;
this.$emit("coderuleoid", this.coderuleoid )
+ this.$emit('Treedata',this.Treedata)
}).catch(res=>{
this.$message.error(res)
})
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 7771e5c..0b8e3cd 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -174,6 +174,9 @@
tableHeadBtnData: {
type: Array,
},
+ Treedata:{
+ type:Array
+ }
},
data() {
return {
@@ -189,6 +192,7 @@
//鍙戝竷
parameter: {
ids: [],
+ btmtype:'',
code: "",
type: '',
// this.visibleDeactivate ?'ENABLE':this.visibleEnable ? 'DISABLE' :this.visibleRecovery ? 'ROLLBACK' :'PUBLIC'
@@ -338,7 +342,7 @@
}
},
deep: true
- }
+ },
},
methods: {
//鐘舵�佹悳绱�
@@ -422,6 +426,7 @@
},
// 鍙戝竷
setHandler() {
+ console.log('Treedata',this.Treedata)
if (this.selectRow.length > 0) {
let hasEditing = this.selectRow.some(item => item.lcstatus !== 'Editing');
let showMessage = true;
@@ -436,9 +441,10 @@
processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
if (res.data.data.records && res.data.data.records.length != 0) {
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鐢宠[' + this.result + '-' + this.selectRow[0].name + ']';
+ this.parameter.template = this.userName + '-鐢宠[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'PUBLIC';
- this.parameter.code = this.templateOid
+ this.parameter.code = this.templateOid;
+ this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
this.title = '娴佺▼瀹℃壒'
this.visibleFlow = true;
} else {
@@ -483,12 +489,13 @@
this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愬彂甯冪姸鎬併�戞墠鍙互鍙戣捣娴佺▼');
showMessage = false;
} else if (this.selectRow.length >= 1 && hasEditing && showMessage) {
- processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
+ processTS({templateId: this.templateOid, buttonTypeKey: 'DISABLE'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍋滅敤[' + this.result + '-' + this.selectRow[0].name + ']';
+ this.parameter.template = this.userName + '-鍋滅敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'DISABLE';
this.parameter.code = this.templateOid
+ this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
this.title = '鍋滅敤锛堝喕缁擄級缂栫爜鏁版嵁'
this.visibleDeactivate = true;
} else {
@@ -533,13 +540,14 @@
this.$message.warning('閫夋嫨鐨勬暟鎹腑鐘舵�佹棤闇�鍐嶆墽琛屽綋鍓嶆搷浣�');
showMessage = false;
} else if (this.selectRow.length >= 1 && hasEditing && showMessage) {
- processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
+ processTS({templateId: this.templateOid, buttonTypeKey: 'ENABLE'}).then(res => {
if (res.data.data.records && res.data.data.records.length != 0) {
this.parameter = res.data.data.records[0]
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍚敤[' + this.result + '-' + this.selectRow[0].name + ']';
+ this.parameter.template = this.userName + '-鍚敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'Released';
this.parameter.code = this.templateOid
+ this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
this.title = '鍚敤缂栫爜鏁版嵁'
this.visibleDeactivate = true;
} else {
@@ -591,12 +599,13 @@
showMessage = false;
} else if (this.selectRow.length >= 1 && (disabledCount === this.selectRow.length || releasedCount === this.selectRow.length) || (disabledCount > 0 && releasedCount > 0) && showMessage) {
//disabledCount 鍜� releasedCount 涓换鎰忎竴涓瓑浜� this.selectRow 鏁扮粍鐨勯暱搴﹀垯琛ㄧず鍏ㄩ儴鏄悓涓�绉嶇姸鎬侊紝杩斿洖 true 濡傛灉disabledCount 鍜� releasedCount 閮藉ぇ浜�0锛屽垯琛ㄧず鏃㈡湁Disabled涔熸湁Released杩斿洖 true
- processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
+ processTS({templateId: this.templateOid, buttonTypeKey: 'ROLLBACK'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍥炴敹[' + this.result + '-' + this.selectRow[0].name + ']';
+ this.parameter.template = this.userName + '-鍥炴敹[' + this.selectRow[0].btmname + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'TakeBack';
this.parameter.code = this.templateOid
+ this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
this.title = '鍥炴敹缂栫爜鏁版嵁'
this.visibleDeactivate = true;
} else {
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 66a96d4..b18084c 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag" class="app">
+ <div style="display: flex;flex-wrap: wrap; display: inline-block" v-if="this.crudArrayFlag" class="app" >
<el-button-group>
<!--鏂板-->
<el-button v-if="attrEditVisible == false && attrFlagChiledren==false && editOpenFlag && (!checkStatus || crudLCStatus=='Editing' )" size="small" type="primary" icon="el-icon-plus" plain @click="busineHandle">娣诲姞 {{ msg }}</el-button>
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
index 7aa38b3..3f70218 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
@@ -2,7 +2,7 @@
<div>
<avue-form v-model="loneTreeNewForm" :option="option" v-if="flag == 'renonly'">
</avue-form>
- <avue-form v-model="loneTreeNewForm" :option="this.options" @submit="submits" v-else-if="flag == 'edit'">
+ <avue-form v-model="loneTreeNewForm" :option="this.options" @submit="submits" v-else-if="flag == 'edit'">
</avue-form>
<div>
<!-- 缂栫爜瑙勫垯-->
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 7ca191b..54d9a47 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -498,10 +498,10 @@
},
rules: {
id: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' },
+ { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' },
],
name:[
- { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' },
+ { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' },
],
btmTypeName:[
{ required: true, message: '璇烽�夋嫨涓氬姟绫诲瀷', trigger: 'blur' },
@@ -1345,7 +1345,7 @@
message: "娣诲姞鎴愬姛!"
});
done(row)
- this.CrudRend()
+ this.TemRefresh();
}).catch(res => {
this.$message({
type: 'info',
@@ -1357,7 +1357,7 @@
//妯℃澘绠＄悊淇敼
CrudRowUpdata(row,index,done) {
editSave(row).then(() => {
- this.CrudRend()
+ this.TemRefresh();
this.$message({
type: "success",
message: "鎿嶄綔鎴愬姛!"
@@ -1370,7 +1370,7 @@
//妯℃澘绠＄悊鍒犻櫎
CrudRowDel(row) {
deleteData(row).then(()=> {
- this.CrudRend()
+ this.TemRefresh();
}).catch(res => {
this.$message({
type: 'info',
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue b/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
index e53c6cc..88da25c 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
@@ -6,7 +6,6 @@
</span>
<span v-else-if="type.prop==='tab2'">
<FlowPath :code="this.crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus"></FlowPath>
-
</span>
<span v-else-if="type.prop==='tab3'">
<stage :code="this.crudOid"></stage>
diff --git a/Source/UBCS-WEB/src/components/template/FlowPath.vue b/Source/UBCS-WEB/src/components/template/FlowPath.vue
index 2474641..83f36ba 100644
--- a/Source/UBCS-WEB/src/components/template/FlowPath.vue
+++ b/Source/UBCS-WEB/src/components/template/FlowPath.vue
@@ -39,7 +39,7 @@
startData: [],
form: {},
option: {
- height: "auto",
+ height: 340,
border: true,
align: 'center',
menu:!this.checkStatus || this.crudLCStatus == 'Editing',
@@ -47,6 +47,7 @@
index: true,
searchMenuSpan: 8,
searchBtn: false,
+ refreshBtn:false,
emptyBtn: false,
columnBtn: false,
editBtn:!this.checkStatus || this.crudLCStatus == 'Editing',
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index 29cec50..c208c2b 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -66,7 +66,8 @@
ids: 'ids',
flowTemplate: 'flowTemplate',
code: 'code',
- type: 'type'
+ type: 'type',
+ btmtype:'btmtype'
}
}
}
@@ -127,6 +128,8 @@
processName: this.parameter[this.parameterKeys.flowTemplate],
topName: this.title,
ids: this.parameter[this.parameterKeys.ids],
+ oids: this.parameter[this.parameterKeys.ids],
+ btmtype:this.parameter[this.parameterKeys.btmtype],
vars:this.parameter['vars']
}
},
@@ -198,22 +201,17 @@
async apiSave() {
try {
const len = this.collectParam.flowTaskUsers.length
- console.log(this.collectParam.flowTaskUsers)
- console.log(len == 0)
- console.log(len != this.initFrom.length)
- console.log('saveParam',this.saveParam)
if (len == 0 && len != this.initFrom.length) {
this.$message({
type: "error",
message: "璇烽�夋嫨鑺傜偣锛�"
});
} else {
- const {modelKey,modelName,processDesc,processName,templateId,topName,vars,ids} = this.saveParam
- const vals= {modelKey,modelName,processDesc,processName,templateId,topName,ids,...vars}
- console.log('vals',vals);
+ const {modelKey,modelName,processDesc,processName,templateId,topName,vars,ids,btmtype} = this.saveParam
+ let vals= {modelKey,modelName,processDesc,processName,templateId,topName,ids,btmtype,...vars}
+ vals.oids=ids;
const response = await personnelSave({ variables:vals, flowTaskUsers: this.collectParam.flowTaskUsers, })
if (response.status === 200) {
- console.log(response)
this.$message({
type: 'success',
message: response.data.msg
@@ -224,13 +222,10 @@
}
} catch {
- console.error('鎺ュ彛璋冪敤澶辫触')
+ this.$message.error('鎺ュ彛璋冪敤澶辫触')
}
},
handleClickTag(event) {
- console.log(event.flowTaskUsers)
-
- console.log(this.collectParam.flowTaskUsers)
let flowTaskUsers = this.collectParam.flowTaskUsers
this.collectParam.flowTaskUsers = flowTaskUsers.map((item, index) => {
for (let i = 0; i < event.flowTaskUsers.length; i++) {
@@ -257,16 +252,13 @@
// this.collectParam.flowTaskUsers = {...this.collectParam.flowTaskUsers,userId,userName}
},
handleCloseTag(event) {
- console.log(event)
this.canCollect(event.name)
},
handleSelect(event, index) {
const res = this.typeName.find(item => item.userId === event)
const { userName } = res
- console.log(this.users)
this.$set(this.users, index, { ... this.collectParam.flowTaskUsers[index], userName })
// this.users[index] = { ... this.collectParam.flowTaskUsers[index], userName }
- console.log(this.users)
},
done() {
this.dialogVisible = false
diff --git a/Source/UBCS-WEB/src/components/template/Stage.vue b/Source/UBCS-WEB/src/components/template/Stage.vue
index d1e2795..cce53f2 100644
--- a/Source/UBCS-WEB/src/components/template/Stage.vue
+++ b/Source/UBCS-WEB/src/components/template/Stage.vue
@@ -102,6 +102,7 @@
],
option: {
...options,
+ height: 383,
column: [
{ label: '妯℃澘缂栧彿', prop: 'modelKey' },
{ label: '妯℃澘鍚嶇О', prop: 'modelName' },
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index e3b674b..1745425 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -6,7 +6,7 @@
<master-tree @codeClassifyOid="codeClassifyOidList" @coderuleoid="coderuleoidList" :pageSize="this.pageSize"
:currentPage="this.currentPage" @tableDataArray="tableDataArrays" @tableHeadDataFateher="tableHeadDatas"
@tableHeadBttoms="tableHeadBttoms" @total="totals" @nodeClick="nodeClick"
- @tableHeadFindData="tableHeadFindDatas"></master-tree>
+ @tableHeadFindData="tableHeadFindDatas" @Treedata="TreedataList"></master-tree>
</basic-container>
</el-aside>
<el-main>
@@ -14,7 +14,7 @@
<VciMasterCrud :page="this.page" :codeClassifyOid="this.codeClassifyOid" :coderuleoid="this.coderuleoid"
@pageSize="pageSizes" @currentPage="currentPages" :tableDataArray="tableDataArray" :total="this.total"
:tableHeadDataFateher="this.tableHeadDataFateher" :isLoading="isLoading" :templateOid="templateOid"
- :tableHeadFindData="tableHeadFindData" :tableHeadBtnData="masterVrBtnList"></VciMasterCrud>
+ :tableHeadFindData="tableHeadFindData" :tableHeadBtnData="masterVrBtnList" :Treedata="Treedata"></VciMasterCrud>
</el-main>
</el-container>
</template>
@@ -35,6 +35,7 @@
currentPage: "1",
codeClassifyOid: "",
coderuleoid: "",
+ Treedata:[],
templateOid: "",
tableDataArray: [],
masterVrBtnList: [],
@@ -53,6 +54,9 @@
coderuleoidList(val) {
this.coderuleoid = val;
},
+ TreedataList(val){
+ this.Treedata=val
+ },
pageSizes(val) {
this.pageSize = val
},
diff --git a/Source/UBCS-WEB/src/views/system/tenant.vue b/Source/UBCS-WEB/src/views/system/tenant.vue
index 1a739c4..d384ec9 100644
--- a/Source/UBCS-WEB/src/views/system/tenant.vue
+++ b/Source/UBCS-WEB/src/views/system/tenant.vue
@@ -307,6 +307,7 @@
width: 100,
value:0,
disabled:this.BooleanFlag ,
+ hide:true,
dicData: [{
label: '寮�鍚�',
value: 0
diff --git a/Source/UBCS-WEB/src/views/work/process/leave/detail.vue b/Source/UBCS-WEB/src/views/work/process/leave/detail.vue
index ac6c335..38de030 100644
--- a/Source/UBCS-WEB/src/views/work/process/leave/detail.vue
+++ b/Source/UBCS-WEB/src/views/work/process/leave/detail.vue
@@ -6,7 +6,7 @@
<el-button @click="handleCancel">鍏抽棴</el-button>
</el-form-item>
</el-row>
- <el-card shadow="hover">
+ <el-card v-if="false" shadow="hover">
<div slot="header">
<span>瀹℃壒淇℃伅</span>
</div>
@@ -26,7 +26,7 @@
</el-col>
</el-row>
<el-form-item label="鎻忚堪">
- <el-input :disabled="true" type="textarea" v-model="form.reason" />
+ <el-input :disabled="true" type="textarea" v-model="form.processDesc" />
</el-form-item>
</el-card>
<el-card shadow="hover">
@@ -91,16 +91,17 @@
this.flowList = data.data;
}
})
- leaveDetail(this.businessId,this.processInstanceId).then(res => {
+ /*leaveDetail(this.businessId,this.processInstanceId).then(res => {
const data = res.data;
if (data.success) {
this.form = data.data;
}
- })
+ })*/
},
handleCancel() {
this.$router.$avueRouter.closeTag();
- this.$router.push({path: `/work/start`});
+ this.$router.go(-1)
+ //this.$router.push({path: `/work/start`});
}
}
}
diff --git a/Source/UBCS-WEB/src/views/work/process/leave/form.vue b/Source/UBCS-WEB/src/views/work/process/leave/form.vue
index de380a2..17da53e 100644
--- a/Source/UBCS-WEB/src/views/work/process/leave/form.vue
+++ b/Source/UBCS-WEB/src/views/work/process/leave/form.vue
@@ -70,7 +70,7 @@
},
{
label: '鎻忚堪',
- prop: 'reason',
+ prop: 'processDesc',
type: 'textarea',
span: 24,
rules: [
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index ec459a3..d4b6d27 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -40,6 +40,7 @@
import org.springblade.core.log.exception.ServiceException;
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.Func;
import org.springframework.beans.factory.annotation.Autowired;
@@ -373,6 +374,10 @@
//灏咲TO杞崲涓篋O
CodeClassifyTemplateAttr codeClassifyTemplateAttrDO = new CodeClassifyTemplateAttr();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateAttrDTO,codeClassifyTemplateAttrDO);
+ codeClassifyTemplateAttrDO.setCreateTime(codeClassifyTemplateAttrDO.getCreateTime()!=null?codeClassifyTemplateAttrDO.getCreateTime():new Date());
+ codeClassifyTemplateAttrDO.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
+ codeClassifyTemplateAttrDO.setLastModifyTime(new Date());
+ codeClassifyTemplateAttrDO.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
codeClassifyTemplateAttrDOInsert.add(codeClassifyTemplateAttrDO);
if(StringUtils.isNotBlank(codeClassifyTemplateAttrDO.getPrefixValue())){
@@ -430,15 +435,9 @@
if(Func.isNotEmpty(codeReferConfigVO) && codeReferConfigVO.getIsPersistence()=="true"){
codeReferConfigService.insert(codeReferConfigVO);
}
-
}
- //鎵ц鏁版嵁淇濆瓨鎿嶄綔
-// WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
-
//鍏堥兘鍒犱簡
-// VciQueryWrapperForDO deleteAttrWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
-// deleteAttrWrapper.addQueryMap("CLASSIFYTEMPLATEOID",CLASSIFYTEMPLATEOID);
Map<String,Object> condition = new HashMap<>();
condition.put("CLASSIFYTEMPLATEOID",CLASSIFYTEMPLATEOID);
List<CodeClassifyTemplateAttr> codeClassifyTemplateAttrDODelete = baseMapper.selectByMap(condition);
@@ -448,7 +447,6 @@
for (CodeClassifyTemplateAttr codeClassifyTemplateAttrDO:codeClassifyTemplateAttrDODelete){
oids.add(codeClassifyTemplateAttrDO.getOid());
}
-// BatchCBO batchCBOTemplateDelete = new BatchCBO();
if(!CollectionUtils.isEmpty(oids)){
this.removeBatchByIds(oids);
}
@@ -463,8 +461,6 @@
}
-
-// SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
//澶勭悊鍙緭鍙�夌殑瀛楃
if(!CollectionUtils.isEmpty(prefix)){
for (String s : prefix) {
@@ -474,7 +470,6 @@
dictBiz.setDictValue(s);
iDictBizClient.getCheck(dictBiz) ;
}
-// .saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"prefix",prefix,sessionInfo);
}
if(!CollectionUtils.isEmpty(suffix)){
for (String s : suffix) {
@@ -484,7 +479,6 @@
dictBiz.setDictValue(s);
iDictBizClient.getCheck(dictBiz) ;
}
-// charService.saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"suffix",suffix,sessionInfo);
}
if(!CollectionUtils.isEmpty(dateFormates)){
for (String s : dateFormates) {
@@ -494,11 +488,7 @@
dictBiz.setDictValue(s);
iDictBizClient.getCheck(dictBiz) ;
}
-// charService.saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"dateFormates",dateFormates,sessionInfo);
}
-
-// WebUtil.setPersistence(true);//鎵ц淇濆瓨
-// boService.persistenceBatch(batchCBOTemplateDelete);//涓�璧锋墽琛屼繚瀛�
return codeClassifyTemplateAttrDO2VOs(codeClassifyTemplateAttrDOInsert);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index 80894c7..f48f222 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -507,13 +507,13 @@
codeCls_template_insert.setNameOid(codeCls_template.getNameOid());
codeCls_template_insert.setBtmname(codeCls_template.getBtmname());
codeCls_template_insert.setLastR(String.valueOf(1));
- codeCls_template_insert.setFirstR(String.valueOf(1));
+ codeCls_template_insert.setFirstR(String.valueOf(0));
codeCls_template_insert.setFirstV(String.valueOf(1));
codeCls_template_insert.setLastV(String.valueOf(1));
- codeCls_template_insert.setCreator(AuthUtil.getUser().getUserName());
+ codeCls_template_insert.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
codeCls_template_insert.setCreateTime(new Date());
codeCls_template_insert.setTs(new Date());
- codeCls_template_insert.setLastModifier(AuthUtil.getUser().getUserName());
+ codeCls_template_insert.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
codeCls_template_insert.setLastModifyTime(new Date());
codeCls_template_insert.setRevisionRule(codeCls_template.getRevisionRule());
codeCls_template_insert.setVersionRule(codeCls_template.getVersionRule());
@@ -531,9 +531,13 @@
codeCls_template_insert.setId(codeCls_template.getId());
codeCls_template_insert.setName(codeCls_template.getName());
codeCls_template_insert.setDescription(codeCls_template.getDescription());
- codeCls_template_insert.setOwner(AuthUtil.getUser().getUserName());
+ codeCls_template_insert.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
codeCls_template_insert.setCopyFromVersion(codeCls_template.getOid());
int insertCount = baseMapper.insert(codeCls_template_insert);
+ codeCls_template.setLastR("0");
+ codeCls_template.setLastModifyTime(new Date());
+ codeCls_template.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
+ baseMapper.updateById(codeCls_template);
//鍗囩増杩囧悗鐨勬ā鏉縪id
String templateNewOid = codeCls_template_insert.getOid();
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 6c14194..5b0ef91 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
@@ -422,8 +422,8 @@
cbo.setNameOid(VciBaseUtil.getPk());
cbo.setCreateTime(new Date());
cbo.setLastModifyTime(new Date());
- cbo.setCreator(AuthUtil.getUser().getUserName());
- cbo.setLastModifier(AuthUtil.getUser().getUserName());
+ cbo.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
+ cbo.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
cbo.setTenantId(AuthUtil.getTenantId());
// //TODO:鍥犱负榛樿鐨勫睘鎬ч兘涓嶆嫹璐濓紝鐩墠闆嗗洟鐮佸彨name锛屽苟娌℃湁浠嶥TO鎷疯礉鍒癱bo閲屻�傚鍔犱竴涓崟鐙鐞嗭紝浠ュ悗鍐嶇湅瑕佷笉瑕佽皟鏁�
cbo.setName(orderDTO.getName() == null ? "" : orderDTO.getName());
@@ -1010,7 +1010,11 @@
lineVO.setField(attrVO.getId() + "_line");
lineVO.setType("line");
lineVO.setText(key);
- //鎵句綅缃�
+ List<CodeClassifyTemplateAttrVO> collect = value.stream().filter(s -> "true".equals(s.getFormDisplayFlag())).collect(Collectors.toList());
+ if(collect.size() == 0){
+ continue;
+ }
+ //鎵句綅缃�
for (int i = 0; i < itemVOS.size(); i++) {
UIFormItemVO record = itemVOS.get(i);
if (record.getField().equalsIgnoreCase(attrVO.getId())) {
@@ -3623,7 +3627,11 @@
setter.invoke(obj, ((BigDecimal) map.get(property.getName().toUpperCase())).intValue());
map.remove(property.getName().toUpperCase());
} else if (map.get(property.getName().toUpperCase()) != null) {
- setter.invoke(obj, map.get(property.getName().toUpperCase()));
+ if(setter.getParameterTypes()[0].getSimpleName().equals("String")){
+ setter.invoke(obj, map.get(property.getName().toUpperCase()) == null ? null:String.valueOf(map.get(property.getName().toUpperCase())));
+ }else{
+ setter.invoke(obj, map.get(property.getName().toUpperCase()));
+ }
map.remove(property.getName().toUpperCase());
}
}
@@ -3800,8 +3808,6 @@
public BaseModel reviseBusinessObject(BaseModel fromBo) {
BaseModel toBo = new BaseModel();
-// Map<String,String> data = new HashMap<>();
-// toBo.getData().put(data);
toBo.setOid(VciBaseUtil.getPk());
toBo.setRevisionOid(VciBaseUtil.getPk());
toBo.setNameOid(fromBo.getNameOid());
@@ -3815,16 +3821,13 @@
toBo.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
toBo.setLastModifyTime(new Date());
toBo.setRevisionRule(fromBo.getRevisionRule());
- toBo.setVersionRule(fromBo.getVersionRule());
-// RevisionValueObject rvObj = this.getNextRevision(fromBo.getBtmName(), fromBo.getNameoid(), item.revRuleName, item.revInput, revisionVal);
- R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(fromBo.getBtmname()));
+ toBo.setVersionRule(fromBo.getVersionRule());R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(fromBo.getBtmname()));
if (!listR.isSuccess() || listR.getData().size() == 0) {
throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
}
Map<String, Object> nextRevision = commonsMapper.getNextRevision(listR.getData().get(0).getTableName(), fromBo.getNameOid());
toBo.setRevisionSeq(Integer.parseInt(nextRevision.get("REVISIONSEQ").toString()));
toBo.setRevisionValue(nextRevision.get("REVISIONVAL").toString());
-// VersionValueObject versionObj = this.getVersionValue(item.verRuleName);
toBo.setVersionSeq(Integer.valueOf(nextRevision.get("VERSIONSEQ").toString()));
toBo.setVersionValue(nextRevision.get("VERSIONVAL").toString());
toBo.setLctid(fromBo.getLctid());
@@ -3833,11 +3836,9 @@
toBo.setName(fromBo.getName());
toBo.setDescription(fromBo.getDescription());
toBo.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
-// toBo.setCheckinBy(String.valueOf(AuthUtil.getUser().getUserId()));
toBo.setCopyFromVersion(fromBo.getOid());
toBo.getData().putAll(fromBo.getData());
toBo.getData().put("CHECKINBY", String.valueOf(AuthUtil.getUser().getUserId()));
-// this.initRevisionTypeAttributeValue(fromBo, toBo);
return toBo;
}
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 1e0b59b..bf62946 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
@@ -116,9 +116,6 @@
}
baseMapper.batchUpdate(btmTypeAttributeDOList);
return BtmTypeAttributeWrapper.build().listEntityVO(btmTypeAttributeDOList);
-// btmTypeAttributeDOList.stream().forEachOrdered(s -> {
-// btmTypeAttributeDOMapper.insert(s);
-// });
}
return null;
}
@@ -215,7 +212,7 @@
// 鐗堟湰瑙勫垯瀛楁涓嶈兘涓虹┖
// vo.setNullableFlag(false);
vo.setAttributeLength(150);
- if (Arrays.asList("lastr","firstr","lastv","firstv","revisionseq","versionseq").contains(id)){
+ if (Arrays.asList("revisionseq","versionseq").contains(id)){
vo.setAttributeLength(5);
vo.setAttrDataType(VciFieldTypeEnum.VTInteger.name());
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
index 086aeb0..391dd47 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
@@ -8,6 +8,7 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.StringUtil;
import java.util.Date;
import java.util.List;
@@ -57,7 +58,9 @@
*/
public BtmTypeAttribute copyBtmTypeAttributeDTO2Entity(BtmTypeLinkAttributesDTO dto, String btmTypeOid, String creator, Date now){
BtmTypeAttribute entity = Objects.requireNonNull(BeanUtil.copy(dto, BtmTypeAttribute.class));
- entity.setOid(VciBaseUtil.getPk());
+ if (StringUtil.isBlank(entity.getOid())) {
+ entity.setOid(VciBaseUtil.getPk());
+ }
entity.setBtmName(BtmTypeConstant.BTM_TYPE_ATTRIBUTE);
entity.setOwner(creator);
entity.setCreator(creator);
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeAttributeMapper.xml b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeAttributeMapper.xml
index 55b7372..f2484f6 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeAttributeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeAttributeMapper.xml
@@ -41,8 +41,8 @@
pl_omd_btm_type
</sql>
<update id="batchUpdate" parameterType="java.util.List">
- BEGIN
- <foreach collection="records" item="item" index="index" separator=";">
+
+ <foreach collection="records" item="item" index="index" separator=";" open="BEGIN" close=";END;">
update <include refid="tableName"/> set
id = #{item.id,jdbcType=VARCHAR},
name = #{item.name,jdbcType=VARCHAR},
@@ -68,7 +68,7 @@
ts = #{item.ts,jdbcType=TIMESTAMP}
where oid = #{item.oid,jdbcType=VARCHAR}
</foreach>
- ;END;
+
</update>
<delete id="batchDelete">
delete from
--
Gitblit v1.9.3