ludc
2023-08-16 6c8450c4fd1fd978e7e85b2538cb1103072cafd6
Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
已修改10个文件
已删除9个文件
236 ■■■■ 文件已修改
Source/UBCS-WEB/dist/css/app.3e8fa41a.css 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/css/chunk-fbc7959c.2722c412.css 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/css/views.91f45aec.css 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/js/app.28be784b.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/js/chunk-2d0e4caf.f1e21f7e.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/js/chunk-fbc7959c.52c0c326.js 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/js/chunk-vendors.cf283b97.js 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/js/page.5435ff42.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/js/views.ce2ac4d0.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/refer/vciWebRefer.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/work/BusinessWork.vue 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/work/process/leave/handle.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/css/app.3e8fa41a.css
ÎļþÒÑɾ³ý
Source/UBCS-WEB/dist/css/chunk-fbc7959c.2722c412.css
ÎļþÒÑɾ³ý
Source/UBCS-WEB/dist/css/views.91f45aec.css
ÎļþÒÑɾ³ý
Source/UBCS-WEB/dist/index.html
@@ -51,4 +51,4 @@
    .avue-home__sub-title {
      color: #ABABAB;
      font-size: 12px;
    }</style><link href=/css/chunk-fbc7959c.2722c412.css rel=prefetch><link href=/css/page.aeb772ca.css rel=prefetch><link href=/css/views.91f45aec.css rel=prefetch><link href=/js/chunk-2d0e4caf.f1e21f7e.js rel=prefetch><link href=/js/chunk-fbc7959c.52c0c326.js rel=prefetch><link href=/js/page.5435ff42.js rel=prefetch><link href=/js/views.ce2ac4d0.js rel=prefetch><link href=/css/app.3e8fa41a.css rel=preload as=style><link href=/css/chunk-vendors.e41156d0.css rel=preload as=style><link href=/js/app.28be784b.js rel=preload as=script><link href=/js/chunk-vendors.cf283b97.js rel=preload as=script><link href=/css/chunk-vendors.e41156d0.css rel=stylesheet><link href=/css/app.3e8fa41a.css rel=stylesheet></head><body><noscript><strong>很抱歉,如果没有 JavaScript æ”¯æŒï¼ŒSaber å°†ä¸èƒ½æ­£å¸¸å·¥ä½œã€‚请启用浏览器的 JavaScript ç„¶åŽç»§ç»­ã€‚</strong></noscript><div id=app><div class=avue-home><div class=avue-home__main><img class=avue-home__loading src=/svg/loading-spin.svg alt=loading><div class=avue-home__title>正在加载资源</div><div class="avue-home__sub-title d">初次加载资源可能需要较多时间 è¯·è€å¿ƒç­‰å¾…</div></div></div></div><script src=/util/aes.js charset=utf-8></script><script src=/cdn/vue/2.6.10/vue.min.js charset=utf-8></script><script src=/cdn/vuex/3.1.1/vuex.min.js charset=utf-8></script><script src=/cdn/vue-router/3.0.1/vue-router.min.js charset=utf-8></script><script src=/cdn/axios/1.0.0/axios.min.js charset=utf-8></script><script src=/cdn/element-ui/2.15.6/index.js charset=utf-8></script><script src=/cdn/avue/2.9.12/avue.min.js charset=utf-8></script><script src=/cdn/nutflow/wf-design-base/index.umd.min.js charset=utf-8></script><script src=/js/chunk-vendors.cf283b97.js></script><script src=/js/app.28be784b.js></script></body></html>
    }</style><link href=/css/chunk-31320c7c.12eed17e.css rel=prefetch><link href=/css/page.aeb772ca.css rel=prefetch><link href=/css/views.4ff27063.css rel=prefetch><link href=/js/chunk-2d0e4caf.cc0cd3b1.js rel=prefetch><link href=/js/chunk-31320c7c.1ec6d989.js rel=prefetch><link href=/js/page.c9994575.js rel=prefetch><link href=/js/views.5438ca52.js rel=prefetch><link href=/css/app.2af542d8.css rel=preload as=style><link href=/css/chunk-vendors.e41156d0.css rel=preload as=style><link href=/js/app.3459aad3.js rel=preload as=script><link href=/js/chunk-vendors.95f4135c.js rel=preload as=script><link href=/css/chunk-vendors.e41156d0.css rel=stylesheet><link href=/css/app.2af542d8.css rel=stylesheet></head><body><noscript><strong>很抱歉,如果没有 JavaScript æ”¯æŒï¼ŒSaber å°†ä¸èƒ½æ­£å¸¸å·¥ä½œã€‚请启用浏览器的 JavaScript ç„¶åŽç»§ç»­ã€‚</strong></noscript><div id=app><div class=avue-home><div class=avue-home__main><img class=avue-home__loading src=/svg/loading-spin.svg alt=loading><div class=avue-home__title>正在加载资源</div><div class="avue-home__sub-title d">初次加载资源可能需要较多时间 è¯·è€å¿ƒç­‰å¾…</div></div></div></div><script src=/util/aes.js charset=utf-8></script><script src=/cdn/vue/2.6.10/vue.min.js charset=utf-8></script><script src=/cdn/vuex/3.1.1/vuex.min.js charset=utf-8></script><script src=/cdn/vue-router/3.0.1/vue-router.min.js charset=utf-8></script><script src=/cdn/axios/1.0.0/axios.min.js charset=utf-8></script><script src=/cdn/element-ui/2.15.6/index.js charset=utf-8></script><script src=/cdn/avue/2.9.12/avue.min.js charset=utf-8></script><script src=/cdn/nutflow/wf-design-base/index.umd.min.js charset=utf-8></script><script src=/js/chunk-vendors.95f4135c.js></script><script src=/js/app.3459aad3.js></script></body></html>
