Merge remote-tracking branch 'origin/master'

 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>'
          }
        }
      ]

 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("删除数据将无法被恢复, 是否继续?", "提示", {

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

 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
          }
        ]
      }
    }

 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"
            },
            width: 100,
            formatter : function (row, column) {
              return row.sendflag == 'true' || row.sendflag == '1' ? '<i class="el-icon-check"></i>' : '<i class="el-icon-close"></i>'
              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>'
          }
          },
        ]
      }
    }

 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();//就是流程配置的节点id
//        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;
    }


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