6

jinlin

2023-11-30 499dfffcf6e41f558e80f57e16860e6fb2bdcb31

6

 web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue

@@ -67,6 +67,13 @@
                           clearable></zt-dict>
                </template>
              </el-table-column>
              <el-table-column fixed="right" prop="files" label="上传附件" width="300" align="center">
                <template v-slot="{ row }">
                  <!--                    <zt-table-button @click="files(row.id)">上传附件</zt-table-button>-->
                  <table-uploader busi-type="config_item_warehouse" model-name="row" :dataForm="row"
                                  v-model="row.files"/>
                </template>
              </el-table-column>
            </el-table>
              <div class="icon-container" @click="addConfigItemWarehouseRow()">
                <!-- 放置固定的图标 -->

 zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java

@@ -246,7 +246,6 @@
            // 已經存在該步驟了，不用繼續
            return;
        }

        WfDefStep currentStep = workflowConfigService.get(currentStepId);
        WfDefStep finallyStep = this.queryWfDefFinallyStep(currentStep.getWfDefId().toString());

@@ -356,15 +355,17 @@
                throw new RuntimeException("没有符合(" + wfDef.getName() + ")流程的下一步(" + currentStep.getName() + ")执行人！");
            }

            String updateSql = currentStep.getUpdateSql();
            if (org.apache.commons.lang3.StringUtils.isNotBlank(updateSql)) {
                updateSql = updateSql.replace("${bizId}", bizId.toString());
                updateSql = updateSql.replace("${bizId}", bizId.toString());
                updateSql = updateSql.replace("${nickName}", UserContext.getUser().getRealName());
                updateSql = updateSql.replace("${userId}", UserContext.getUser().getId().toString());
                baseDao.exeSql(updateSql);
            WfDefStep prevStep = workflowConfigService.get(prevStepId);
            if (prevStep!=null) {
                String updateSql = prevStep.getUpdateSql();
                if (org.apache.commons.lang3.StringUtils.isNotBlank(updateSql)) {
                    updateSql = updateSql.replace("${bizId}", bizId.toString());
                    updateSql = updateSql.replace("${bizId}", bizId.toString());
                    updateSql = updateSql.replace("${nickName}", UserContext.getUser().getRealName());
                    updateSql = updateSql.replace("${userId}", UserContext.getUser().getId().toString());
                    baseDao.exeSql(updateSql);
                }
            }

        } else {
            taskParamDto.setUser(null);
            taskParamDto.setGroupId2(null);
@@ -382,6 +383,18 @@
                baseDao.exeSql(updateSql);
            }

            WfDefStep prevStep = workflowConfigService.get(prevStepId);
            if (prevStep!=null) {
                updateSql = prevStep.getUpdateSql();
                if (org.apache.commons.lang3.StringUtils.isNotBlank(updateSql)) {
                    updateSql = updateSql.replace("${bizId}", bizId.toString());
                    updateSql = updateSql.replace("${bizId}", bizId.toString());
                    updateSql = updateSql.replace("${nickName}", UserContext.getUser().getRealName());
                    updateSql = updateSql.replace("${userId}", UserContext.getUser().getId().toString());
                    baseDao.exeSql(updateSql);
                }
            }

            if (!StringUtils.isBlank(currentStep.getNextFlows())) {
                boolean canNext = true;
                if (!StringUtils.isBlank(currentStep.getPreFlows())) {