Source/UBCS-WEB/dist/js/app.28be784b.js
ÎļþÒÑɾ³ý
Source/UBCS-WEB/dist/js/chunk-2d0e4caf.f1e21f7e.js
ÎļþÒÑɾ³ý
Source/UBCS-WEB/dist/js/chunk-fbc7959c.52c0c326.js
ÎļþÒÑɾ³ý
Source/UBCS-WEB/dist/js/chunk-vendors.cf283b97.js
ÎļþÒÑɾ³ý
Source/UBCS-WEB/dist/js/page.5435ff42.js
ÎļþÒÑɾ³ý
Source/UBCS-WEB/dist/js/views.ce2ac4d0.js
ÎļþÒÑɾ³ý
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -523,7 +523,7 @@
        if (
          formItem.type === "combox" &&
          formItem.comboxKey &&
          (!Array.isArray(formItem.dicData) || formItem.dicData.length === 0)
          (!Array.isArray(formItem.dicData) || formItem.dicData.length === 0) &&(!Array.isArray(formItem.data) || formItem.data.length === 0)
        ) {
          dictKeys.push({ dictKey: formItem.comboxKey, field: formItem.field });
        }
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -71,19 +71,19 @@
                   size="small"
                   @click="editOpen">开启编辑
        </el-button>
        <el-select v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" v-model="selectvalue" placeholder="请选择"
                   size="small">
          <el-option
            v-for="item in selectoptions"
            :key="item.value"
            :label="item.label"
            :value="item.value">
          </el-option>
        </el-select>
        <el-switch v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" v-model="switchvalue"
                   active-value="true" style="margin:6px 0 0 10px" @change="batchSetFlag">
        </el-switch>
      </el-button-group>
      <el-select v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" v-model="selectvalue" placeholder="请选择"
                 size="small">
        <el-option
          v-for="item in selectoptions"
          :key="item.value"
          :label="item.label"
          :value="item.value">
        </el-option>
      </el-select>
      <el-switch v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" v-model="switchvalue"
                 active-value="true" style="margin:6px 0 0 10px" @change="batchSetFlag">
      </el-switch>
    </div>
    <!--    å¼¹çª—-->
    <div>
