Merge remote-tracking branch 'origin/master'

 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") {


 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);

            });

          }




 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);

        //放入流程阶段、流程modelkey
        variables.put(TASKID,crruentActivityId);
        variables.put(PROCESSINSTANCEID,processInstanceId);
        return flowTaskDTO;
    }
}