From a78216b8655bbfd4d70577d21729e9741eb021d5 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期三, 05 七月 2023 17:25:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/mixins/codeApply.js | 7 ++++---
Source/UBCS-WEB/src/components/BatchImport/index.vue | 8 +++++++-
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java | 16 ++++++----------
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index b794d20..b54d048 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -148,9 +148,15 @@
classifyAttr: this.classifyAttr,
};
} else if (this.type === "batchImportApply") {
+ const secDTOList = this.localSecVOList.map(item => {
+ return {
+ secOid: item.oid,
+ secValue: this.codeApplyForm[item.id]
+ }
+ })
return {
codeClassifyOid: this.codeClassifyOid,
- secDTOList: this.secDTOList,
+ secDTOList: JSON.stringify(secDTOList),
...this.codeApplyForm,
};
} else if (this.type === "batchApplyCode") {
diff --git a/Source/UBCS-WEB/src/mixins/codeApply.js b/Source/UBCS-WEB/src/mixins/codeApply.js
index 3f0c1be..4b84617 100644
--- a/Source/UBCS-WEB/src/mixins/codeApply.js
+++ b/Source/UBCS-WEB/src/mixins/codeApply.js
@@ -3,6 +3,7 @@
data() {
return {
secVOList: [],
+ localSecVOList: [],
showCodeApply: false,
selfColumnType: {
codefixedsec: "combox",
@@ -57,13 +58,13 @@
"coderefersec",
];
this.secVOList = res.data.data.secVOList || []
- let localSecVOList = (res.data.data.secVOList || []).filter((item) =>
+ this.localSecVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
);
- if (localSecVOList.length > 0) {
+ if (this.localSecVOList.length > 0) {
this.showCodeApply = true
this.$nextTick(() => {
- this.$refs.CodeApply.templateRender(localSecVOList);
+ this.$refs.CodeApply.templateRender(this.localSecVOList);
});
}
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 e9ec1fd..b01bb9d 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
@@ -62,6 +62,8 @@
private final ProcessStageAttrService processStageAttrService;
private static String MODELKEY = "modelKey";//鍓嶇浼犺繃鏉ョ殑妯″瀷key
+ private static String TASKID = "taskId";//鍓嶇浼犺繃鏉ョ殑妯″瀷key
+ private static String PROCESSINSTANCEID = "processInstanceId";//鍓嶇浼犺繃鏉ョ殑妯″瀷key
@Override
public R<BladeFlow> startProcess(FlowTaskDTO flowTaskUserC){
Map<String, Object> kvv = flowTaskUserC.getVariables();
@@ -228,16 +230,10 @@
flowTaskDTO.setVariables(variables);
}
- String templateId = variables.get("templateId").toString();
- //娴佺▼闃舵
- Map<String, Object> m = new HashMap<>();
- m.put("template_id", templateId);
- m.put("task_id", crruentActivityId);
- m.put("model_key", modelKey);
- QueryWrapper q = Condition.getQueryWrapper(m, ProcessStageAttr.class)
- .select("attr_id attrId,attr_name attrName,attr_group attrGroup");
- List<ProcessStageAttr> stageAttrs = processStageAttrService.list(q);
- flowTaskDTO.setStageAttrs(stageAttrs);
+
+ //鏀惧叆娴佺▼闃舵銆佹祦绋媘odelkey
+ variables.put(TASKID,crruentActivityId);
+ variables.put(PROCESSINSTANCEID,processInstanceId);
return flowTaskDTO;
}
}
--
Gitblit v1.9.3