From 369a80288f89d770bbc0a02d02fe6c03a105c424 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 01 九月 2023 09:25:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/data.vue | 43 +++++---
Source/UBCS-WEB/src/views/docking/loge.vue | 59 +++++++----
Source/UBCS-WEB/src/views/docking/info.vue | 14 +-
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java | 12 --
Source/UBCS-WEB/src/views/docking/infoForm.vue | 62 +++++++++--
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java | 12 +
Source/UBCS-WEB/src/views/docking/task.vue | 71 ++++++++------
7 files changed, 170 insertions(+), 103 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index 8f0a079..e81b923 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -55,52 +55,63 @@
prop: "id",
search: true,
sortable:true,
- width:150
+ // width:150
},
{
label: "鍥惧彿",
- prop: "uniquecode",
+ prop: "uniqueCode",
search: true,
+ hide:true,
sortable:true
},
{
- label: '鍒嗙被id',
- prop: 'classifyid',
+ label: '鍒嗙被浠ｅ彿',
+ prop: 'classifyId',
search: true,
sortable:true,
- width: 250
+ // width: 250
},
{
label: '鍒嗙被鍚嶇О',
- prop: 'classifyname',
+ prop: 'classifyName',
search: true,
- sortable:true
+ sortable:true,
},
{
label: '涓氬姟绫诲瀷oid',
- prop: 'btmoid',
+ prop: 'btmOid',
sortable:true,
- width: 150
+ hide:true,
+ // width: 250
},
{
label: '涓氬姟绫诲瀷id',
- prop: 'btmid',
+ prop: 'btmId',
sortable:true,
- width: 150
+ // width: 150
},
{
label: '鎺ㄩ�佺被鍨�',
- prop: 'sendtype',
+ prop: 'sendType',
search: true,
sortable:true,
- width: 150
+ // width: 150,
+ formatter: function (row, column) {
+ if (row.sendType === 'Released') {
+ return '鍙戝竷';
+ } else if (row.sendType === 'TakeBack') {
+ return '鍥炴敹';
+ } else if (row.sendType === 'Disabled') {
+ return '鍋滅敤';
+ }
+ }
},
{
label: '鏄惁鍒嗚В浠诲姟',
- prop: 'sendflag',
+ prop: 'sendFlag',
search: true,
sortable:true,
- width: 130,
+ // width: 130,
html:true,
align:'center',
type:'select',
@@ -111,7 +122,7 @@
value: "key"
},
formatter : function (row, column) {
- return row.sendflag == 'true' || row.sendflag == '1' ? '<i class="el-icon-check"></i>' : '<i class="el-icon-close"></i>'
+ return row.sendFlag == 'true' || row.sendFlag == '1' ? '<i class="el-icon-check" style="color: limegreen"></i>' : '<i class="el-icon-close" style="color: red"></i>'
}
}
]
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 9caf94c..ba7f8f1 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -12,7 +12,7 @@
<template slot="menu" slot-scope="{row,index}">
<el-button icon="el-icon-edit" size="small" type="text" @click="updateSave(row,index)" :disabled="row.usedFlag === 'true' ? false :true">缂栬緫</el-button>
<el-button icon="el-icon-delete" size="small" type="text" @click="deleteSave(row,index)">鍒犻櫎</el-button>
- <el-button v-if="row.usedflag=='false'" icon="el-icon-position" size="small" type="text"
+ <el-button v-if="row.usedFlag=='false' || row.usedFlag==''" icon="el-icon-position" size="small" type="text"
@click="ENABLE(row,index)">鍚敤
</el-button>
<el-button v-else icon="el-icon-finished" size="small" type="text" @click="DISABLE(row,index)">鍋滅敤
@@ -174,8 +174,9 @@
},{
label: 'soapAction',
prop: 'soapAction',
+ overHidden:true,
sortable: true,
- width: 150
+ width: 200
}, {
label: '璋冪敤鏂瑰紡',
prop: 'cxfaxis',
@@ -191,7 +192,8 @@
label: '璇锋眰鍦板潃',
prop: 'requestUrl',
sortable: true,
- width: 150
+ overHidden:true,
+ width: 200
}, {
label: '鎺ュ彛鍑芥暟',
prop: 'interfaceFunction',
@@ -263,7 +265,7 @@
//鍗曞厓鏍兼牱寮�
cellStyle(row,column,rowIndex,columnIndex){
if(row.columnIndex==2) {
- if(row.row.usedFlag == 'false'){
+ if(row.row.usedFlag == '' || row.row.usedFlag == 'false'){
return {
color: 'red',
fontWeight: 'bold',
@@ -327,8 +329,8 @@
this.editAttribute.type = 'edit';
this.$refs.infoForm.formData = this.editAttribute;
this.$refs.infoForm.showSubmitDialog = true;
- console.log('row',row.dataFlowTypeText)
- console.log('editAttribute',this.editAttribute.dataFlowTypeText)
+ // console.log('row',this.editAttribute.pushType)
+ // console.log('editAttribute',this.editAttribute.dataFlowTypeText)
},
deleteSave(row, index) {
this.$confirm("鍒犻櫎鏁版嵁灏嗘棤娉曡鎭㈠, 鏄惁缁х画?", "鎻愮ず", {
diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index e5b83fa..e98d4fd 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -92,7 +92,7 @@
field: 'sourceSystemOid',
fieldMap:{'sourceSystemId':'id'},
placeholder: '璇烽�夋嫨',
- options: {isMuti: false, type: 'default', url: 'api/ubcs-code/dockingManagement/gridDockingSystem'},
+ options: {isMuti: false, type: 'default', url: referUrl},
}"
:value="formData.sourceSystemOid"
:text="formData.sourceSystemName"
@@ -386,16 +386,52 @@
// 閫夊畾琛�
selectRow: ''
},
- dictEnums: []
+ dictEnums: [],
+
}
}
},
watch:{
- formData:{
- handler(newval,oldval){
- console.log('newval',newval.dataFlowTypeText)
+ formData: {
+ handler(newval, oldval) {
+ console.log(newval)
+ if (newval && newval.type === 'edit') {
+ if (this.formData.dataFlowType == 'accept') {
+ this.pushTypeList = [
+ { value: '3', label: '缂栫爜鐢宠' },
+ { value: '4', label: '缂栫爜鏇存敼锛堢姸鎬併�佸洖鏀讹級' },
+ { value: '5', label: '鍒嗙被鏌ヨ' },
+ { value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ' },
+ { value: '7', label: '鏁版嵁鏌ヨ' }
+ ];
+ this.$nextTick(() => {
+ // this.formData.pushType = '';
+ this.formData.targetSystemName = '缂栫爜绯荤粺';
+ this.formData.targetSystemOid = 'code00000001';
+ this.formData.targetSystemId = 'CODE';
+
+ // this.formData.sourceSystemName = '';
+ // this.formData.sourceSystemOid = '';
+ // this.formData.sourceSystemId = '';
+ });
+ } else {
+ this.pushTypeList = [
+ { value: '1', label: '鏁版嵁鎺ㄩ��' },
+ { value: '2', label: '鍒嗙被鎺ㄩ��' }
+ ];
+ this.$nextTick(() => {
+ this.formData.pushType = '1';
+ this.formData.sourceSystemName = '缂栫爜绯荤粺';
+ this.formData.sourceSystemOid = 'code00000001';
+ this.formData.sourceSystemId = 'CODE';
+ // this.formData.targetSystemName = '';
+ // this.formData.targetSystemOid = '';
+ // this.formData.targetSystemId = '';
+ });
+ }
+ }
}
- }
+ },
},
created() {
//this.geDictData('interfaceType', this.interfaceTypeList)
@@ -414,7 +450,7 @@
{value: '5', label: '鍒嗙被鏌ヨ'},
{value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ'},
{value: '7', label: '鏁版嵁鏌ヨ'}]
- this.formData.pushType=''
+ // this.formData.pushType=''
this.formData.targetSystemName='缂栫爜绯荤粺';
this.formData.targetSystemOid='code00000001';
this.formData.targetSystemId='CODE';
@@ -436,15 +472,14 @@
},
methods: {
closeSubmitDialog() {
- this.resetForm();
+ // this.resetForm();
this.showSubmitDialog = false;
},
resetForm() {
- this.formData={}
- // this.formData = {
- // sysIntParamVOs: [],
- // sysIntHeaderVOs: []
- // };
+ this.formData = {
+ sysIntParamVOs: [],
+ sysIntHeaderVOs: []
+ };
this.$refs.form.resetFields();
},
setReferValue(data) {
@@ -490,7 +525,6 @@
}
},
submitAttribute() {
- console.log()
const that = this;
let pass=true
if(this.formData.dataFlowType=='push' && (validatenull(this.formData.classifyName)||validatenull(this.formData.targetSystemName))){
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index bcca2fb..f806110 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -58,42 +58,70 @@
},
{
label: "鍥惧彿",
- prop: "uniquecode",
+ prop: "uniqueCode",
search: true,
+ hide:true,
sortable:true,
width:150
},
{
- label: '鍒嗙被id',
- prop: 'classifyid',
+ label: '鍒嗙被浠ｅ彿',
+ prop: 'classifyId',
search: true,
sortable:true,
width: 250
},
{
label: '鍒嗙被鍚嶇О',
- prop: 'classifyname',
+ prop: 'classifyName',
search: true,
sortable:true,
overHidden: true
},
{
- label: '绯荤粺缂栧彿',
- prop: 'systemcode',
+ label: '闆嗘垚绯荤粺缂栧彿',
+ prop: 'systemCode',
search: true,
sortable:true,
width: 150
},
{
- label: '绯荤粺鍚嶇О',
- prop: 'systemname',
+ label: '闆嗘垚绯荤粺鍚嶇О',
+ prop: 'systemName',
search: true,
sortable:true,
width: 150
+ },
+ {
+ label:'鎺ュ彛鍙傛暟',
+ prop:'paramString',
+ overHidden:true,
+ search: true,
+ sortable:true,
+ width: 150
+ },
+ {
+ label:'杩斿洖鍙傛暟',
+ prop:'returnString',
+ overHidden:true,
+ search: true,
+ sortable:true,
+ width: 150
+ },
+ {
+ label: '杩斿洖msg',
+ prop: 'msg',
+ overHidden: true
+ },
+ {
+ label: '璁板綍鏃堕棿',
+ prop: 'createTime',
+ sortable:true,
+ width: 160
},
{
label: '鏄惁鎺ㄩ�佹垚鍔�',
- prop: 'interfacestatus',
+ prop: 'interFaceStatus',
search: true,
sortable:true,
width: 120,
@@ -107,20 +135,9 @@
value: "key"
},
formatter : function (row, column) {
- return row.interfacestatus == 'true' || row.interfacestatus == '1' ? '<i class="el-icon-check"></i>' : '<i class="el-icon-close"></i>'
+ return row.interFaceStatus == 'true' || row.interFaceStatus == '1' ? '<i class="el-icon-check" style="color: limegreen"></i>' : '<i class="el-icon-close" style="color: red"></i>'
}
},
- {
- label: '杩斿洖msg',
- prop: 'msg',
- overHidden: true
- },
- {
- label: '璁板綍鏃堕棿',
- prop: 'createTime',
- sortable:true,
- width: 160
- }
]
}
}
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index da87c29..591ea4e 100644
--- a/Source/UBCS-WEB/src/views/docking/task.vue
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -67,61 +67,53 @@
},
{
label: "鍥惧彿",
- prop: "uniquecode",
+ prop: "uniqueCode",
search: true,
+ hide:true,
sortable:true,
width:150
},
{
- label: '鍒嗙被id',
- prop: 'classifyid',
+ label: '鍒嗙被浠ｅ彿',
+ prop: 'classifyId',
search: true,
sortable:true,
width: 250
},
{
label: '鍒嗙被鍚嶇О',
- prop: 'classifyname',
+ prop: 'classifyName',
search: true,
- sortable:true
+ sortable:true,
+ width: 200
},
{
- label: '绯荤粺缂栧彿',
- prop: 'systemcode',
+ label: '闆嗘垚绯荤粺缂栧彿',
+ prop: 'systemCode',
search: true,
sortable:true,
width: 150
},
{
- label: '绯荤粺鍚嶇О',
- prop: 'systemname',
+ label: '闆嗘垚绯荤粺鍚嶇О',
+ prop: 'systemName',
search: true,
sortable:true,
width: 150
},
{
label: '鏁版嵁鎯呭喌',
- prop: 'sendtype',
+ prop: 'sendType',
sortable:true,
- width: 100
- },
- {
- label: '鏄惁鎺ㄩ�佹垚鍔�',
- prop: 'sendflag',
- search: true,
- sortable:true,
- width: 120,
- html:true,
- align:'center',
- type:'select',
- searchLabelWidth:130,
- dicData: [{key:'true',value:'鏄�'},{key:'false',value:'鍚�'}],
- props: {
- label: "value",
- value: "key"
- },
- formatter : function (row, column) {
- return row.sendflag == 'true' || row.sendflag == '1' ? '<i class="el-icon-check"></i>' : '<i class="el-icon-close"></i>'
+ width: 100,
+ formatter: function (row, column) {
+ if (row.sendType === 'Released') {
+ return '鍙戝竷';
+ } else if (row.sendType === 'TakeBack') {
+ return '鍥炴敹';
+ } else if (row.sendType === 'Disabled') {
+ return '鍋滅敤';
+ }
}
},
{
@@ -135,7 +127,26 @@
prop: 'lastModifyTime',
sortable:true,
width: 150
- }
+ },
+ {
+ label: '鏄惁鎺ㄩ�佹垚鍔�',
+ prop: 'sendFlag',
+ search: true,
+ sortable:true,
+ width: 120,
+ html:true,
+ align:'center',
+ type:'select',
+ searchLabelWidth:130,
+ dicData: [{key:'true',value:'鏄�'},{key:'false',value:'鍚�'}],
+ props: {
+ label: "value",
+ value: "key"
+ },
+ formatter : function (row, column) {
+ return row.sendFlag == 'true' || row.sendFlag == '1' ? '<i class="el-icon-check" style="color: limegreen"></i>' : '<i class="el-icon-close" style="color: red"></i>'
+ }
+ },
]
}
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
index 6aca608..aab06b5 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
@@ -294,18 +294,6 @@
// 瀹屾垚浠诲姟
taskService.complete(taskId, variables);
-// //璁剧疆涓嬩竴姝ュ鏍镐汉
-// Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).active().singleResult();//涓嬩竴姝ヨ妭鐐�
-// String taskKey = task.getTaskDefinitionKey();//灏辨槸娴佺▼閰嶇疆鐨勮妭鐐筰d
-// Object to = getVar(processInstanceId,taskKey);
-// if(to==null){
-// throw new ServiceException(taskKey+"娌℃湁璁剧疆瀹℃牳浜�");
-// }
-// String assignee = to.toString();
-//
-// if(StringUtils.isNotEmpty(assignee)) {
-// task.setAssignee(assignee);
-// }
return true;
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java
index 63e35bb..6502574 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java
@@ -199,17 +199,21 @@
flowTaskUserCi.setToTaskName(targetFlow.getName());
taskList.add(flowTaskUserCi);
}
- // 濡傛灉涓嬩釜瀹℃壒鑺傜偣涓烘帓浠栫綉鍏�
- if (targetFlow instanceof ExclusiveGateway) {
+ // 濡傛灉涓嬩釜瀹℃壒鑺傜偣涓虹綉鍏�
+ if (targetFlow instanceof Gateway) {
ExclusiveGateway exclusiveGateway = (ExclusiveGateway) targetFlow;
List<SequenceFlow> exclusiveGatewayOutgoingFlows = exclusiveGateway.getOutgoingFlows();
for (SequenceFlow nexti:exclusiveGatewayOutgoingFlows){
String conditionExpression = nexti.getConditionExpression();//condition
+
String taskId = nexti.getTargetRef();//taskId
String name = nexti.getName();//toName,椹冲洖銆佸悓鎰�
- String taskName = taskMap.get(targetFlow.getId());
-
+ String taskName = taskMap.get(taskId);
+//ExclusiveGateway
+ if(StringUtils.isEmpty(conditionExpression)){//姝ゆ椂鎺掍粬缃戝叧娌℃湁閰嶇疆娴佽浆鏉′欢
+ continue;
+ }
for (FlowTaskDTO flowTaskUserCi:mis){
if(taskId.equals(flowTaskUserCi.getTaskId())){
flowTaskUserCi.setCondition(conditionExpression);
--
Gitblit v1.9.3