Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue

@@ -199,6 +199,7 @@
      type: String,

      default: "",

    },

    type: String

  },

  computed: {

    dialogVisible: {

@@ -322,6 +323,15 @@
    filterText(val) {

      this.$refs.tree.filter(val);

    },

    leftTree: {

      immediate: true,

      deep: true,

      handler(arr) {

        if (arr.length > 0 && this.type === 'batchImportApply') {

          this.treeNodeClick(arr[0])

        }

      }

    }

  },

};

</script>


 Source/UBCS-WEB/src/components/BatchImport/index.vue

@@ -49,6 +49,7 @@
      :on-exceed="handleExceed"

      :headers="uploadHeaders"

      :on-success="onSuccess"

      :on-error="onError"

      :show-file-list="false"

      :on-change="uploadChange"

      :data="upParams"

@@ -168,6 +169,7 @@
      leftTree: [],

      redisOid: "",

      pageLoading: null,

      showCodeApply: false,

      currentTypeObj: {

        historyImport: {

          title: "历史数据导入",

@@ -208,18 +210,17 @@
  },

  methods: {

    async beforeUpload(file) {

      console.log(file, 'file');

      const fileType = file.name.split(".").pop();

      if (fileType !== "xlsx" && fileType !== "xls") {

        // ä¸Šä¼ æ ¼å¼ä¸ç¬¦åˆè¦æ±‚，提示错误信息并取消上传

        this.$message.error("只允许上传xlsx、xls格式的文件");

        return Promise.reject(false);

      }

      if (this.type === "batchImportApply") {

        const flag = await this.$refs.CodeApply.validate();

        if (!flag) {

          return Promise.reject(false);

        }

      if (this.type === "batchImportApply" && this.showCodeApply) {

        // const flag = await this.$refs.CodeApply.validate();

        // if (!flag) {

        //   return Promise.reject(false);

        // }

      }

      this.pageLoading = this.$loading({

        lock: true,

@@ -249,8 +250,8 @@
        this.dialogVisible = false

        return

      }

      let fileName = res.data.filePath.split("/").pop();

      if (res.data.fileOid) {

        const fileName = res.data.filePath.split("/").pop();

        this.$message.error("请下载错误信息文件进行查看！");

        downloadErrorFile({ uuid: res.data.fileOid }).then((res2) => {

          this.$utilFunc.downloadFileByBlob(res2.data, fileName);

@@ -269,8 +270,11 @@
        });

      }

    },

    onError(err) {

      console.log(err, 'err');

      this.pageLoading.close();

    },

    uploadChange(file) {

      console.log(file, 'file', file.status === "success");

      if (file.status === "success" || file.status === "error") {

        this.pageLoading.close();

      }


 Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue

@@ -59,7 +59,7 @@
            :label="item.label"
            :prop="item.prop"
            :sortable="item.sortable"
            :formatter="formatBoolean"
            :formatter="item.formatter"
            :width="item.label.length >=4 ?'150':item.label.length==3 ?'120':'90'"
            :show-overflow-tooltip="true"
            align="center"
@@ -143,6 +143,7 @@
import SetPersonnel from "@/components/template/SetPersonnel";
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
import BatchImport from '@/components/BatchImport'
import { validatenull } from "@/util/validate";
export default {
  components: {
    integrationTransfer,
@@ -269,6 +270,19 @@
    },
    tableHeadFindData: {
      handler(newval, oldval) {
        newval.forEach((record,_index) =>{
          if(record.field == 'id' && validatenull(record.templet)){
            //企业编码的默认添加超链接,暂未实现
            record.formatter = '';
          }else {
            if (record.templet && typeof (record.templet) == 'string' && !validatenull(record.templet) && record.templet.indexOf("function(row,column)")>-1) {
              record.formatter = eval("(" + record.templet + ")");
              //function(row,column){return row[column.property]=='true' || row[column.property]=='1'?'是':'否'}
            }else if(record.fieldType=="truefalse"){
              record.formatter = function(row,column){return row[column.property]=='true' || row[column.property]=='1'?'是':'否'}
            }
          }
        })
        this.tableHeadFindDatas = newval;
      },
    },
@@ -285,17 +299,6 @@
    },
  },
  methods: {
    // è½¬æ¢æ•°æ®true和false
    formatBoolean(row, column) {
      if (column.property === "xiaoshouwl"
        ||column.property === "shifoupihaoguanli"
        ||column.property === "caigouwl"
        ||column.property === "kucunwl"
        ||column.property === "passing") {
        return row[column.property] =='true'? "是" : "否";
      }
      return row[column.property];
    },
    // å‘布
    setHandler() {
      if (this.selectRow.length <= 0) {

 Source/UBCS-WEB/src/components/Tree/attrCrud.vue

@@ -209,7 +209,7 @@
      ></formula-editor>
      <!--    æ–°å¢ž  -->
      <el-dialog :visible.sync="addVisible" append-to-body title="从业务类型中选择属性">
        <avue-crud :data="businessData" :option="businessOption" @select="businessSelect">
        <avue-crud :data="businessData" :option="businessOption" @selection-change="businessSelect">
          <template slot="menuLeft">
            <div style="display: flex;">
              <el-select>
@@ -238,7 +238,7 @@
        type="selection"
        width="55">
      </el-table-column>
      <el-table-column fixed label="序号" type="index" width="55"></el-table-column>
      <!--<el-table-column fixed label="序号" type="index" width="55"></el-table-column>-->
      <el-table-column v-for="item in this.option.column" :key="item.id"
                       :label="item.label"
                       :prop="item.prop"
@@ -248,12 +248,13 @@
                       align="center"
      >
        <template slot-scope="{ row }">
          <el-input v-if="editingRows === row && editShows== item.prop" v-model="row[item.prop]"
          <el-input v-if="editingRows === row && editShows== item.prop && (item.edit == 'text' || item.edit == 'select' ||item.edit == 'refer')" v-model="row[item.prop]"
                    @blur="saveRows"></el-input>
          <el-input-number controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
                           @blur="saveRows"></el-input-number>
          <el-switch
            v-if="item.label === 'true' || item.label === 'false'"
            active-color="#13ce66"
            inactive-color="#ff4949">
            v-if="item.edit === 'switch'" v-model="row[item.prop]" active-value="true"
            inactive-value="false">
          </el-switch>
          <span v-else>{{ row[item.prop] }}</span>
        </template>
@@ -335,14 +336,14 @@
      },
      // ç¼–码申请预览data
      applicationData: [],
      //业务类型单选数组
      //业务类型选择数组
      busineSelectList: [],
      //业务类型添加数据
      busineAddList: {},
      //表格单选数组
      CrudSelect: [],
      attrSelectList: [],
      //表格oid
      CrudOid: "",
      attrOid: "",
      //场景变量
      thisSceneTableData: [
        {
@@ -940,7 +941,7 @@
      rowCellList: [],
      List: [],
      option: {
        index: true,
        index: false,
        border: true,
        editBtn: false,
        selection: true,
@@ -953,8 +954,14 @@
          prop: 'name',
          order: 'descending'
        },
        column: [
          {
        column: [{
          prop: 'orderNum',
          label: '排序号',
          sortable: true,
          edit: 'number',
          width: 60,
          fixed: true
        }, {
            label: "属性英文编号",
            prop: "id",
            fixed: true,
@@ -969,6 +976,7 @@
            fixed: true,
            cell: false,
            width: 125,
            edit: 'text',
            sortable: true
          },
          {
@@ -976,6 +984,7 @@
            prop: "attributeGroup",
            cell: false,
            sortable: true,
            edit: 'text',
            width: 125,
          },
          {
@@ -990,78 +999,90 @@
            cell: false,
            sortable: true,
            width: 105,
            edit: 'number'
          },
          {
            label: "关键属性",
            prop: "keyAttrFlag",
            cell: false,
            type: "switch",
            edit: "switch"
          },
          {
            label: "查询属性",
            prop: "queryAttrFlag",
            cell: false,
            edit: "switch"
          },
          {
            label: "高级查询属性",
            prop: "seniorQueryAttrFlag",
            width: 95,
            cell: false,
            edit: "switch"
          },
          {
            label: "相似查询属性",
            label: "相似查重属性",
            prop: "sameRepeatAttrFlag",
            width: 95,
            cell: false,
            edit: "switch"
          },
          {
            label: "必输",
            prop: "requireFlag",
            cell: false,
            edit: "switch"
          },
          {
            label: "表单显示",
            prop: "formDisplayFlag",
            cell: false,
            edit: "switch"
          },
          {
            label: "列表显示",
            prop: "tableDisplayFlag",
            cell: false,
            edit: "switch"
          },
          {
            label: "只读",
            prop: "readonlyFlag",
            cell: false,
            edit: "switch"
          },
          {
            label: "列表排序",
            prop: "sortAttrFlag",
            cell: false,
            edit: "switch"
          },

          {
            label: "多行文本",
            prop: "textareaFlag",
            cell: false,
            edit: "switch"
          },
          {
            label: "默认值",
            prop: "defaultValue",
            sortable: true,
            cell: false,
            edit: 'text',
            width: 95,
          },
          {
            label: "前缀",
            prop: "prefixValue",
            sortable: true,
            edit: 'select',
            cell: false,
          },
          {
            label: "后缀",
            prop: "suffixValue",
            sortable: true,
            edit: 'select',
            cell: false,
          },
          {
@@ -1069,6 +1090,7 @@
            prop: "componentRule",
            sortable: true,
            cell: false,
            edit: 'refer',
            width: 105,
          },
          {
@@ -1076,6 +1098,7 @@
            prop: "verifyRule",
            sortable: true,
            cell: false,
            edit: 'refer',
            width: 105,
          },
          {
@@ -1083,84 +1106,97 @@
            prop: "codeDateFormat",
            sortable: true,
            width: 105,
            edit: 'select',
            cell: false,
          },
          {
            label: "分类注入",
            prop: "classifyInvokeLevel",
            cell: false,
            edit: 'refer'
          },
          {
            label: "枚举注入",
            prop: "enumString",
            cell: false,
            edit: 'refer'
          },
          {
            label: "级联属性",
            prop: "parentCode",
            cell: false,
            edit: 'refer'
          },
          {
            label: "参照配置",
            prop: "referConfig",
            cell: false,
            edit: 'refer'
          },
          {
            label: "级联查询属性",
            prop: "parentQueryAttr",
            width: 105,
            cell: false,
            edit: 'text'
          },
          {
            label: "选择库标识",
            prop: "libraryIdentification",
            width: 105,
            cell: false,
            edit: 'text'
          },
          {
            label: "填写提示",
            prop: "explain",
            cell: false,
            edit: 'text'
          },
          {
            label: "表单显示样式",
            prop: "formDisplayStyle",
            width: 105,
            cell: false,
            edit: 'text'
          },
          {
            label: "表格显示样式",
            prop: "tableDisplayStyle",
            width: 105,
            cell: false,
            edit: 'text'
          },
          {
            label: "表单超链接",
            prop: "formHref",
            width: 95,
            cell: false,
            edit: 'text'
          },
          {
            label: "表格超链接",
            prop: "tableHref",
            width: 95,
            cell: false,
            edit: 'text'
          },
          {
            label: "表格显示js",
            prop: "tableDisplayJs",
            width: 95,
            cell: false,
            edit: 'text'
          },
          {
            label: "长度",
            prop: "controlLength",
            cell: false,
            cell: false
          },
          {
            label: "小数精度",
            prop: "precisionLength",
            cell: false,
            cell: false
          },
          {
            label: "取值范围",
@@ -1168,10 +1204,39 @@
            sortable: true,
            cell: false,
            width: 105,
            edit: 'text'
          },
        ],
        List: []
      },
      vciFieldTypeMap : {
        VTBoolean: "布尔型",
        VTClob: "长文本",
        VTDate: "日期",
        VTDateTime: "日期时间",
        VTTime: "时间",
        VTLong: "长整型",
        VTDouble: "金额/双精度",
        VTInteger: "整形",
        VTFilePath: "文件",
        VTString: "字符串"
      }
    }
  },
  computed:{
    attrOids() {
      let oids = [];
      this.attrSelectList.forEach(ele => {
        oids.push(ele.oid);
      });
      return oids.join(",");
    },
    busineOids() {
      let oids = [];
      this.busineSelectList.forEach(ele => {
        oids.push(ele.oid);
      });
      return oids.join(",");
    }
  },
  mounted() {
@@ -1185,11 +1250,12 @@
    },
    //属性分组按钮
    attrVisibleHandle() {
      if (this.CrudSelect.length > 1) {

      if (this.attrSelectList.length > 1) {
        this.$message.warning('只能选择一条模板属性')
      } else if (this.CrudSelect < 1) {
      } else if (this.attrSelectList < 1) {
        this.$message.warning('请选择一条模板属性')
      } else if (this.CrudSelect.length === 1) {
      } else if (this.attrSelectList.length === 1) {
        this.attrVisible = true;
      }
    },
@@ -1215,38 +1281,74 @@
    },
    //业务类型保存
    busineAddHandle() {
      if (this.busineSelectList.length > 1) {
        this.$message.warning('请选择一条业务类型数据')
      } else {
        this.$set(this.busineAddList, 'classifytemplateoid', this.crudOid)
        this.$set(this.busineAddList, 'oid', '')
        this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
        this.addVisible = false;
      if (this.busineSelectList.length == 0) {
        this.$message.warning('请选择属性集');
        return false;
      }
debugger;
      let ordernum = this.ProData.length;
      this.busineSelectList.forEach((citem) => {
        let isCopy = false;
        this.ProData.forEach((item) => {
          if (citem.id == item.id) {
            isCopy = true;
            return false;
          }
        })
        if (!isCopy) {
          citem.oid = ''
          this.busineAddList=Object.assign(citem, {
            orderNum: ++ordernum,
            attributedatatype: citem.attrDataType,
            attributeDataTypeText: this.vciFieldTypeMap[citem.attrDataType],
            controlLength: citem.attributeLength,
            valueArea: citem.range,
            referbtmid: citem.referBtmTypeId,
            referbtmname: citem.referBtmTypeName,
            referConfig: '',
            enumid: citem.enumId,
            precisionLength: (citem.precisionLength ? citem.precisionLength : '') + (citem.scaleLength ? '(' + citem.scaleLength + ')' : ''),
            classifyTemplateOid: this.crudOid,
            classifytemplateoid: this.crudOid,
            formDisplayFlag: true,
            tableDisplayFlag: true,
            sortAttrFlag: false,
            queryAttrFlag: true,
            seniorQueryAttrFlag: true,
            attrTableWidth: 120
          })
          this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
        }
      })


      this.addVisible = false;

    },
    //业务类型单选
    //业务类型选择
    businessSelect(selection, row) {
      this.busineSelectList = selection
      this.busineAddList = row
    },
    // ä»Žä¸šåŠ¡ç±»åž‹ä¸­é€‰æ‹©æ•°æ®
    // ä»Žä¸šåŠ¡ç±»åž‹ä¸­é€‰æ‹©æ•°æ®å¼¹çª—
    busineHandle() {
        this.addVisible = true;
        AttrByBtm({'conditionMap[oid]': this.crudOid}).then(res => {
          this.businessData = res.data.data;
        })
      this.addVisible = true;
      this.busineSelectList = []
      this.busineAddList = [];
      AttrByBtm({'conditionMap[oid]': this.crudOid}).then(res => {
        this.businessData = res.data.data;
      })
    },
    // çº§è”属性按钮
    CascadeHandle() {
      if (this.CrudSelect.length > 1) {
      if (this.attrSelectList.length > 1) {
        this.$message.warning('只能选择一条模板属性')
      } else if (this.CrudSelect.length < 1) {
      } else if (this.attrSelectList.length < 1) {
        this.$message.warning('请选择一条模板属性')
      } else if (this.CrudSelect.length === 1) {
      } else if (this.attrSelectList.length === 1) {
        this.CascadeVisible = true;
        gridCodeClassifyTemplateAttr({
          'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
          'conditionMap[oid_notequal]': this.CrudOid
          'conditionMap[oid_notequal]': this.attrOid
        }).then(res => {
          this.CascadeData = res.data.data;
        })
@@ -1254,10 +1356,12 @@
    },
    //表格单选
    selectHandle(selection, row) {
      this.CrudOid = row.oid;
      this.CrudSelect = selection;
      this.attrOid = row.oid;
      this.attrRow = row;
      console.log('123',row,selection)
    },
    //表格选择
    selectionChange(list) {
      this.attrSelectList = list;
    },
    //保存
    addsHandler() {
@@ -1282,9 +1386,9 @@
    },
    //表格行编辑
    handleCellClicks(row, column) {
      this.editingRows = row;
      this.editShows = column.property;
      this.rowOid = row.oid;
        this.editingRows = row;
        this.editShows = column.property;
        this.rowOid = row.oid;
    },
    saveRows() {
      this.editingRows = null;
@@ -1307,11 +1411,11 @@
    },
    //枚举注入按钮
    enmuVisHandle() {
      if (this.CrudSelect.length > 1) {
      if (this.attrSelectList.length > 1) {
        this.$message.warning('只能选择一条模板属性')
      } else if (this.CrudSelect < 1) {
      } else if (this.attrSelectList < 1) {
        this.$message.warning('请选择一条模板属性')
      } else if (this.CrudSelect.length === 1) {
      } else if (this.attrSelectList.length === 1) {
        this.enumVisible = true;
      }
    },
@@ -1353,11 +1457,11 @@
    },
    //点击分类注入按钮
    injectBtn() {
      if (this.CrudSelect.length > 1) {
      if (this.attrSelectList.length > 1) {
        this.$message.warning('只能选择一条模板数据')
      } else if (this.CrudSelect.length < 1) {
      } else if (this.attrSelectList.length < 1) {
        this.$message.warning('请选择一条模板数据')
      } else if (this.CrudSelect.length === 1) {
      } else if (this.attrSelectList.length === 1) {
        this.injectVisible = true
      }
    },
@@ -1411,11 +1515,11 @@
    },
    //同步到其他模板
    syncHandle() {
      if (this.CrudSelect.length > 1) {
      if (this.attrSelectList.length > 1) {
        this.$message.warning('只能选择一条模板属性数据')
      } else if (this.CrudSelect.length < 1) {
      } else if (this.attrSelectList.length < 1) {
        this.$message.warning('请选择一条模板属性数据')
      } else if (this.CrudSelect.length === 1) {
      } else if (this.attrSelectList.length === 1) {
        copyto({oid: this.attrRow.oid}).then(res => {
          this.$message.success('同步成功')
        })
@@ -1427,11 +1531,11 @@
    },
    //组合规则
    isShowHandler() {
      if (this.CrudSelect.length > 1) {
      if (this.attrSelectList.length > 1) {
        this.$message.warning('只能选择一条模板属性数据')
      } else if (this.CrudSelect.length < 1) {
      } else if (this.attrSelectList.length < 1) {
        this.$message.warning('请选择一条模板属性数据')
      } else if (this.CrudSelect.length === 1) {
      } else if (this.attrSelectList.length === 1) {
        this.isShowformulaEdit = true;
      }
    },

 Source/UBCS-WEB/src/components/work/BusinessWork.vue

@@ -1,17 +1,38 @@
<template>
<div>
  <el-button @click="HandlerRend"></el-button>
  <el-table :data="data">
    <el-table-column
      fixed
      type="selection"
      width="55">
  <el-button  @click="HandlerRend" size="small" type="primary">保存</el-button>
  <el-table
    v-loading="isLoading"
    :data="tableData"
    max-height="700"
    style=""
    @cell-click="handleCellClick"
  >
    <el-table-column fixed type="selection" width="55"> </el-table-column>
    <el-table-column fixed label="序号" type="index" width="55">
    </el-table-column>
    <el-table-column
      fixed
      label="序号"
      type="index"
      width="55">
      v-for="item in this.tableHeadData"
      :key="item.id"
      :label="item.label"
      :prop="item.prop"
      :sortable="item.sortable"
      :formatter="item.formatter"
      :width="item.label.length >=4 ?'150':item.label.length==3 ?'120':'90'"
      :show-overflow-tooltip="true"
      align="center"
    >
      <!-- ç¼–辑和展示逻辑 -->
      <!--              <template slot-scope="{ row }">-->
      <!--                <el-input v-if="editingRow === row && editShow== item.prop" v-model="row[item.prop]" @blur="saveRow"></el-input>-->
      <!--                <span v-else>{{row[item.prop]}}</span>-->
      <!--                <el-switch-->
      <!--                  v-if="editShow === 'true'"-->
      <!--                  v-model="row[item.prop]"-->
      <!--                  active-color="#13ce66"-->
      <!--                  inactive-color="#ff4949">-->
      <!--                </el-switch>-->
      <!--              </template>-->
    </el-table-column>
  </el-table>
</div>
@@ -19,17 +40,20 @@

<script>
import {businese} from '@/api/work/businese'
import {MasterTable} from "@/api/GetItem";
import {validatenull} from "@/util/validate";
export default {
  name: "BusinessWork",
  props:['ids','templateId'],
  data() {
    return {
      BuinessOids:[],
      data:[
        {
          label:'app'
        }
      ]
      isLoading:false,
      tableHeadData:[],
      tableData:[],
      editingRow: null,
      editShow: "",
      editAttr: ""
    }
  },
  watch:{
@@ -37,6 +61,8 @@
      handler(newval,oldval){
        this.BuinessOids=newval;
        this.BuinseseRend()
        console.log(newval)
        console.log(this.BuinessOids)
      },
      deep:true
    }
@@ -46,14 +72,55 @@
  mounted() {
  },
  methods:{
    HandlerRend(){
      this.editingRow = null;
    },
    //表格头渲染
    CrudHeaderRend() {
      if (this.codeClassifyOid != "") {
        MasterTable({
          codeClassifyOid: this.codeClassifyOid,
          functionId: 5,
        }).then((res) => {
          this.options = res.data.tableDefineVO.seniorQueryColumns;
          this.List = res.data.tableDefineVO.cols[0];
          this.tableHeadData=[];
          this.List.forEach((item) => {
            let columnItem = {
              label: item.title,
              prop: item.field,
              type: this.columnType[item.type],
              sortable: item.sort,
              width: item.minWidth
            };
            if(item.field == 'id' && validatenull(item.templet)){
              //企业编码的默认添加超链接,暂未实现
              columnItem.formatter = '';
            }else {
              if (item.templet && typeof (item.templet) == 'string' && !validatenull(item.templet) && item.templet.indexOf("function(row,column)")>-1) {
                columnItem.formatter = eval("(" + item.templet + ")");
                //function(row,column){return row[column.property]=='true'?'是':'否'}
              }
            }
            this.tableHeadData.push(columnItem)
          });
        });
      }
    },
    //表格数据
    BuinseseRend(){
      businese({
        btmType:'wupin',
        'conditionMap[oid]':this.BuinessOids.toString()
      }).then(res=>{
        console.log(res)
        this.tableData = res.data.data;
      })
    }
    },
    // ç›‘听单元格点击事件并存储正在编辑的行
    handleCellClick(row, column) {
      this.editingRow = row;
      this.editShow = column.property;
    },
  }
}
</script>

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java

@@ -9,6 +9,7 @@
import com.vci.ubcs.omd.vo.LifeCycleVO;
import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -43,12 +44,12 @@
    @GetMapping("page")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页查询生命周期",notes = "分页查询生命周期")
    public R<IPage<LifeCycleVO>> page(BaseQueryObject baseQueryObject){
        Map<String, String> conditionMap = baseQueryObject.getConditionMap();
    public R<IPage<LifeCycleVO>> page(BladeQueryObject baseQueryObject){
        Map<String, Object> conditionMap = baseQueryObject.getConditionMap();
        if (conditionMap == null){
            conditionMap = new HashMap<>();
        }
        return R.data(lifeCycleService.listLife(conditionMap,baseQueryObject.getPageHelper()));
        return R.data(lifeCycleService.listLife(conditionMap,baseQueryObject.getQuery()));
    }



 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleEdgeMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.vci.ubcs.omd.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.vci.ubcs.omd.entity.LifeCycleEdge;

/**
 * ç”Ÿå‘½å‘¨æœŸçš„连接线
 * @author weidy
 * @date 2023/7/4
 */
public interface LifeCycleEdgeMapper extends BaseMapper<LifeCycleEdge> {
}

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleLineEventMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.vci.ubcs.omd.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.vci.ubcs.omd.dto.LifeCycleLineEventDTO;
import com.vci.ubcs.omd.entity.LifeCycleLineEvent;

/**
 * ç”Ÿå‘½å‘¨æœŸè¿žæŽ¥çº¿çš„事件
 * @author weidy
 * @date 2023/7/4
 */
public interface LifeCycleLineEventMapper extends BaseMapper<LifeCycleLineEvent> {
}

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleNodeMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.vci.ubcs.omd.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.vci.ubcs.omd.entity.LifeCycleNode;

/**
 * ç”Ÿå‘½å‘¨æœŸçš„节点存储
 * @author weidy
 * @date 2023/7/4
 */
public interface LifeCycleNodeMapper extends BaseMapper<LifeCycleNode> {
}

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java

@@ -250,4 +250,18 @@
     * @return ä¸šåŠ¡ç±»åž‹
     */
    BtmTypeVO getAllAttributeByBtmOid(String btmTypeOid);

    /**
     * èŽ·å–引用某个生命周期的业务类型
     * @param lifeOid ç”Ÿå‘½å‘¨æœŸçš„主键
     * @return ä¸šåŠ¡ç±»åž‹æ˜¾ç¤ºå¯¹è±¡
     */
    List<BtmTypeVO> selectByLifeId(String lifeId);

    /**
     * ç»Ÿè®¡å¼•ç”¨æŸä¸ªç”Ÿå‘½å‘¨æœŸçš„业务类型
     * @param lifeOid ç”Ÿå‘½å‘¨æœŸçš„主键
     * @return ä¸ªæ•°
     */
    Integer countByLifeId(String lifeId);
}

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java

@@ -7,6 +7,7 @@
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.LifeCycleVO;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import org.springblade.core.mp.support.Query;

import java.util.List;
import java.util.Map;
@@ -21,10 +22,10 @@
    /**
     * èŽ·å–生命周期列表
     * @param conditionMap æŸ¥è¯¢æ¡ä»¶
     * @param pageHelper åˆ†é¡µ
     * @param query åˆ†é¡µ
     * @return ç”Ÿå‘½å‘¨æœŸçš„显示对象
     */
    IPage<LifeCycleVO> listLife(Map<String, String> conditionMap, PageHelper pageHelper);
    IPage<LifeCycleVO> listLife(Map<String, Object> conditionMap, Query query);

    /**
     * æ·»åŠ ä¿å­˜

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.api.exception.NacosException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.omd.constant.BtmTypeConstant;
@@ -868,4 +869,36 @@
        btmType.setAttributes(btmTypeAttributeService.getAllAttribute(btmType));
        return btmType;
    }

    /**
     * èŽ·å–引用某个生命周期的业务类型
     *
     * @param lifeId ç”Ÿå‘½å‘¨æœŸçš„编号
     * @return ä¸šåŠ¡ç±»åž‹æ˜¾ç¤ºå¯¹è±¡
     */
    @Override
    public List<BtmTypeVO> selectByLifeId(String lifeId) {
        if(StringUtils.isBlank(lifeId)){
            return new ArrayList<>();
        }
        LambdaQueryWrapper<BtmType> query = new LambdaQueryWrapper<BtmType>();
        query.eq(BtmType::getLifeCycleId,lifeId);
        return BtmTypeWrapper.build().listEntityVO(getBaseMapper().selectList(query));
    }

    /**
     * ç»Ÿè®¡å¼•ç”¨æŸä¸ªç”Ÿå‘½å‘¨æœŸçš„业务类型
     *
     * @param lifeId ç”Ÿå‘½å‘¨æœŸçš„编号
     * @return ä¸ªæ•°
     */
    @Override
    public Integer countByLifeId(String lifeId) {
        if(StringUtils.isBlank(lifeId)){
            return 0;
        }
        LambdaQueryWrapper<BtmType> query = new LambdaQueryWrapper<BtmType>();
        query.eq(BtmType::getLifeCycleId,lifeId);
        return baseMapper.selectCount(query).intValue();
    }
}

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java

@@ -1,18 +1,49 @@
package com.vci.ubcs.omd.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.omd.constant.BtmTypeConstant;
import com.vci.ubcs.omd.dto.LifeCycleDTO;
import com.vci.ubcs.omd.dto.LifeCycleEdgeDTO;
import com.vci.ubcs.omd.dto.LifeCycleLineEventDTO;
import com.vci.ubcs.omd.dto.LifeCycleNodeDTO;
import com.vci.ubcs.omd.entity.LifeCycleEdge;
import com.vci.ubcs.omd.entity.LifeCycleLineEvent;
import com.vci.ubcs.omd.entity.LifeCycleNode;
import com.vci.ubcs.omd.entity.LifeCycleRule;
import com.vci.ubcs.omd.mapper.LifeCycleEdgeMapper;
import com.vci.ubcs.omd.mapper.LifeCycleLineEventMapper;
import com.vci.ubcs.omd.mapper.LifeCycleMapper;
import com.vci.ubcs.omd.mapper.LifeCycleNodeMapper;
import com.vci.ubcs.omd.repeater.DomainRepeater;
import com.vci.ubcs.omd.service.IBtmTypeService;
import com.vci.ubcs.omd.service.ILifeCycleService;
import com.vci.ubcs.omd.service.IStatusService;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.LifeCycleVO;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.omd.vo.StatusVO;
import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper;
import com.vci.ubcs.starter.enumpack.NewAppConstantEnum;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.constant.RegExpConstant;
import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;


/**
 * ç”Ÿå‘½å‘¨æœŸçš„服务
@@ -22,17 +53,49 @@
@Service
public class LifeCycleServiceImpl  extends ServiceImpl<LifeCycleMapper, LifeCycleRule> implements ILifeCycleService{

    /**
     * èŠ‚点的数据层
     */
    @Resource
    private LifeCycleNodeMapper nodeMapper;

    /**
     * è¿žæŽ¥çº¿æ•°æ®å±‚
     */
    @Resource
    private LifeCycleEdgeMapper edgeMapper;

    /**
     * çŠ¶æ€
     */
    @Autowired(required = false)
    @Lazy
    private IStatusService statusService;

    /**
     * è¿žæŽ¥çº¿çš„事件
     */
    @Resource
    private LifeCycleLineEventMapper lineEventMapper;

    /**
     * ä¸šåŠ¡ç±»åž‹çš„服务
     */
    @Autowired(required = false)
    @Lazy
    private IBtmTypeService btmTypeService;


    /**
     * èŽ·å–生命周期列表
     *
     * @param conditionMap æŸ¥è¯¢æ¡ä»¶
     * @param pageHelper   åˆ†é¡µ
     * @param query   åˆ†é¡µ
     * @return ç”Ÿå‘½å‘¨æœŸçš„显示对象
     */
    @Override
    public IPage<LifeCycleVO> listLife(Map<String, String> conditionMap, PageHelper pageHelper) {
        return null;
    public IPage<LifeCycleVO> listLife(Map<String, Object> conditionMap, Query query) {
        return LifeCycleRuleWrapper.build().pageVO(baseMapper.selectPage(Condition.getPage(query),Condition.getQueryWrapper(conditionMap,LifeCycleRule.class).lambda().orderByAsc(LifeCycleRule::getId)));
    }

    /**
@@ -42,9 +105,160 @@
     * @return æ·»åŠ åŽçš„显示对象
     */
    @Override
    @Transactional
    public LifeCycleVO addSave(LifeCycleDTO lifeCycleDTO) {
        return null;
        VciBaseUtil.alertNotNull(lifeCycleDTO,"生命周期信息",lifeCycleDTO.getId(),"生命周期的编号",lifeCycleDTO.getName(),"生命周期名称",lifeCycleDTO.getNodes(),"生命周期的节点",lifeCycleDTO.getStartStatus(),"起始状态");
        //先查询是否存在
        QueryWrapper wrapper = new QueryWrapper(LifeCycleRule.class);
        wrapper.eq("lower(id)",lifeCycleDTO.getId().toLowerCase(Locale.ROOT));
        if(baseMapper.selectCount(wrapper)>0){
            throw new VciBaseException("生命周期的编号不能重复");
        }
        String lifeOid = addLifeCycle(lifeCycleDTO);
        return LifeCycleRuleWrapper.build().entityVO(baseMapper.selectById(lifeOid));
    }

    /**
     * æ·»åŠ ç”Ÿå‘½å‘¨æœŸ
     * @param lifeCycleDTO
     * @return ä¸»é”®
     */
    private String addLifeCycle(LifeCycleDTO lifeCycleDTO){
        //编号不能有特殊的内容
        if(!lifeCycleDTO.getId().matches(RegExpConstant.LETTER)){
            throw new VciBaseException("生命周期的编号只能是字母");
        }
        LifeCycleRule life = LifeCycleRuleWrapper.build().copyDTO2DO(lifeCycleDTO);
        life.setOid(VciBaseUtil.getPk());
        String creator = AuthUtil.getUserAccount();
        Date now = new Date();
        life.setBtmname(BtmTypeConstant.LIFE_CYCLE);
        life.setOwner(creator);
        life.setCreator(creator);
        life.setCreateTime(now);
        life.setLastModifier(creator);
        life.setLastModifyTime(now);
        life.setTs(now);

        List<String> statusList = new ArrayList<>();
        //处理节点
        if(!CollectionUtils.isEmpty(lifeCycleDTO.getNodes())){
            lifeCycleDTO.getNodes().stream().forEach(nodeDTO->{
                addLifeCycleNode(nodeDTO,life.getOid(),creator,now);
                statusList.add(nodeDTO.getId());
            });
        }
        if(!statusList.contains(life.getStartStatus())){
            throw new VciBaseException("起始状态不在生命周期的画布中");
        }
        //判断所有的节点在系统里都存在
        List<String> existStatusIdList = statusService.listStatusByIdCollection(statusList).stream().map(StatusVO::getId).collect(Collectors.toList());
        String unExistStatus = statusList.stream().filter(s -> !existStatusIdList.contains(s)).collect(Collectors.joining(","));
        if(StringUtils.hasLength(unExistStatus)){
            throw new VciBaseException(unExistStatus + "这些状态在状态池里不存在，不能添加到生命周期中");
        }
        //处理边界和连接线
        if(!CollectionUtils.isEmpty(lifeCycleDTO.getEdges())){
            lifeCycleDTO.getEdges().stream().forEach(edgeDTO->{
                String edgeOid = addLifeCycleEdge(edgeDTO,statusList,life.getOid(),creator,now);
                if(!CollectionUtils.isEmpty(edgeDTO.getEvents())){
                    //有事件
                    edgeDTO.getEvents().stream().forEach(eventDTO->{
                        addLifeCycleLineEvent(eventDTO,edgeOid,creator,now);
                    });
                }
            });
        }
        baseMapper.insert(life);
        return life.getOid();
    }

    /**
     * æ·»åŠ ç”Ÿå‘½å‘¨æœŸçš„连接线上的事件
     * @param eventDTO
     * @param edgeOid
     * @param creator
     * @param now
     */
    private void addLifeCycleLineEvent(LifeCycleLineEventDTO eventDTO,String edgeOid,String creator,Date now){
        VciBaseUtil.alertNotNull(eventDTO.getBizDomain(),"所属领域",eventDTO.getEventFullName(),"事件的全路径");
        NewAppConstantEnum[] values = NewAppConstantEnum.values();
        Boolean fined = false;
        for (int i = 0; i < values.length; i++) {
            NewAppConstantEnum value = values[i];
            if(value.getName().equalsIgnoreCase(eventDTO.getBizDomain())){
                fined = true;
                break;
            }
        }
        if(!fined){
            throw new VciBaseException(eventDTO.getBizDomain() + "这个领域还没有开放,请让开发人员在NewAppConstantEnum类中添加");
        }
        LifeCycleLineEvent event = org.springblade.core.tool.utils.BeanUtil.copy(eventDTO, LifeCycleLineEvent.class);
        event.setOid(VciBaseUtil.getPk());
        event.setPkLifeCycleEdge(edgeOid);
        event.setBtmname(BtmTypeConstant.LIFE_CYCLE_LINE_EVENT);
        event.setOwner(creator);
        event.setCreator(creator);
        event.setCreateTime(now);
        event.setLastModifier(creator);
        event.setLastModifyTime(now);
        event.setTs(now);
        lineEventMapper.insert(event);
    }

    /**
     * æ·»åŠ ç”Ÿå‘½å‘¨æœŸçš„节点
     * @param nodeDTO
     * @param lifeOid
     * @param creator
     * @param now
     */
    private void addLifeCycleNode(LifeCycleNodeDTO nodeDTO,String lifeOid,String creator,Date now){
        VciBaseUtil.alertNotNull(nodeDTO.getId(),"状态标识",nodeDTO.getName(),"状态名称");
        LifeCycleNode node = org.springblade.core.tool.utils.BeanUtil.copy(nodeDTO, LifeCycleNode.class);
        node.setOid(VciBaseUtil.getPk());
        node.setLifeCycleOid(lifeOid);
        node.setBtmname(BtmTypeConstant.LIFE_CYCLE_NODE);
        node.setOwner(creator);
        node.setCreator(creator);
        node.setCreateTime(now);
        node.setLastModifier(creator);
        node.setLastModifyTime(now);
        node.setTs(now);
        nodeMapper.insert(node);
    }

    /**
     * æ·»åŠ ç”Ÿå‘½å‘¨æœŸçš„连接线
     * @param edgeDTO
     * @param statusList
     * @param lifeOid
     * @param creator
     * @param now
     * @return è¿žæŽ¥çº¿çš„主键
     */
    private String addLifeCycleEdge(LifeCycleEdgeDTO edgeDTO,List<String> statusList,String lifeOid,String creator,Date now){
        VciBaseUtil.alertNotNull(edgeDTO.getSource(),"来源状态",edgeDTO.getTarget(),"目标状态",edgeDTO.getName(),"连接线名称");
        if(!statusList.contains(edgeDTO.getSource())
            ||!statusList.contains(edgeDTO.getTarget())){
            throw new VciBaseException("数据错误，[" + edgeDTO.getName() + "]连接线上中使用的状态没有找到");
        }
        LifeCycleEdge edge = org.springblade.core.tool.utils.BeanUtil.copy(edgeDTO, LifeCycleEdge.class);
        edge.setOid(VciBaseUtil.getPk());
        edge.setLifeCycleOid(lifeOid);
        edge.setBtmname(BtmTypeConstant.LIFE_CYCLE_EDGE);
        edge.setOwner(creator);
        edge.setCreator(creator);
        edge.setCreateTime(now);
        edge.setLastModifier(creator);
        edge.setLastModifyTime(now);
        edge.setTs(now);
        edgeMapper.insert(edge);
        return edge.getOid();
    }



    /**
     * æ‰¹é‡æ·»åŠ å†…容
@@ -53,8 +267,40 @@
     * @return æ·»åŠ åŽçš„显示对象
     */
    @Override
    @Transactional
    public List<LifeCycleVO> batchAddSave(List<LifeCycleDTO> lifeCycleDTOs) {
        return null;
        VciBaseUtil.alertNotNull(lifeCycleDTOs,"生命周期的信息");
        //先集体校验一下
        if(lifeCycleDTOs.stream().anyMatch(s->!StringUtils.hasLength(s.getId()) || !StringUtils.hasLength(s.getName())
        || CollectionUtils.isEmpty(s.getNodes()) || !StringUtils.hasLength(s.getStartStatus()))){
            throw new VciBaseException("生命周期的编号，名称，起始状态，包含的节点不能为空");
        }
        //统一校验重复
        Map<String, List<LifeCycleDTO>> dtoMap = lifeCycleDTOs.stream().collect(Collectors.groupingBy(LifeCycleDTO::getId));
        dtoMap.forEach((id,dtos)->{
            if(dtos.size()>1){
                throw new VciBaseException("编号为【" + id + "】的生命周期重复");
            }
        });
        VciBaseUtil.switchCollectionForOracleIn(dtoMap.keySet()).stream().forEach(
            ids->{
                QueryWrapper wrapper = new QueryWrapper(LifeCycleRule.class);
                ids.stream().forEach(id->{
                    wrapper.eq("lower(id)",id.toLowerCase(Locale.ROOT));
                    wrapper.or();
                });
                wrapper.eq("1","2");
                if(baseMapper.selectCount(wrapper)>0){
                    throw new VciBaseException("生命周期的编号不能重复");
                }
            }
        );
        //先循环处理下，因为现在当前用户没有处理为线程共享的，后面修改后，可以用并发流去处理
        List<String> oidList = new ArrayList<>();
        lifeCycleDTOs.stream().forEach(dto->{
            oidList.add(addLifeCycle(dto));
        });
        return LifeCycleRuleWrapper.build().listEntityVO(listByIds(oidList));
    }

    /**
@@ -64,7 +310,18 @@
     */
    @Override
    public void delete(LifeCycleDTO lifeCycleDTO) {
        VciBaseUtil.alertNotNull(lifeCycleDTO,"数据传输对象",lifeCycleDTO.getOid(),"主键");
        LifeCycleRule rule = null;
        try {
            rule = getById(lifeCycleDTO.getOid());
        }catch (Throwable e){
            throw new VciBaseException("使用主键获取对象出错，这个数据可能不存在，或者数据重复了");
        }
        //检查被引用不能删除
        Integer count = btmTypeService.countByLifeId(lifeCycleDTO.getOid());
        if(count !=null && count>0){

        }
    }

    /**

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java

@@ -35,6 +35,8 @@
    public BtmTypeAttributeVO entityVO(BtmTypeAttribute entity) {
        BtmTypeAttributeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, BtmTypeAttributeVO.class));
        // åœ¨è¿™é‡Œè®¾ç½®æžšä¸¾æ˜¾ç¤ºå€¼
        vo.setPrecisionLength(vo.getPrecisionLength() == -1 ? null : vo.getPrecisionLength());
        vo.setScaleLength(vo.getScaleLength() == -1 ? null : vo.getPrecisionLength());
        vo.setAttrDataTypeText(EnumCache.getValue("attributeType",vo.getAttrDataType()));
        return vo;
    }

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LifeCycleRuleWrapper.java

@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.wrapper;

import com.vci.ubcs.omd.dto.LifeCycleDTO;
import com.vci.ubcs.omd.entity.LifeCycleRule;
import com.vci.ubcs.omd.vo.LifeCycleVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
@@ -43,4 +44,8 @@
    }


    public LifeCycleRule copyDTO2DO(LifeCycleDTO lifeCycleDTO) {
        LifeCycleRule LifeCycleRule = BeanUtil.copy(lifeCycleDTO, LifeCycleRule.class);
        return LifeCycleRule;
    }
}