@@ -327,9 +327,11 @@
        <template slot-scope="{ row }">
          <el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text'  ||item.edit == 'refer' )"
                    ref="inputRef"
                    :id="'inputRef' + row.oid"
                    v-show="!AddCellFlag"
                    v-model="row[item.prop]"
                    autofocus @blur="saveRows"></el-input>
                    @blur="saveRows"
                    autofocus></el-input>
          <el-input-number v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
                           :style="{width:(item.width-10)+'px'}"
                           controls-position="right"
@@ -372,6 +374,7 @@
import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto, listByFlag} from '@/api/template/templateAttr'
import {getList} from "@/api/refer/table";
import func from "@/util/func";
import {getCurrentInstance} from "vue";
export default {
  name: "attrCrud .vue",
@@ -428,7 +431,7 @@
      }
    },
    crudArrayFlag: {
      handler(newval, olaval) {
      handler(newval, oldval) {
        console.log('crudArrayFlag', newval)
      }
    },
@@ -453,6 +456,16 @@
        }
      }
    },
    // editingRows:{
    //   handler(newval,oldval){
    //     if(newval){
    //       const inputElement = document.querySelector(`#inputRef${newval.oid}`);
    //       if (inputElement) {
    //         inputElement.focus();
    //       };
    //     }
    //   }
    // },
    ProData: {
      handler(newval, oldval) {
        if (newval) {
@@ -1078,11 +1091,13 @@
        column: [
          {
            label: "属性英文名称",
            prop: "id"
            prop: "id",
            width:100,
          },
          {
            label: "属性中文名称",
            prop: "name"
            prop: "name",
            width:100,
          },
          {
            label: "长度",
@@ -1123,7 +1138,7 @@
            prop: "precisionLength"
          },
          {
            label: "小精刻度",
            label: "小数刻度",
            prop: "scaleLength"
          },
          {
@@ -1565,9 +1580,6 @@
    //可输可选下拉
    selectChangeHandler(editConfig, index) {
      let that = this;
      /*if(that.option.column[index].data && that.option.column[index].data.length>=0){
        return;
      }*/
      listByFlag(editConfig.extraParams).then(res => {
        that.option.column[index].data = res.data.data;
      })
@@ -1586,7 +1598,7 @@
        item.attributeGroup = this.attrModel
      })
      if (this.CurrentCell) {
        this.$set(this.CurrentCell, 'attributeGroup', this.attrModel)
        this.$set(this.CurrentCell, 'attributeGroup', this.attrModel);
      } else {
        this.$set(this.attrSelectList[0], 'attributeGroup', this.attrModel)
      }
@@ -1747,7 +1759,6 @@
      this.ProData.forEach((item, index) => {
        if ((item.requireFlag && item.requireFlag.toString() == 'true') && (item.readOnlyFlag && item.readOnlyFlag.toString() == 'true')) {
          this.$message.warning(item.name + "(" + item.id + ")必输的属性不能是只读");
          console.log(item)
          ischeck = false;
          return;
        }
@@ -1755,29 +1766,23 @@
        if (item.componentRule) {
          //组合规则
          num++
          console.log('componentRule', num)
        }
        if (item.enumString || item.enumId) {
          //枚举
          num++
          console.log('enumString', num)
        }
        if (item.referConfig || item.referBtmId) {
          //参照
          num++
          console.log('referConfig', num)
        }
        if (item.codeDateFormat) {
          //时间格式
          num++
          console.log('codeDateFormat', num)
        }
        //如果空后台返回none
        if (item.classifyInvokeLevel && item.classifyInvokeLevel != 'none') {
          //分类注入
          num++
          console.log('classifyInvokeLevel', num)
          console.log(item.classifyInvokeLevel)
        }
        if (num > 1 && ischeck) {
          this.$message({
@@ -1814,6 +1819,10 @@
        this.editShows = column.property;
        this.rowOid = row.oid;
        this.CurrentCell = row;
          // const inputElement = document.querySelector(`#inputRef${row.oid}`);
          // if (inputElement) {
          //   inputElement.focus();
          // };
        if (column.property == 'referConfig') {
          this.referConfigVisble = true;
          this.referConfigOption = {
@@ -1845,8 +1854,9 @@
          this.isShowformulaEdit = true;
        } else if (column.property == 'enumString') {
          this.enumVisible = true;
          if (this.attrSelectList[0].enumString != "") {
            this.tableData = JSON.parse(this.attrSelectList[0].enumString)
          this.tableData=[];
          if (this.CurrentCell.enumString != "") {
            this.tableData = JSON.parse(this.CurrentCell.enumString)
            return
          }
        } else if (column.property == 'parentCode') {
@@ -1871,6 +1881,11 @@
    },
    saveRows() {
      this.editingRows = null;
      this.editShows = null;
      // const inputElement = document.querySelector(`#inputRef${this.CurrentCell.oid}`);
      // if (inputElement) {
      //   inputElement.blur();
      // }
    },
    // æžšä¸¾æ³¨å…¥æ·»åŠ ä¸€è¡Œç©ºæ•°æ®
    addRow() {
@@ -1974,6 +1989,7 @@
    rulesHandle() {
      if (this.CurrentCell) {
        this.$set(this.CurrentCell, 'verifyRule', this.RulesForm.expressionText)
        this.AddCellFlag = !this.AddCellFlag;
      } else {
        this.attrSelectList.forEach((item) => {
          this.$set(item, 'verifyRule', this.RulesForm.expressionText)
@@ -2092,6 +2108,7 @@
        this.editStyleFlag = true;
        this.attrEditVisible = true;
        this.attrFlag = true;
        this.AddCellFlag=true;
      }
    },
@@ -2120,7 +2137,7 @@
        this.$set(this.attrRow, 'referConfig', JSON.stringify(content))
      }
    },
    // æŽ’序
    // æŽ’序 this.AddCellFlag=false;
    sortChange(val) {
      console.log(val)
    },
Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -19,7 +19,9 @@
    return {
      refertype: this.referConfig.options.type,
      emitData:{},
      title:''
      title:'',
      display:this.display || true,
      disabled:this.disabled || false
    };
  },
  created() {
@@ -30,7 +32,6 @@
    }
  },
  mounted() {
    //console.log(this.referConfig.options);
    var title = this.referConfig.title || '';
    title = title.replace(":", "");
    title = title ? ('为【' + title + '】选取值') : ('为【' + this.referConfig.showField + '】选取值');
@@ -48,7 +49,7 @@
      immediate: true,
      handler(newV) {
        this.$emit("setReferValue", newV);
      },
      }
    }
  }
}
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -16,6 +16,7 @@
                 @search-change="searchChange"
                 @search-reset="searchReset"
                 @selection-change="selectionChange"
                 @row-click="rowClick"
                 @current-change="currentChange"
                 @size-change="sizeChange"
                 @refresh-change="refreshChange"
@@ -83,8 +84,6 @@
  },
  created() {
    this.getParams();
    // console.log('referConfig:')
    // console.log(this.referConfig)
  },
  mounted() {
    if(this.referConfig.options.page){
@@ -254,6 +253,11 @@
    sizeChange(pageSize){
      this.page.pageSize = pageSize;
    },
    rowClick (row) {
      this.$refs.referDefalutCrud.toggleSelection();
      this.$refs.referDefalutCrud.toggleRowSelection(row); //选中当前行
      this.selectionList=[row]
    },
    selectionChange(list) {
      if (!this.isMuti && list.length > 1) {
        const nowVal = list.shift();
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -15,6 +15,7 @@
                 @search-change="searchChange"
                 @search-reset="searchReset"
                 @selection-change="selectionChange"
                 @row-click="rowClick"
                 @current-change="currentChange"
                 @size-change="sizeChange"
                 @refresh-change="refreshChange"
@@ -311,6 +312,11 @@
    sizeChange(pageSize){
      this.page.pageSize = pageSize;
    },
    rowClick (row) {
      this.$refs.referCrud.toggleSelection();
      this.$refs.referCrud.toggleRowSelection(row); //选中当前行
      this.selectionList=[row]
    },
    selectionChange(list) {
      if (!this.isMuti && list.length > 1) {
        const nowVal = list.shift();
Source/UBCS-WEB/src/components/work/BusinessWork.vue
@@ -22,26 +22,34 @@
      align="center"
    >
      <template slot-scope="{ row }">
        <el-input v-if="editingRow === row && editShow== item.prop && item.edit == 'text'" v-model="row[item.prop]"
        <el-input
          v-if="editingRow === row && editShow== item.prop && item.edit == 'input'" v-model="row[item.prop]"
                  @blur="editingRows=null"></el-input>
        <el-input-number size="small" controls-position="right" v-if="editingRow === row && editShow== item.prop && item.edit == 'number'" v-model="row[item.prop]"
        <el-input-number size="small" controls-position="right"
                         v-if="editingRow === row && editShow== item.prop && item.edit == 'number'" v-model="row[item.prop]"
                         @blur="editingRows=null" :style="{width:(item.width-10)+'px'}"></el-input-number>
        <el-select v-model="row[item.prop]" filterable  allow-create  default-first-option slot="prepend" v-if="editingRow === row && editShow== item.prop && item.edit == 'select' " @blur="editingRows=null">
        <el-select filterable  default-first-option slot="prepend" @change="changeSelect"
                   v-if="editingRow === row && editShow== item.prop && item.edit == 'select' "  v-model="row[item.prop]" @blur="editingRows=null">
          <el-option
            v-for="optionItem in item.dicData"
            :key="optionItem.dictValue"
            :label="optionItem.dictValue"
            :value="optionItem.dictValue">
            :key="optionItem.key"
            :label="optionItem.value"
            :value="optionItem.key">
          </el-option>
        </el-select>
        <el-switch
          v-if="item.edit === 'switch' || item.edit === 'truefalse'" v-model="row[item.prop]" active-value="true"
          v-if="editingRow === row && editShow== item.prop && (item.edit === 'switch' || item.edit === 'truefalse')" v-model="row[item.prop]" active-value="true"
          inactive-value="false">
        </el-switch>
        <el-date-picker
          v-if="editingRow === row && editShow== item.prop && (item.edit == 'date' || item.edit == 'datetime') "  v-model="row[item.prop]" @blur="editingRows=null"
          :type="item.edit" :format="item.dateFormate" :value-format="item.dateFormate"
          placeholder="选择日期">
        </el-date-picker>
        <vciWebRefer v-if="editingRow === row && editShow== item.prop && item.edit == 'refer'"
          :referConfig="item.referConfig || {}"
          :value="row[item.referConfig.field] || row[item.prop]"
          :text="row[item.referConfig.showField]"
          :text="row[item.referConfig.showField]" :disabled="item.disabled" :display="item.display"
          @setReferValue="setReferValue"
        ></vciWebRefer>
        <span v-else  v-html="formatter(row,item)"></span>
@@ -143,7 +151,7 @@
          this.List = res.data.tableDefineVO.cols[0];
          this.tableHeadData=[];
          this.List.forEach((item) => {
            let editAttr=this.stageAttrs.filter(stageitem => stageitem.attrId == item.field);
            let editAttr=this.stageAttrs.filter(stageitem => stageitem.attrId == item.field || (item.fieldType=='combox' && stageitem.attrId+'Text' == item.field)|| (item.fieldType=='refer' && stageitem.attrId+'name' == item.field));
            let columnItem = {
              label: item.title,
              prop: item.field,
@@ -165,24 +173,26 @@
            }
            if(editAttr.length>0) {
              editAttr=editAttr[0]
              columnItem.edit= 'text';//this.columnType[editAttr.edit]
              if (typeof editAttr.editConfig == "string") {
                columnItem.editConfig = eval("(" + item.editConfig + ")");
              } else {
                columnItem.editConfig = item.editConfig
              }
              if (item.edit == 'select') {
              columnItem.edit= this.columnType[item.fieldType]
              if (columnItem.edit == 'select') {
                //需要获取下拉框数据
                columnItem.dicData = columnItem.editConfig.comboxConfig.data || this.geDictData(columnItem.editConfig.comboxConfig.comboxKey)
                columnItem.dicData = item.data || this.geDictData(item.comboxKey)
                columnItem.formatter = function (row, column) {
                  let d=column.dicData.find((value, keys, arr) => {
                    return value.key == row[column.prop.replace('Text','')];
                  })
                  return row[column.prop] =(d && d.value) || row[column.prop]
                }
              }
              if (item.edit == 'refer') {
              if (columnItem.edit == 'refer') {
                columnItem.referConfig = {
                  title: item.title,
                  showField: item.showField || item.field,
                  field: item.field,
                  options:  columnItem.editConfig.referConfig
                  field: item.sortField || item.field,
                  options:  item.referConfig
                }
                columnItem.display=!item.hidden;
                columnItem.disabled=item.readOnly
              }
            }
@@ -229,6 +239,9 @@
        this.editingRow[data.field] = data.value || "";
        this.editingRow[data.showField] = data.text || "";
      }
    },
    changeSelect(data){
      this.editingRow[this.editShow.replace('Text','')] = data;
    }
  }
}
Source/UBCS-WEB/src/views/work/process/leave/handle.vue
@@ -132,7 +132,6 @@
      this.apiGetBtnTask(this.processInstanceId)
    },
    formatterPass(row, value, column) {
      console.log('value',value)
      return value?'同意':'驳回'
    },
    async apiGetBtnTask(id) {
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
@@ -24,6 +24,7 @@
import com.vci.ubcs.flow.engine.constant.FlowEngineConstant;
import com.vci.ubcs.flow.engine.entity.FlowProcess;
import com.vci.ubcs.flow.engine.utils.FlowCache;
import com.vci.ubcs.flow.engine.utils.FlowableUtils;
import com.vci.ubcs.starter.web.util.VciDateUtil;
import com.vci.ubcs.system.user.cache.UserCache;
import com.vci.ubcs.system.user.entity.User;
@@ -40,6 +41,7 @@
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.flowable.variable.api.history.HistoricVariableInstance;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
@@ -182,8 +184,13 @@
            }
            flow.setStatus(FlowEngineConstant.STATUS_FINISH);
            //流程发起时间
            flow.setProcessDefinitionStartTime(VciDateUtil.date2Str(historicProcessInstance.getStartTime(),VciDateUtil.DateTimeFormat));
            //流程变量
            Map<String,Object> variables = historicProcessInstance.getProcessVariables();
            List<HistoricVariableInstance> variableInstances = historyService.createHistoricVariableInstanceQuery().processInstanceId(historicProcessInstance.getId()).list();
            Map<String,Object> variables = FlowableUtils.switchVariable(variableInstances);
            flow.setVariables(variables);
            //businessKey
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -1293,7 +1293,7 @@
        uiFormReferVO.setTableConfig(uiTableConfigVO);
        // ç­›é€‰æ¡ä»¶
        HashMap<String, String> whereMap = new HashMap<>();
        if(!codeReferConfig.getCodeSrchCondConfigVOS().isEmpty()){
        if(!CollectionUtils.isEmpty(codeReferConfig.getCodeSrchCondConfigVOS())){
            codeReferConfig.getCodeSrchCondConfigVOS().stream().forEach(srch->{
                whereMap.put(srch.getFilterField()+srch.getFilterType(),srch.getFilterValue());
            });