Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

 Source/UBCS-WEB/src/api/template/templateAttr.js

@@ -182,10 +182,10 @@
    }
  })
}
//时间格式下拉菜单
//可输可选下拉菜单
export const  listByFlag = (params) =>{
  return request({
    url:'/api/ubcs-code/bdSelectInputController/listByFlag',
    url:'/api/ubcs-system/dict-biz/listByFlag',
    method: 'get',
    params:{
      ...params

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

@@ -214,14 +214,18 @@
        <avue-crud :data="businessData" :option="businessOption" @selection-change="businessSelect">
          <template slot="menuLeft">
            <div style="display: flex;">
              <el-select>
                <el-option>属性英文名称</el-option>
                <el-option>属性中文名称</el-option>
              <el-select v-model="SelectValue" placeholder="请选择" style="width: 150px !important;">
                <el-option
                  v-for="item in SelectOption"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                  style="width: 150px">
                </el-option>
              </el-select>
              <el-input style="width: 300px;margin-left: 20px"></el-input>
              <el-button size="small" style="margin-left: 10px">查询</el-button>
              <el-input style="width: 400px;margin-left: 20px" v-model="SelectFInd"></el-input>
              <el-button size="small" style="margin-left: 10px" @click="AddFindHandler">查询</el-button>
            </div>

          </template>
        </avue-crud>
        <div style="display: flex;justify-content: flex-end;margin-top: 15px">
@@ -229,6 +233,11 @@
          <el-button size="small" type="primary" @click="addVisible=false">取消</el-button>
        </div>
      </el-dialog>
      <!--      å‚照配置-->
        <refer-config-form-dialog
          ref="referConfigFormDialog"
          @echoReferConfig="echoReferConfig"
        ></refer-config-form-dialog>
    </div>
    <el-table :data="ProData"
              style="width: 100%"
@@ -241,27 +250,32 @@
    >
      <el-table-column
        type="selection"
        width="55">
        width="55" fixed>
      </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"
      <el-table-column v-for="(item,index) in this.option.column" :key="item.id"
                       :label="item.label"
                       :prop="item.prop"
                       :formatter="formAttr"
                       :width="item.width||(item.label.length >=4 ?'160':item.label.length==3 ?'130':'100')"
                       :show-overflow-tooltip="true"
                       :sortable="item.sortable"
                       :fixed="item.fixed"
                       align="center"
                       v-if="item.edit !='referName'"
      >
        <template slot-scope="{ row }">
          <el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' || item.edit == 'select' ||item.edit == 'refer' )" v-model="row[item.prop]"
          <el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text'  ||item.edit == 'refer' )" v-model="row[item.prop]"
                    @blur="saveRows"></el-input>
          <el-input-number size="small" controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
                           @blur="saveRows" :style="{width:(item.width-10)+'px'}"></el-input-number>
          <el-select v-model="row[item.prop]" slot="prepend" v-if="editingRows === row && editShows== item.prop && item.prop == 'codeDateFormat'  && row[item.prop] ==''" @focus="DataChangeHandler">
            <el-option label="餐厅名" value="1"></el-option>
            <el-option label="订单号" value="2"></el-option>
            <el-option label="用户电话" value="3"></el-option>
          <el-select v-model="row[item.prop]" filterable  allow-create  default-first-option slot="prepend" v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " @focus="DataChangeHandler(item.editConfig,index)">
            <el-option
              v-for="optionItem in item.data"
              :key="optionItem.key"
              :label="optionItem.value"
              :value="optionItem.key">
            </el-option>
          </el-select>
          <el-switch
            v-if="item.edit === 'switch'" v-model="row[item.prop]" active-value="true"
@@ -273,7 +287,7 @@
      <el-table-column
        fixed="right"
        label="操作"
        width="120">
        width="70">
        <template slot-scope="scope">
          <el-button
            size="small"
@@ -336,6 +350,23 @@
  },
  data() {
    return {
      //当前单元格
      CurrentCell:'',
      // æ–°å¢ž
      SelectValue:"",
      SelectFInd:"",
      SelectOption:[
        {
          value: 'name',
          label: '属性中文名称'
        },
        {
          value: 'id',
          label: '属性英文名称'
        }
      ],
      //参照
      referVisible:false,
      crudArrayFlag:false,
      editingRows: null,
      editShows:"",
@@ -1118,6 +1149,13 @@
            prop: "prefixValue",
            sortable: true,
            edit: 'select',
            width: 110,
            editConfig: {
              extraParams: {
                code: 'codeclstempattr',
                dictKey: 'prefix'
              }
            },
            cell: false,
          },
          {
@@ -1125,6 +1163,13 @@
            prop: "suffixValue",
            sortable: true,
            edit: 'select',
            width: 110,
            editConfig: {
              extraParams: {
                code: 'codeclstempattr',
                dictKey: 'suffix'
              }
            },
            cell: false,
          },
          {
@@ -1149,13 +1194,25 @@
            sortable: true,
            width: 135,
            edit: 'select',
            editConfig: {
              extraParams: {
                code: 'codeclstempattr',
                dictKey: 'dateFormates'
              }
            },
            cell: false,
          },
          {
            label: "分类注入",
            prop: "classifyInvokeLevelName",
            cell: false,
            edit: 'refer'
          },
          {
            label: "分类注入",
            prop: "classifyInvokeLevel",
            cell: false,
            edit: 'refer'
            edit: 'referName',
          },
          {
            label: "枚举注入",
@@ -1292,14 +1349,35 @@
    formAttr(row, column) {
      console.log(row,column)
    },
    //新增搜索
    AddFindHandler(){
      if(this.SelectValue == 'id'){
        const masterParameter={
          'conditionMap[id]':this.SelectFInd
        }
        this.BuineAttrByBtm(masterParameter);
        this.SelectValue=""
        this.SelectFInd=""
      }else if(this.SelectValue == 'name'){
        const masterParameter={
          'conditionMap[name]':this.SelectFInd
        }
        this.BuineAttrByBtm(masterParameter)
        this.SelectValue=""
        this.SelectFInd=""
      }
    },
    //参照配置子组件
    echoReferConfig(val){
      console.log('val--',val)
      this.$set(this.CurrentCell,'referConfig',JSON.stringify(val))

    },
    //时间下拉格式
    DataChangeHandler(){
      debugger
      listByFlag({comboxKey: 'codedateformat',
        id: 'codedateformat',
        namespace: 'codeclstempattr',
        flag: 'dateFormates'}).then(res=>{
        console.log(res)
    DataChangeHandler(editConfig,index){
      listByFlag(editConfig.extraParams).then(res=>{
        console.log(res);
        this.option.column[index].data=res;
      })
    },
    //属性分组按钮
@@ -1314,7 +1392,7 @@
    },
    //属性分组提交
    attrHandle() {
      this.$set(this.attrRow, 'attributeGroup', this.attrModel)
      this.$set(this.attrRow, 'attributeGroup', JSON.stringify(this.attrModel))
      this.attrModel = ""
      this.attrVisible = false
    },
@@ -1362,11 +1440,11 @@
            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,
            formDisplayFlag: 'true',
            tableDisplayFlag: 'true',
            sortAttrFlag: 'false',
            queryAttrFlag: 'true',
            seniorQueryAttrFlag: 'true',
            attrTableWidth: 120
          })
          this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
@@ -1384,7 +1462,11 @@
      this.addVisible = true;
      this.busineSelectList = []
      this.busineAddList = [];
      AttrByBtm({'conditionMap[oid]': this.crudOid}).then(res => {
      this.BuineAttrByBtm()
    },
    //业务类型数据
    BuineAttrByBtm(masterParameter){
      AttrByBtm({'conditionMap[oid]': this.crudOid,...masterParameter}).then(res => {
        this.businessData = res.data.data;
      })
    },
@@ -1448,8 +1530,18 @@
        this.editShows = column.property;
        this.rowOid = row.oid;
      console.log(row,column)
      if(column.property == 'codeDateFormat' ){

      this.CurrentCell=row;
      if(column.property == 'referConfig' ){
        this.$refs.referConfigFormDialog.isShowReferConfigForm = true;
        this.$refs.referConfigFormDialog.onloadAttrData();
      }else if(column.property == 'classifyInvokeLevelName'){
        this.injectVisible=true;
      }else if(column.property == 'componentRule'){
        this.isShowformulaEdit = true;
      }else if(column.property == 'enumString'){
        this.enumVisible=true;
      }else if(column.property == 'parentCode'){
        this.CascadeVisible=true;
      }
    },
    saveRows() {
@@ -1491,11 +1583,16 @@
      if (this.enumRow.length < 1) {
        this.$message.warning('请至少选择一条数据')
      } else {
        this.$set(this.attrRow, 'enumString', this.enumRow);
        this.enumVisible = false;
        if(this.CurrentCell){
          this.$set(this.CurrentCell, 'enumString', JSON.stringify(this.enumRow));
          this.enumVisible = false;
        }else {
          this.$set(this.attrRow, 'enumString', JSON.stringify(this.enumRow));
          this.enumVisible = false;
        }
      }
    },
    // å°†æ­£åœ¨ç¼–辑的行的状态变为 null ï¼Œå³é€€å‡ºç¼–辑状态
    // å°†æ­£åœ¨ç¼–辑的行的状态变为 null，即退出编辑状态
    saveRow() {
      this.editingRow = null;
    },
@@ -1536,8 +1633,13 @@
        "层级设置": this.injectOption.injectNum,
        "是否可修改": this.injectOption.change
      }
      console.log(this.injectOption)
      this.$set(this.attrRow, 'classifyInvokeLevel', data);
      if(this.CurrentCell){
        this.$set(this.CurrentCell, "classifyInvokeLevelName", data);
        this.$set(this.CurrentCell, "classifyInvokeLevel", JSON.stringify(this.injectOption));
      }else {
        this.$set(this.attrRow, 'classifyInvokeLevelName', data);
        this.$set(this.attrRow, 'classifyInvokeLevel', JSON.stringify(this.injectOption));
      }
      this.injectVisible = false
    },
    //分类注入清空
@@ -1589,7 +1691,7 @@
      } else if (this.attrSelectList.length < 1) {
        this.$message.warning('请选择一条模板属性数据')
      } else if (this.attrSelectList.length === 1) {
        this.isShowformulaEdit = true;
        this.isShowformulaEdit=true
      }
    },
    //全屏编辑
@@ -1607,8 +1709,14 @@
      this.attrFlagChiledren = false;
      this.attrEditVisible = false;
    },
    //组合规则确定
    updataFormlaContent(val) {
      this.$set(this.attrRow, 'componentRule', val)
      if(this.CurrentCell){
        this.$set(this.CurrentCell, 'componentRule', JSON.stringify(val))
      }else {
        this.$set(this.attrRow, 'componentRule', JSON.stringify(val))
      }

    },
    // æŽ’序
    sortChange(val) {
@@ -1628,7 +1736,7 @@
}
</script>

<style scoped lang="scss">
<style scoped lang="scss" >
/deep/ .el-button {
  margin: 0 10px 10px 0;
}

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

@@ -5,29 +5,100 @@
    <avue-form v-model="loneTreeNewForm" :option="options" @submit="submits" v-else-if="flag == 'edit'">
    </avue-form>
    <div>

<!--     å­˜å‚¨ä¸šåŠ¡ç±»åž‹-->
      <el-dialog  :visible.sync="BtmdialogVisible"   title="为【存储业务类型】选取值" append-to-body>
        <avue-crud :data="BtmData" :option="btmOption" @select="btmSelect"></avue-crud>
        <div style="padding-top: 10px;display: flex; justify-content: flex-end" >
          <el-button type="primary" size="small" @click="MasterHandlerClick">确定</el-button>
          <el-button  size="small" @click="MasterdialogVisible=false">取消</el-button>
<!--     ç¼–码规则-->
      <el-dialog  :visible.sync="MasterdialogVisible"   title="为【编码规则】选取值" append-to-body>
        <template>
          <el-select v-model="SelectValue" placeholder="请选择" style="width: 135px">
            <el-option
              v-for="item in SelectOption"
              :key="item.value"
              :label="item.label"
              :value="item.value"
              style="width: 150px">
            </el-option>
          </el-select>
          <el-input style="width: 260px;margin-left: 15px" placeholder="输入值后进行模糊查询" v-model="SelectFInd"></el-input>
          <el-button size="small"  type="primary" plain @click="SelectFindeHandler" style="margin-left: 20px">查询</el-button>
        </template>
        <avue-crud :data="masterData" :option="masterOption" @select="masterSelect"></avue-crud>
        <div style="height: 30px">
          <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >已设置的值为:[{{this.loneTreeNewForm.coderuleoidName}}]</div>
          <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
            <el-button type="primary" size="small" @click="MasterHandlerClick">确定</el-button>
            <el-button  size="small" @click="MasterdialogVisible=false">取消</el-button>
          </div>
        </div>
      </el-dialog>
<!--      å…³é”®å±žæ€§æŸ¥è¯¢è§„则-->
      <el-dialog  :visible.sync="KeydialogVisible"   title="为【关键属性查询规则】选取值" append-to-body>
        <template>
          <el-select v-model="SelectValue" placeholder="请选择" style="width: 135px">
            <el-option
              v-for="item in SelectOption"
              :key="item.value"
              :label="item.label"
              :value="item.value"
              style="width: 150px">
            </el-option>
          </el-select>
          <el-input style="width: 260px;margin-left: 15px" placeholder="输入值后进行模糊查询" v-model="SelectFInd"></el-input>
          <el-button size="small"  type="primary" plain @click="KeySelectFindeHandler" style="margin-left: 20px">查询</el-button>
        </template>
        <avue-crud :data="KeyData" :option="masterOption" @select="KeySelect"></avue-crud>
        <div style="padding-top: 10px;display: flex; justify-content: flex-end" >
          <el-button type="primary" size="small" @click="KeyHandlerClick">确定</el-button>
          <el-button  size="small" @click="KeydialogVisible=false">取消</el-button>
        <div style="height: 30px">
          <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >已设置的值为:[{{this.loneTreeNewForm.codekeyattrrepeatoidName}}]</div>
          <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
            <el-button type="primary" size="small" @click="KeyHandlerClick">确定</el-button>
            <el-button  size="small" @click="KeydialogVisible=false">取消</el-button>
          </div>
        </div>
      </el-dialog>
      <!--      ç›¸ä¼¼é¡¹æŸ¥è¯¢è§„则-->
      <el-dialog  :visible.sync="SimidialogVisible"   title="为【相似项查询规则】选取值" append-to-body>
        <template>
          <el-select v-model="SelectValue" placeholder="请选择" style="width: 135px">
            <el-option
              v-for="item in SelectOption"
              :key="item.value"
              :label="item.label"
              :value="item.value"
              style="width: 150px">
            </el-option>
          </el-select>
          <el-input style="width: 260px;margin-left: 15px" placeholder="输入值后进行模糊查询" v-model="SelectFInd"></el-input>
          <el-button size="small"  type="primary" plain @click="SimSelectFindeHandler" style="margin-left: 20px">查询</el-button>
        </template>
        <avue-crud :data="simData" :option="masterOption" @select="simSelect"></avue-crud>
        <div style="padding-top: 10px;display: flex; justify-content: flex-end" >
          <el-button type="primary" size="small" @click="simHandlerClick">确定</el-button>
          <el-button  size="small" @click="SimidialogVisible=false">取消</el-button>
        <div style="height: 30px">
          <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >已设置的值为:[{{this.loneTreeNewForm.codeResembleRuleOidName}}]</div>
          <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
            <el-button type="primary" size="small" @click="simHandlerClick">确定</el-button>
            <el-button  size="small" @click="SimidialogVisible=false">取消</el-button>
          </div>
        </div>
      </el-dialog>
<!--      å­˜å‚¨çš„业务类型-->
      <el-dialog  :visible.sync="BtmdialogVisible"   title="为【相似项查询规则】选取值" append-to-body>
        <template>
          <el-select v-model="SelectValue" placeholder="请选择" style="width: 135px !important;">
            <el-option
              v-for="item in SelectOption"
              :key="item.value"
              :label="item.label"
              :value="item.value"
              style="width: 130px">
            </el-option>
          </el-select>
          <el-input style="width: 260px;margin-left: 15px" placeholder="输入值后进行模糊查询" v-model="SelectFInd"></el-input>
          <el-button size="small"  type="primary" plain @click="BtmSelectFindeHandler" style="margin-left: 20px">查询</el-button>
        </template>
        <avue-crud :data="BtmData" :option="masterOption" @select="btmSelect"></avue-crud>
        <div style="height: 30px">
          <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >已设置的值为:[{{this.loneTreeNewForm.btmtypename}}]</div>
          <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
            <el-button type="primary" size="small" @click="btmHandlerClick">确定</el-button>
            <el-button  size="small" @click="BtmdialogVisible=false">取消</el-button>
          </div>
        </div>
      </el-dialog>
    </div>
@@ -42,6 +113,7 @@
  props: ['loneTreeNewForm','flag','Editclose'],
  data() {
    return {
      SelectFInd:"",
      masterName:"",
      masterOid:"",
      KeyName:"",
@@ -56,6 +128,17 @@
      KeyData:[],
      simData:[],
      BtmData:[],
      SelectOption:[
        {
          value: 'name',
          label: '中文名称'
        },
        {
          value: 'id',
          label: '英文名称'
        }
      ],
      SelectValue:"",
      btmOption:{
        addBtn:false,
        index:true,
@@ -252,6 +335,24 @@
      this.$message.success('请查看控制台');
      console.log(err)
    },
    //编码规则查询
    SelectFindeHandler(){
      if(this.SelectValue == 'id'){
        const masterParameter={
          'conditionMap[id]':this.SelectFInd
        }
        this.MasterdefaultRend(masterParameter);
        this.SelectValue=""
        this.SelectFInd=""
      }else if(this.SelectValue == 'name'){
        const masterParameter={
          'conditionMap[name]':this.SelectFInd
        }
        this.MasterdefaultRend(masterParameter)
        this.SelectValue=""
        this.SelectFInd=""
      }
    },
    //编码规则失焦
    CodeFoucus(){
      this.MasterdialogVisible=true;
@@ -280,11 +381,12 @@
      console.log('oid',this.oid)
    },
    //编码接口
    MasterdefaultRend(){
    MasterdefaultRend(masterParameter){
      defaultReferDataGrid({
        referType:'coderule',
        isMuti:'false',
        'conditionMap["lcstatus"]':'Released'
        'conditionMap["lcstatus"]':'Released',
        ...masterParameter
      }).then(res=>{
        this.masterData=res.data.records;
      })
@@ -306,6 +408,24 @@
        this.$set(this.loneTreeNewForm,'codeResembleRuleOidName',this.simName)
        this.$set(this.loneTreeNewForm,'codeResembleRuleOid',this.simOid)
        this.$emit('MasterHandler',this.loneTreeNewForm)
      }
    },
    //关键属性查询
    KeySelectFindeHandler(){
      if(this.SelectValue == 'id'){
        const masterParameter={
          'conditionMap[id]':this.SelectFInd
        }
        this.KeydefaultRend(masterParameter);
        this.SelectValue=""
        this.SelectFInd=""
      }else if(this.SelectValue == 'name'){
        const masterParameter={
          'conditionMap[name]':this.SelectFInd
        }
        this.KeydefaultRend(masterParameter)
        this.SelectValue=""
        this.SelectFInd=""
      }
    },
    //关键属性接口
@@ -343,6 +463,24 @@
        this.$emit('MasterHandler',this.loneTreeNewForm)
      }
    },
    //相似项查询
    SimSelectFindeHandler(){
      if(this.SelectValue == 'id'){
        const masterParameter={
          'conditionMap[id]':this.SelectFInd
        }
        this.simdefaultRend(masterParameter);
        this.SelectValue=""
        this.SelectFInd=""
      }else if(this.SelectValue == 'name'){
        const masterParameter={
          'conditionMap[name]':this.SelectFInd
        }
        this.simdefaultRend(masterParameter)
        this.SelectValue=""
        this.SelectFInd=""
      }
    },
  //  ç›¸ä¼¼é¡¹å¤šé€‰
    simSelect(row){
      this.simSelectList=row;
@@ -365,6 +503,38 @@
      this.BtmdialogVisible=true;
      this.btmdefaultRend()
    },
  //  ä¸šåŠ¡ç±»åž‹ç¡®å®š
    btmHandlerClick(){
      if(this.btmSelectList.length>1){
        this.$message.warning('只能选择一条数据')
      }else if(this.btmSelectList.length<=0){
        this.$message.warning('请选择一条数据')
      }else {
        this.SimidialogVisible=false;
        this.simSelectList=[]
        this.$set(this.loneTreeNewForm,'btmtypename',this.btmName)
        this.$set(this.loneTreeNewForm,'btmtypeoid',this.btmOid)
        this.$emit('MasterHandler',this.loneTreeNewForm)
      }
    },
    //业务类型查询
    BtmSelectFindeHandler(){
      if(this.SelectValue == 'id'){
        const masterParameter={
          'conditionMap[id]':this.SelectFInd
        }
        this.btmdefaultRend(masterParameter);
        this.SelectValue=""
        this.SelectFInd=""
      }else if(this.SelectValue == 'name'){
        const masterParameter={
          'conditionMap[name]':this.SelectFInd
        }
        this.btmdefaultRend(masterParameter)
        this.SelectValue=""
        this.SelectFInd=""
      }
    },
  //  ä¸šåŠ¡ç±»åž‹å¤šé€‰
    btmSelect(row){
      this.btmSelectList=row;
@@ -372,9 +542,10 @@
      this.btmOid=row[0].oid;
    },
    //业务类型接口
    btmdefaultRend(){
      referDataGrid({valueField:'id',isMuti:'false'}).then(res=>{
    btmdefaultRend(masterParameter){
      referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
        console.log(res)
        this.BtmData=res.data.data.records
      })
    }
  }

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

@@ -19,25 +19,25 @@
        <!--        æ ‘节点添加对话框-->
        <el-dialog :title="this.TreeFlag ? '添加分类' :'添加主题库'" :visible.sync="TreeAddFormVisible" append-to-body
                   style="width: 1700px;margin: auto">
          <el-form :model="TreeAddform">
            <el-form-item :label="this.TreeFlag ? '分类编号：' :'主题库编号：'" label-width="150px" style="display: inline-block">
          <el-form :model="TreeAddform" :rules="rules">
            <el-form-item :label="this.TreeFlag ? '分类编号：' :'主题库编号：'" label-width="150px" style="display: inline-block" prop="id">
              <el-input v-model="TreeAddform.id" autocomplete="off" style="width: 170px"></el-input>
            </el-form-item>
            <el-form-item :label="this.TreeFlag ? '分类名称：' :'主题库名称：'" label-width="100px" style="display: inline-block">
            <el-form-item :label="this.TreeFlag ? '分类名称：' :'主题库名称：'" label-width="110px" style="display: inline-block" prop="name">
              <el-input v-model="TreeAddform.name" autocomplete="off" style="width: 170px"></el-input>
            </el-form-item>
            <el-form-item label="描述：" label-width="150px">
              <el-input v-model="TreeAddform.description" autocomplete="off" style="width: 585px"></el-input>
            </el-form-item>
            <el-form-item label="编码规则：" label-width="150px">
              <el-input v-model="TreeAddform.coderuleoidName" autocomplete="off" style="width: 585px"></el-input>
              <el-input v-model="TreeAddform.coderuleoidName" autocomplete="off" style="width: 585px" @focus="CodeFoucus"></el-input>
            </el-form-item>
            <el-form-item label="关键属性查询规则：" label-width="150px">
              <el-input v-model="TreeAddform.codekeyattrrepeatoidName" autocomplete="off"
              <el-input v-model="TreeAddform.codekeyattrrepeatoidName" autocomplete="off" @focus="Keyfouce"
                        style="width: 585px"></el-input>
            </el-form-item>
            <el-form-item label="相似查询规则：" label-width="150px">
              <el-input v-model="TreeAddform.codeResembleRuleOidName" autocomplete="off"
              <el-input v-model="TreeAddform.codeResembleRuleOidName" autocomplete="off" @focus="simFouce"
                        style="width: 585px"></el-input>
            </el-form-item>
          </el-form>
@@ -165,6 +165,78 @@
          </basic-container>
          <templatePro :ProData="this.ProData" :crudOid="this.crudOid" :crudArray="this.crudArray" :Formlist="this.Formlist" :codeClassifyOid="this.codeClassifyOid"></templatePro>
        </span>
        <!--     ç¼–码规则-->
        <el-dialog  :visible.sync="MasterdialogVisible"   title="为【编码规则】选取值" append-to-body>
          <template>
            <el-select v-model="SelectValue" placeholder="请选择" style="width: 135px">
              <el-option
                v-for="item in SelectOption"
                :key="item.value"
                :label="item.label"
                :value="item.value"
                style="width: 150px">
              </el-option>
            </el-select>
            <el-input style="width: 260px;margin-left: 15px" placeholder="输入值后进行模糊查询" v-model="SelectFInd"></el-input>
            <el-button size="small"  type="primary" plain @click="SelectFindeHandler" style="margin-left: 20px">查询</el-button>
          </template>
          <avue-crud :data="masterData" :option="masterOption" @select="masterSelect"></avue-crud>
          <div style="height: 30px">
            <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >已设置的值为:[{{this.TreeAddform.coderuleoidName ==''?'未设置值':this.TreeAddform.coderuleoidName}}]</div>
            <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
              <el-button type="primary" size="small" @click="MasterHandlerClick">确定</el-button>
              <el-button  size="small" @click="MasterdialogVisible=false">取消</el-button>
            </div>
          </div>
        </el-dialog>
        <!--      å…³é”®å±žæ€§æŸ¥è¯¢è§„则-->
        <el-dialog  :visible.sync="KeydialogVisible"   title="为【关键属性查询规则】选取值" append-to-body>
          <template>
            <el-select v-model="SelectValue" placeholder="请选择" style="width: 135px">
              <el-option
                v-for="item in SelectOption"
                :key="item.value"
                :label="item.label"
                :value="item.value"
                style="width: 150px">
              </el-option>
            </el-select>
            <el-input style="width: 260px;margin-left: 15px" placeholder="输入值后进行模糊查询" v-model="SelectFInd"></el-input>
            <el-button size="small"  type="primary" plain @click="KeySelectFindeHandler" style="margin-left: 20px">查询</el-button>
          </template>
          <avue-crud :data="KeyData" :option="masterOption" @select="KeySelect"></avue-crud>
          <div style="height: 30px">
            <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >已设置的值为:[{{this.TreeAddform.codekeyattrrepeatoidName ==''?'未设置值':this.TreeAddform.codekeyattrrepeatoidName}}]</div>
            <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
              <el-button type="primary" size="small" @click="KeyHandlerClick">确定</el-button>
              <el-button  size="small" @click="KeydialogVisible=false">取消</el-button>
            </div>
          </div>
        </el-dialog>
        <!--      ç›¸ä¼¼é¡¹æŸ¥è¯¢è§„则-->
        <el-dialog  :visible.sync="SimidialogVisible"   title="为【相似项查询规则】选取值" append-to-body>
          <template>
            <el-select v-model="SelectValue" placeholder="请选择" style="width: 135px">
              <el-option
                v-for="item in SelectOption"
                :key="item.value"
                :label="item.label"
                :value="item.value"
                style="width: 150px">
              </el-option>
            </el-select>
            <el-input style="width: 260px;margin-left: 15px" placeholder="输入值后进行模糊查询" v-model="SelectFInd"></el-input>
            <el-button size="small"  type="primary" plain @click="SimSelectFindeHandler" style="margin-left: 20px">查询</el-button>
          </template>
          <avue-crud :data="simData" :option="masterOption" @select="simSelect"></avue-crud>
          <div style="height: 30px">
            <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >已设置的值为:[{{this.TreeAddform.codeResembleRuleOidName ==''?'未设置值':this.TreeAddform.codeResembleRuleOidName}}]</div>
            <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
              <el-button type="primary" size="small" @click="simHandlerClick">确定</el-button>
              <el-button  size="small" @click="SimidialogVisible=false">取消</el-button>
            </div>
          </div>
        </el-dialog>
      </basic-container>
    </el-main>
  </el-container>
@@ -187,7 +259,7 @@
  editSave,
  copy
} from "@/api/template/templateAttr";

import {defaultReferDataGrid,referDataGrid} from '@/api/MasterData/master'
export default {
  name: "classifyTrees.vue",
  //使用inject接收参数
@@ -196,6 +268,66 @@
  inject: [, "crudTreeData"],
  data() {
    return {
      //编码规则
      MasterdialogVisible:false,
      masterData:[],
      masterSelectList:[],
      masterName:"",
      masterOid:"",
      //关键属性
      KeydialogVisible:false,
      KeyName:"",
      KeyOid:"",
      KeyData:[],
      KeySelectLIst:[],
      //相似项
      simName:"",
      simOid:"",
      simData:[],
      SimidialogVisible:false,
      simSelectList:[],
      masterOption:{
        addBtn:false,
        index:true,
        border:true,
        selection:true,
        menu:false,
        height:380,
        column:[
          {
            label:'英文名称',
            prop:'id'
          },
          {
            label:'中文名称',
            prop:'name'
          },
          {
            label:'描述',
            prop:'description'
          }
        ]
      },
      SelectOption:[
        {
          value: 'name',
          label: '中文名称'
        },
        {
          value: 'id',
          label: '英文名称'
        }
      ],
      SelectValue:"",
      SelectFInd:"",
      rules: {
        id: [
          { required: true, message: '请输入名称', trigger: 'blur' },
        ],
        name:[
          { required: true, message: '请输入编号', trigger: 'blur' },
        ]
      },
      addFlag:false,
      // è¡¨æ ¼å½“前行id
      crudOid:"",
@@ -434,8 +566,170 @@
    }
  },
  methods: {
    //编码规则失焦
    CodeFoucus(){
      this.MasterdialogVisible=true;
      this.MasterdefaultRend()
    },
    //编码多选
    masterSelect(row){
    if(row.length>0){
      this.masterSelectList=row;
      this.masterName=row[0].name;
      this.masterOid=row[0].oid;
    }
    },
    //编码规则查询
    SelectFindeHandler(){
      if(this.SelectValue == 'id'){
        const masterParameter={
          'conditionMap[id]':this.SelectFInd
        }
        this.MasterdefaultRend(masterParameter);
        this.SelectValue=""
        this.SelectFInd=""
      }else if(this.SelectValue == 'name'){
        const masterParameter={
          'conditionMap[name]':this.SelectFInd
        }
        this.MasterdefaultRend(masterParameter)
        this.SelectValue=""
        this.SelectFInd=""
      }
    },
    //编码规则确定
    MasterHandlerClick(){
      if(this.masterSelectList.length>1){
        this.$message.warning('只能选择一条数据')
      }else if(this.masterSelectList.length<=0){
        this.$message.warning('请选择一条数据')
      }else {
        this.MasterdialogVisible=false;
        this.masterSelectList=[]
        this.$set(this.TreeAddform,'coderuleoidName',this.masterName)
        this.$set(this.TreeAddform,'coderuleOid',this.masterOid)
        this.$emit('MasterHandler',this.loneTreeNewForm)
        console.log(this.loneTreeNewForm)
      }
    },
    //编码接口
    MasterdefaultRend(){
      defaultReferDataGrid({
        referType:'coderule',
        isMuti:'false',
        'conditionMap["lcstatus"]':'Released'
      }).then(res=>{
        this.masterData=res.data.records;
      })
    },
    Keyfouce(){
      this.KeydialogVisible=true;
      this.KeydefaultRend()
    },
    //关键属性确定
    KeyHandlerClick(){
      if(this.KeySelectLIst.length>1){
        this.$message.warning('只能选择一条数据')
      }else if(this.KeySelectLIst.length<=0){
        this.$message.warning('请选择一条数据')
      }else {
        this.KeydialogVisible=false;
        this.KeySelectLIst=[]
        this.$set(this.TreeAddform,'codeResembleRuleOidName',this.simName)
        this.$set(this.TreeAddform,'codeResembleRuleOid',this.simOid)
        this.$emit('MasterHandler',this.loneTreeNewForm)
      }
    },
    //关键属性查询
    KeySelectFindeHandler(){
      if(this.SelectValue == 'id'){
        const masterParameter={
          'conditionMap[id]':this.SelectFInd
        }
        this.KeydefaultRend(masterParameter);
        this.SelectValue=""
        this.SelectFInd=""
      }else if(this.SelectValue == 'name'){
        const masterParameter={
          'conditionMap[name]':this.SelectFInd
        }
        this.KeydefaultRend(masterParameter)
        this.SelectValue=""
        this.SelectFInd=""
      }
    },
    //关键属性接口
    KeydefaultRend(){
      defaultReferDataGrid({
        referType:'codekeyattrrepeat',
        isMuti:'false',
        'conditionMap["lcstatus"]':'Enabled'
      }).then(res=>{
        this.KeyData=res.data.records;
      })
    },
    // å…³é”®å¤šé€‰
    KeySelect(row){
      this.KeySelectLIst=row;
      this.KeyName=row[0].name;
      this.KeyOid=row[0].oid;
    },
    //关键失焦
    simFouce(){
      this.SimidialogVisible=true;
      this.simdefaultRend()
    },
    //相似项确定
    simHandlerClick(){
      if(this.simSelectList.length>1){
        this.$message.warning('只能选择一条数据')
      }else if(this.simSelectList.length<=0){
        this.$message.warning('请选择一条数据')
      }else {
        this.SimidialogVisible=false;
        this.simSelectList=[]
        this.$set(this.TreeAddform,'codeResembleRuleOidName',this.simName)
        this.$set(this.TreeAddform,'codeResembleRuleOid',this.simOid)
        this.$emit('MasterHandler',this.loneTreeNewForm)
      }
    },
    //相似项查询
    SimSelectFindeHandler(){
      if(this.SelectValue == 'id'){
        const masterParameter={
          'conditionMap[id]':this.SelectFInd
        }
        this.simdefaultRend(masterParameter);
        this.SelectValue=""
        this.SelectFInd=""
      }else if(this.SelectValue == 'name'){
        const masterParameter={
          'conditionMap[name]':this.SelectFInd
        }
        this.simdefaultRend(masterParameter)
        this.SelectValue=""
        this.SelectFInd=""
      }
    },
    //  ç›¸ä¼¼é¡¹å¤šé€‰
    simSelect(row){
      this.simSelectList=row;
      this.simName=row[0].name;
      this.simOid=row[0].oid;
      console.log('oid',this.oid)
    },
    //相似项项接口
    simdefaultRend(){
      defaultReferDataGrid({
        referType:'coderesemblerule',
        isMuti:'false',
        'conditionMap["lcstatus"]':'Enabled'
      }).then(res=>{
        this.simData=res.data.records;
      })
    },
    //子传父
    MasterHandler(val){
      console.log('父亲',val)
      this.TreeList=val
    },
    //行单选事件
@@ -488,6 +782,7 @@
    TreeAddHandler() {
      const data = this.TreeAddform
      this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid)
      console.log('data',data)
      TreeSave(data).then(() => {
        this.$message({
          type: 'success',

 Source/UBCS-WEB/src/page/index/index.vue

@@ -18,9 +18,10 @@
        <!-- ä¸»ä½“视图层 -->
        <div style="height:100%;overflow-y:auto;overflow-x:hidden;" id="avue-view" v-show="!isSearch">
          <keep-alive>
            <router-view class="avue-view" v-if="$route.meta.keepAlive"/>
            <!--<router-view class="avue-view" v-if="$route.meta.keepAlive"/>-->
            <router-view class="avue-view"/>
          </keep-alive>
          <router-view class="avue-view" v-if="!$route.meta.keepAlive"/>
          <!--<router-view class="avue-view" v-if="!$route.meta.keepAlive"/>-->
        </div>
      </div>
    </div>

 Source/UBCS-WEB/src/views/modeling/cycle.vue

@@ -75,82 +75,82 @@
        addBtn: false,
        column: [
          {
            label: "编号",
            prop: "id",
          },
          {
            label: "名称",
            prop: "name",
          },
          {
            label: "标签",
            prop: "label",
          },
          {
            label: "起始状态",
            prop: "startState",
            prop: "startStatusName",
          },
          {
            label: "描述",
            prop: "remark",
            prop: "description",
          },
        ],
      },
      data: [
        {
          name: "我是name",
          label: "我是label",
          startState: "我是startState",
          remark: "我是remark",
          data: {
            nodes: [
              {
                type: "node",
                size: "80*48",
                shape: "flow-rect",
                color: "#1890FF",
                label: "Auditing",
                x: 110.50303650877106,
                y: 59.22389408123915,
                id: "Auditing",
                index: 0,
              },
              {
                type: "node",
                size: "80*48",
                shape: "flow-rect",
                color: "#1890FF",
                label: "Editing",
                x: 120.87992069414531,
                y: 156.76660542375714,
                id: "Editing",
                index: 1,
              },
              {
                type: "node",
                size: "80*48",
                shape: "flow-rect",
                color: "#1890FF",
                label: "Released",
                x: 100.12615232339681,
                y: 252.2339399292003,
                id: "Released",
                index: 2,
              },
            ],
            edges: [
              {
                source: "Auditing",
                sourceAnchor: 1,
                target: "Released",
                targetAnchor: 1,
              },
              {
                source: "Editing",
                sourceAnchor: 3,
                target: "Auditing",
                targetAnchor: 3,
              },
            ],
          },
        },
      ],
      // data: [
      //   {
      //     name: "我是name",
      //     label: "我是label",
      //     startState: "我是startState",
      //     remark: "我是remark",
      //     data: {
      //       nodes: [
      //         {
      //           type: "node",
      //           size: "80*48",
      //           shape: "flow-rect",
      //           color: "#1890FF",
      //           label: "Auditing",
      //           x: 110.50303650877106,
      //           y: 59.22389408123915,
      //           id: "Auditing",
      //           index: 0,
      //         },
      //         {
      //           type: "node",
      //           size: "80*48",
      //           shape: "flow-rect",
      //           color: "#1890FF",
      //           label: "Editing",
      //           x: 120.87992069414531,
      //           y: 156.76660542375714,
      //           id: "Editing",
      //           index: 1,
      //         },
      //         {
      //           type: "node",
      //           size: "80*48",
      //           shape: "flow-rect",
      //           color: "#1890FF",
      //           label: "Released",
      //           x: 100.12615232339681,
      //           y: 252.2339399292003,
      //           id: "Released",
      //           index: 2,
      //         },
      //       ],
      //       edges: [
      //         {
      //           source: "Auditing",
      //           sourceAnchor: 1,
      //           target: "Released",
      //           targetAnchor: 1,
      //         },
      //         {
      //           source: "Editing",
      //           sourceAnchor: 3,
      //           target: "Auditing",
      //           targetAnchor: 3,
      //         },
      //       ],
      //     },
      //   },
      // ],
      title: "预览生命周期流程图",
      visible: false,
      flowChartNodeItems: [],

 Source/UBCS-WEB/vue.config.js

@@ -26,10 +26,10 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        target: 'http://localhost:37000',
        // target: 'http://localhost:37000',
        // target: 'http://192.168.1.51:37000',
        // target: 'http://192.168.1.46:37000',
        // target: 'http://dev.vci-tech.com:37000',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.51:37000/',
        // target: 'http://192.168.1.104:37000',
        // target: 'http://192.168.1.63:37000',

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionVO.java

@@ -12,9 +12,13 @@
     */
    @XStreamAsAttribute
    private String id;

    /***
     * ä¸»é”®
     * è§„则码段编号
     */
    @XStreamAsAttribute
    private String sectionCode;
    /***
     * åºå·
     */
    @XStreamAsAttribute
    private String num;
@@ -35,6 +39,11 @@
     */
    @XStreamAsAttribute
    private String secType;
    /***
     * ç æ®µç±»åž‹æ˜¾ç¤ºå€¼
     */
    @XStreamAsAttribute
    private String secTypeText;

    /**
     * æ‰€å±žç¼–码规则
@@ -162,17 +171,37 @@
        this.sectionValue = sectionValue;
    }

    public String getSectionCode() {
        return sectionCode;
    }

    public void setSectionCode(String sectionCode) {
        this.sectionCode = sectionCode;
    }

    public String getSecTypeText() {
        return secTypeText;
    }

    public void setSecTypeText(String secTypeText) {
        this.secTypeText = secTypeText;
    }

    @Override
    public String toString() {
        return "CodeSectionVO{" +
            "id='" + id + '\'' +
            ", sectionCode='" + sectionCode + '\'' +
            ", num='" + num + '\'' +
            ", name='" + name + '\'' +
            ", description='" + description + '\'' +
            ", secType='" + secType + '\'' +
            ", secTypeText='" + secTypeText + '\'' +
            ", pkCodeRule='" + pkCodeRule + '\'' +
            ", codeSecLengthType='" + codeSecLengthType + '\'' +
            ", codeSecLength='" + codeSecLength + '\'' +
            ", parentClassifySecOid='" + parentClassifySecOid + '\'' +
            ", sectionValue=" + sectionValue +
            ", codeDateFormatStr='" + codeDateFormatStr + '\'' +
            '}';
    }

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionValueVO.java

@@ -8,11 +8,13 @@
    public CodeSectionValueVO() {
    }

    public CodeSectionValueVO(String id, String num, String value,String name ,String description) {
    public CodeSectionValueVO(String id, String num, String value,String name ,String pid,String description) {
        this.id = id;
        this.num = num;
        this.value = value;
        this.description = description;
        this.name=name;
        this.pid=pid;
    }

    /***
@@ -21,11 +23,13 @@
    @XStreamAsAttribute
    private String id;
    /***
     * ç å€¼ç¼–号
     * ç å€¼åºå·
     */
    @XStreamAsAttribute
    private String num;

    /***
     * ç å€¼æ˜¾ç¤ºå€¼
     */
    @XStreamAsAttribute
    private String name;

@@ -34,7 +38,11 @@
     */
    @XStreamAsAttribute
    private String value;

    /***
     * çˆ¶ç æ®µoid
     */
    @XStreamAsAttribute
    private String pid;
    /**
     * æè¿°
     */
@@ -81,6 +89,14 @@
        this.name = name;
    }

    public String getPid() {
        return pid;
    }

    public void setPid(String pid) {
        this.pid = pid;
    }

    @Override
    public String toString() {
        return "CodeSectionValueVO{" +
@@ -88,6 +104,7 @@
            ", num='" + num + '\'' +
            ", name='" + name + '\'' +
            ", value='" + value + '\'' +
            ", pid='" + pid + '\'' +
            ", description='" + description + '\'' +
            '}';
    }

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultCodeRuleVO.java

@@ -14,7 +14,11 @@
     */
    @XStreamAsAttribute
    private String id;

    /***
     * è§„则编码
     */
    @XStreamAsAttribute
    private String ruleCode;
    /**
     * è§„则编号
     */
@@ -77,10 +81,19 @@
        this.codeSection = codeSection;
    }

    public String getRuleCode() {
        return ruleCode;
    }

    public void setRuleCode(String ruleCode) {
        this.ruleCode = ruleCode;
    }

    @Override
    public String toString() {
        return "CodeRuleVO{" +
        return "ResultCodeRuleVO{" +
            "id='" + id + '\'' +
            ", ruleCode='" + ruleCode + '\'' +
            ", num='" + num + '\'' +
            ", name='" + name + '\'' +
            ", description='" + description + '\'' +

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/data.json

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
{
  "data":{
    "systemId": "MPM",
    "user": {
      "userName": "weidy",
      "trueName": "魏大勇",
      "ip": "127.0.0.1"
    },
    "library": {
      "id": "wupin",
      "classifyid":[
        "020201",
        "020202"
      ]
    }
  }
}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/data.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,111 @@

<?xml version="1.0" encoding="UTF-8"?>
<data systemId="MPM">
    <user userName="weidy" trueName="" ip="127.0.0.1"/>
    <library id="wupin">
      <classifyid>020201</classifyid>
      <classifyid>020202</classifyid>
    </library>
</data>

<?xml version="1.0" encoding="UTF-8" ?>
<data>
    <errorid>0</errorid>
    <msg>成功!</msg>
    <library id="wupin" name="">
        <classify id="B6C55202-A224-9098-6A82-E3FC5DEEF790" name="口盖" pid="0C600A6A-6398-FC30-D13E-121201FDA908" classCode="020202" description="口盖" fullPathName="" lcStatus="Enabled" isLeaf="false">
            <codeRule id="1673234841140858880" ruleCode="csfjl" num="" name="csfjl" description="">
                <codeSection id="1673235191453323264" sectionCode="gdmd" num="1" name="固定码段" description="aaaa" secType="codefixedsec" secTypeText="固定码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue>
                        <sectionValue id="1673235273523269632" num="2" name="" value="002" pid="" description=""/>
                        <sectionValue id="1673235247598276608" num="1" name="" value="001" pid="" description=""/>
                    </sectionValue>
                </codeSection>
                <codeSection id="1673235394948370432" sectionCode="flmdf" num="2" name="分类码段父" description="" secType="codeclassifysec" secTypeText="分类码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue>
                        <sectionValue id="1673235471532167168" num="1" name="二" value="001" pid="" description=""/>
                        <sectionValue id="1673235449524654080" num="1" name="一" value="001" pid="" description=""/>
                    </sectionValue>
                </codeSection>
                <codeSection id="1673235616541839360" sectionCode="flmdz" num="3" name="分类码段子" description="sss" secType="codeclassifysec" secTypeText="分类码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="1673235394948370432" codeDateFormatStr="">
                    <sectionValue>
                        <sectionValue id="1673235791276544000" num="1" name="小二" value="0012" pid="1673235471532167168" description=""/>
                        <sectionValue id="1673235759584382976" num="1" name="小一" value="0011" pid="1673235449524654080" description=""/>
                    </sectionValue>
                </codeSection>
                <codeSection id="1673235886290112512" sectionCode="kbmd" num="4" name="可变码段" description="sss" secType="codevariablesec" secTypeText="可变码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue/>
                </codeSection>
                <codeSection id="1676048203809689600" sectionCode="yy" num="5" name="引用码段" description="引用码段" secType="coderefersec" secTypeText="引用码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue/>
                </codeSection>
                <codeSection id="1676052431290634240" sectionCode="ge" num="6" name="属性码段" description="fes" secType="codeattrsec" secTypeText="属性码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue/>
                </codeSection>
                <codeSection id="1676837573571514368" sectionCode="cengji" num="7" name="层级码段" description="层级码段" secType="codelevelsec" secTypeText="层级码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue>
                        <sectionValue id="0C600A6A-6398-FC30-D13E-121201FDA908" num="" name="机体构件" value="0202" pid="" description="机体构件"/>
                    </sectionValue>
                </codeSection>
                <codeSection id="1676837771429416960" sectionCode="cengj" num="8" name="层级码段2" description="层级码段2" secType="codelevelsec" secTypeText="层级码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue>
                        <sectionValue id="B6C55202-A224-9098-6A82-E3FC5DEEF790" num="" name="口盖" value="020202" pid="" description="口盖"/>
                    </sectionValue>
                </codeSection>
                <codeSection id="1676838137894146048" sectionCode="shux" num="9" name="属性码段" description="" secType="codeattrsec" secTypeText="属性码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue/>
                </codeSection>
                <codeSection id="1676838388730302464" sectionCode="riqi" num="10" name="日期码段" description="日期码段" secType="codedatesec" secTypeText="日期码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="YYYY-MM-DD">
                    <sectionValue/>
                </codeSection>
            </codeRule>
        </classify>
        <classify id="46B5DB5E-F783-DFE9-B48A-C4A367D02AC0" name="锁" pid="0C600A6A-6398-FC30-D13E-121201FDA908" classCode="020201" description="锁" fullPathName="" lcStatus="Enabled" isLeaf="false">
            <codeRule id="1673234841140858880" ruleCode="csfjl" num="" name="csfjl" description="">
                <codeSection id="1673235191453323264" sectionCode="gdmd" num="1" name="固定码段" description="aaaa" secType="codefixedsec" secTypeText="固定码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue>
                        <sectionValue id="1673235273523269632" num="2" name="" value="002" pid="" description=""/>
                        <sectionValue id="1673235247598276608" num="1" name="" value="001" pid="" description=""/>
                    </sectionValue>
                </codeSection>
                <codeSection id="1673235394948370432" sectionCode="flmdf" num="2" name="分类码段父" description="" secType="codeclassifysec" secTypeText="分类码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue>
                        <sectionValue id="1673235471532167168" num="1" name="二" value="001" pid="" description=""/>
                        <sectionValue id="1673235449524654080" num="1" name="一" value="001" pid="" description=""/>
                    </sectionValue>
                </codeSection>
                <codeSection id="1673235616541839360" sectionCode="flmdz" num="3" name="分类码段子" description="sss" secType="codeclassifysec" secTypeText="分类码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="1673235394948370432" codeDateFormatStr="">
                    <sectionValue>
                        <sectionValue id="1673235791276544000" num="1" name="小二" value="0012" pid="1673235471532167168" description=""/>
                        <sectionValue id="1673235759584382976" num="1" name="小一" value="0011" pid="1673235449524654080" description=""/>
                    </sectionValue>
                </codeSection>
                <codeSection id="1673235886290112512" sectionCode="kbmd" num="4" name="可变码段" description="sss" secType="codevariablesec" secTypeText="可变码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="10" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue/>
                </codeSection>
                <codeSection id="1676048203809689600" sectionCode="yy" num="5" name="引用码段" description="引用码段" secType="coderefersec" secTypeText="引用码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue/>
                </codeSection>
                <codeSection id="1676052431290634240" sectionCode="ge" num="6" name="属性码段" description="fes" secType="codeattrsec" secTypeText="属性码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue/>
                </codeSection>
                <codeSection id="1676837573571514368" sectionCode="cengji" num="7" name="层级码段" description="层级码段" secType="codelevelsec" secTypeText="层级码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue>
                        <sectionValue id="0C600A6A-6398-FC30-D13E-121201FDA908" num="" name="机体构件" value="0202" pid="" description="机体构件"/>
                    </sectionValue>
                </codeSection>
                <codeSection id="1676837771429416960" sectionCode="cengj" num="8" name="层级码段2" description="层级码段2" secType="codelevelsec" secTypeText="层级码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue>
                        <sectionValue id="46B5DB5E-F783-DFE9-B48A-C4A367D02AC0" num="" name="锁" value="020201" pid="" description="锁"/>
                    </sectionValue>
                </codeSection>
                <codeSection id="1676838137894146048" sectionCode="shux" num="9" name="属性码段" description="" secType="codeattrsec" secTypeText="属性码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="">
                    <sectionValue/>
                </codeSection>
                <codeSection id="1676838388730302464" sectionCode="riqi" num="10" name="日期码段" description="日期码段" secType="codedatesec" secTypeText="日期码段" pkCodeRule="1673234841140858880" codeSecLengthType="code_sec_length_variable" codeSecLength="" parentClassifySecOid="" codeDateFormatStr="YYYY-MM-DD">
                    <sectionValue/>
                </codeSection>
            </codeRule>
        </classify>
    </library>
</data>

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/result.json

@@ -1,5 +1,5 @@
{
  "resultData": {
  "data": {
    "msg": "成功!",
    "library": {
      "classify": [
@@ -10,38 +10,235 @@
          "description": "口盖",
          "pid": "0C600A6A-6398-FC30-D13E-121201FDA908",
          "codeRule": {
            "num": "001-copy",
            "description": "物品编码规则",
            "ruleCode": "csfjl",
            "num": "",
            "name": "csfjl",
            "description": "",
            "codeSection": [
              {
                "num": "1",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "aaaa",
                "sectionCode": "gdmd",
                "secType": "codefixedsec",
                "codeSecLength": "10",
                "parentClassifySecOid": "",
                "secTypeText": "固定码段",
                "sectionValue": [
                  {
                    "num": "0",
                    "num": "2",
                    "name": "",
                    "description": "",
                    "pid": "",
                    "id": "1673235273523269632",
                    "value": "002"
                  },
                  {
                    "num": "1",
                    "name": "",
                    "description": "",
                    "pid": "",
                    "id": "1673235247598276608",
                    "value": "001"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "固定码段",
                "id": "1673235191453323264",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "2",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "",
                "sectionCode": "flmdf",
                "secType": "codeclassifysec",
                "codeSecLength": "10",
                "parentClassifySecOid": "",
                "secTypeText": "分类码段",
                "sectionValue": [
                  {
                    "num": "1",
                    "name": "二",
                    "description": "",
                    "pid": "",
                    "id": "1673235471532167168",
                    "value": "001"
                  },
                  {
                    "num": "1",
                    "name": "一",
                    "description": "",
                    "pid": "",
                    "id": "1673235449524654080",
                    "value": "001"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "分类码段父",
                "id": "1673235394948370432",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "3",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "sss",
                "sectionCode": "flmdz",
                "secType": "codeclassifysec",
                "codeSecLength": "10",
                "parentClassifySecOid": "1673235394948370432",
                "secTypeText": "分类码段",
                "sectionValue": [
                  {
                    "num": "1",
                    "name": "小二",
                    "description": "",
                    "pid": "1673235471532167168",
                    "id": "1673235791276544000",
                    "value": "0012"
                  },
                  {
                    "num": "1",
                    "name": "小一",
                    "description": "",
                    "pid": "1673235449524654080",
                    "id": "1673235759584382976",
                    "value": "0011"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "分类码段子",
                "id": "1673235616541839360",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "4",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "sss",
                "sectionCode": "kbmd",
                "secType": "codevariablesec",
                "codeSecLength": "10",
                "parentClassifySecOid": "",
                "secTypeText": "可变码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "可变码段",
                "id": "1673235886290112512",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "5",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "引用码段",
                "sectionCode": "yy",
                "secType": "coderefersec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "引用码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "引用码段",
                "id": "1676048203809689600",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "6",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "fes",
                "sectionCode": "ge",
                "secType": "codeattrsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "属性码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "属性码段",
                "id": "1676052431290634240",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "7",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "层级码段",
                "sectionCode": "cengji",
                "secType": "codelevelsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "层级码段",
                "sectionValue": [
                  {
                    "num": "",
                    "name": "机体构件",
                    "description": "机体构件",
                    "pid": "",
                    "id": "0C600A6A-6398-FC30-D13E-121201FDA908",
                    "value": "0202"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "层级码段",
                "id": "1676837573571514368",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "8",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "层级码段2",
                "sectionCode": "cengj",
                "secType": "codelevelsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "层级码段",
                "sectionValue": [
                  {
                    "num": "",
                    "name": "口盖",
                    "description": "口盖",
                    "pid": "",
                    "id": "B6C55202-A224-9098-6A82-E3FC5DEEF790",
                    "value": "020202"
                  }
                ],
                "num": "01",
                "codeSecLengthType": "code_sec_length_variable",
                "name": "层级码段",
                "secType": "codelevelsec",
                "id": "1674682431208296448",
                "pkCodeRule": "9FE2AF3E-2940-BD80-D46F-E3853314673D"
                "codeDateFormatStr": "",
                "name": "层级码段2",
                "id": "1676837771429416960",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "9",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "",
                "sectionCode": "shux",
                "secType": "codeattrsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "属性码段",
                "sectionValue": [],
                "num": "02",
                "name": "流水码段",
                "description": "流水码段",
                "secType": "codeserialsec",
                "id": "801B6412-E617-214A-08A5-9EDF5821AA66",
                "pkCodeRule": "9FE2AF3E-2940-BD80-D46F-E3853314673D",
                "codeSecLength": "4"
                "codeDateFormatStr": "",
                "name": "属性码段",
                "id": "1676838137894146048",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "10",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "日期码段",
                "sectionCode": "riqi",
                "secType": "codedatesec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "日期码段",
                "sectionValue": [],
                "codeDateFormatStr": "YYYY-MM-DD",
                "name": "日期码段",
                "id": "1676838388730302464",
                "pkCodeRule": "1673234841140858880"
              }
            ],
            "id": "9FE2AF3E-2940-BD80-D46F-E3853314673D"
            "id": "1673234841140858880"
          },
          "id": "B6C55202-A224-9098-6A82-E3FC5DEEF790",
          "fullPathName": "",
          "leaf": false
        },
        {
@@ -51,38 +248,235 @@
          "description": "锁",
          "pid": "0C600A6A-6398-FC30-D13E-121201FDA908",
          "codeRule": {
            "num": "001-copy",
            "description": "物品编码规则",
            "ruleCode": "csfjl",
            "num": "",
            "name": "csfjl",
            "description": "",
            "codeSection": [
              {
                "num": "1",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "aaaa",
                "sectionCode": "gdmd",
                "secType": "codefixedsec",
                "codeSecLength": "10",
                "parentClassifySecOid": "",
                "secTypeText": "固定码段",
                "sectionValue": [
                  {
                    "num": "0",
                    "num": "2",
                    "name": "",
                    "description": "",
                    "pid": "",
                    "id": "1673235273523269632",
                    "value": "002"
                  },
                  {
                    "num": "1",
                    "name": "",
                    "description": "",
                    "pid": "",
                    "id": "1673235247598276608",
                    "value": "001"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "固定码段",
                "id": "1673235191453323264",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "2",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "",
                "sectionCode": "flmdf",
                "secType": "codeclassifysec",
                "codeSecLength": "10",
                "parentClassifySecOid": "",
                "secTypeText": "分类码段",
                "sectionValue": [
                  {
                    "num": "1",
                    "name": "二",
                    "description": "",
                    "pid": "",
                    "id": "1673235471532167168",
                    "value": "001"
                  },
                  {
                    "num": "1",
                    "name": "一",
                    "description": "",
                    "pid": "",
                    "id": "1673235449524654080",
                    "value": "001"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "分类码段父",
                "id": "1673235394948370432",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "3",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "sss",
                "sectionCode": "flmdz",
                "secType": "codeclassifysec",
                "codeSecLength": "10",
                "parentClassifySecOid": "1673235394948370432",
                "secTypeText": "分类码段",
                "sectionValue": [
                  {
                    "num": "1",
                    "name": "小二",
                    "description": "",
                    "pid": "1673235471532167168",
                    "id": "1673235791276544000",
                    "value": "0012"
                  },
                  {
                    "num": "1",
                    "name": "小一",
                    "description": "",
                    "pid": "1673235449524654080",
                    "id": "1673235759584382976",
                    "value": "0011"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "分类码段子",
                "id": "1673235616541839360",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "4",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "sss",
                "sectionCode": "kbmd",
                "secType": "codevariablesec",
                "codeSecLength": "10",
                "parentClassifySecOid": "",
                "secTypeText": "可变码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "可变码段",
                "id": "1673235886290112512",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "5",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "引用码段",
                "sectionCode": "yy",
                "secType": "coderefersec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "引用码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "引用码段",
                "id": "1676048203809689600",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "6",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "fes",
                "sectionCode": "ge",
                "secType": "codeattrsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "属性码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "属性码段",
                "id": "1676052431290634240",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "7",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "层级码段",
                "sectionCode": "cengji",
                "secType": "codelevelsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "层级码段",
                "sectionValue": [
                  {
                    "num": "",
                    "name": "机体构件",
                    "description": "机体构件",
                    "pid": "",
                    "id": "0C600A6A-6398-FC30-D13E-121201FDA908",
                    "value": "0202"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "层级码段",
                "id": "1676837573571514368",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "8",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "层级码段2",
                "sectionCode": "cengj",
                "secType": "codelevelsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "层级码段",
                "sectionValue": [
                  {
                    "num": "",
                    "name": "锁",
                    "description": "锁",
                    "pid": "",
                    "id": "46B5DB5E-F783-DFE9-B48A-C4A367D02AC0",
                    "value": "020201"
                  }
                ],
                "num": "01",
                "codeSecLengthType": "code_sec_length_variable",
                "name": "层级码段",
                "secType": "codelevelsec",
                "id": "1674682431208296448",
                "pkCodeRule": "9FE2AF3E-2940-BD80-D46F-E3853314673D"
                "codeDateFormatStr": "",
                "name": "层级码段2",
                "id": "1676837771429416960",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "9",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "",
                "sectionCode": "shux",
                "secType": "codeattrsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "属性码段",
                "sectionValue": [],
                "num": "02",
                "name": "流水码段",
                "description": "流水码段",
                "secType": "codeserialsec",
                "id": "801B6412-E617-214A-08A5-9EDF5821AA66",
                "pkCodeRule": "9FE2AF3E-2940-BD80-D46F-E3853314673D",
                "codeSecLength": "4"
                "codeDateFormatStr": "",
                "name": "属性码段",
                "id": "1676838137894146048",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "10",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "日期码段",
                "sectionCode": "riqi",
                "secType": "codedatesec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "日期码段",
                "sectionValue": [],
                "codeDateFormatStr": "YYYY-MM-DD",
                "name": "日期码段",
                "id": "1676838388730302464",
                "pkCodeRule": "1673234841140858880"
              }
            ],
            "id": "9FE2AF3E-2940-BD80-D46F-E3853314673D"
            "id": "1673234841140858880"
          },
          "id": "46B5DB5E-F783-DFE9-B48A-C4A367D02AC0",
          "fullPathName": "",
          "leaf": false
        }
      ],

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/test.json

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,488 @@
{
  "data": {
    "msg": "成功!",
    "library": {
      "classify": [
        {
          "classCode": "020202",
          "lcStatus": "Enabled",
          "name": "口盖",
          "description": "口盖",
          "pid": "0C600A6A-6398-FC30-D13E-121201FDA908",
          "codeRule": {
            "ruleCode": "csfjl",
            "num": "",
            "name": "csfjl",
            "description": "",
            "codeSection": [
              {
                "num": "1",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "aaaa",
                "sectionCode": "gdmd",
                "secType": "codefixedsec",
                "codeSecLength": "10",
                "parentClassifySecOid": "",
                "secTypeText": "固定码段",
                "sectionValue": [
                  {
                    "num": "2",
                    "name": "",
                    "description": "",
                    "pid": "",
                    "id": "1673235273523269632",
                    "value": "002"
                  },
                  {
                    "num": "1",
                    "name": "",
                    "description": "",
                    "pid": "",
                    "id": "1673235247598276608",
                    "value": "001"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "固定码段",
                "id": "1673235191453323264",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "2",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "",
                "sectionCode": "flmdf",
                "secType": "codeclassifysec",
                "codeSecLength": "10",
                "parentClassifySecOid": "",
                "secTypeText": "分类码段",
                "sectionValue": [
                  {
                    "num": "1",
                    "name": "二",
                    "description": "",
                    "pid": "",
                    "id": "1673235471532167168",
                    "value": "001"
                  },
                  {
                    "num": "1",
                    "name": "一",
                    "description": "",
                    "pid": "",
                    "id": "1673235449524654080",
                    "value": "001"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "分类码段父",
                "id": "1673235394948370432",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "3",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "sss",
                "sectionCode": "flmdz",
                "secType": "codeclassifysec",
                "codeSecLength": "10",
                "parentClassifySecOid": "1673235394948370432",
                "secTypeText": "分类码段",
                "sectionValue": [
                  {
                    "num": "1",
                    "name": "小二",
                    "description": "",
                    "pid": "1673235471532167168",
                    "id": "1673235791276544000",
                    "value": "0012"
                  },
                  {
                    "num": "1",
                    "name": "小一",
                    "description": "",
                    "pid": "1673235449524654080",
                    "id": "1673235759584382976",
                    "value": "0011"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "分类码段子",
                "id": "1673235616541839360",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "4",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "sss",
                "sectionCode": "kbmd",
                "secType": "codevariablesec",
                "codeSecLength": "10",
                "parentClassifySecOid": "",
                "secTypeText": "可变码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "可变码段",
                "id": "1673235886290112512",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "5",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "引用码段",
                "sectionCode": "yy",
                "secType": "coderefersec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "引用码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "引用码段",
                "id": "1676048203809689600",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "6",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "fes",
                "sectionCode": "ge",
                "secType": "codeattrsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "属性码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "属性码段",
                "id": "1676052431290634240",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "7",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "层级码段",
                "sectionCode": "cengji",
                "secType": "codelevelsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "层级码段",
                "sectionValue": [
                  {
                    "num": "",
                    "name": "机体构件",
                    "description": "机体构件",
                    "pid": "",
                    "id": "0C600A6A-6398-FC30-D13E-121201FDA908",
                    "value": "0202"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "层级码段",
                "id": "1676837573571514368",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "8",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "层级码段2",
                "sectionCode": "cengj",
                "secType": "codelevelsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "层级码段",
                "sectionValue": [
                  {
                    "num": "",
                    "name": "口盖",
                    "description": "口盖",
                    "pid": "",
                    "id": "B6C55202-A224-9098-6A82-E3FC5DEEF790",
                    "value": "020202"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "层级码段2",
                "id": "1676837771429416960",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "9",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "",
                "sectionCode": "shux",
                "secType": "codeattrsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "属性码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "属性码段",
                "id": "1676838137894146048",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "10",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "日期码段",
                "sectionCode": "riqi",
                "secType": "codedatesec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "日期码段",
                "sectionValue": [],
                "codeDateFormatStr": "YYYY-MM-DD",
                "name": "日期码段",
                "id": "1676838388730302464",
                "pkCodeRule": "1673234841140858880"
              }
            ],
            "id": "1673234841140858880"
          },
          "id": "B6C55202-A224-9098-6A82-E3FC5DEEF790",
          "fullPathName": "",
          "leaf": false
        },
        {
          "classCode": "020201",
          "lcStatus": "Enabled",
          "name": "锁",
          "description": "锁",
          "pid": "0C600A6A-6398-FC30-D13E-121201FDA908",
          "codeRule": {
            "ruleCode": "csfjl",
            "num": "",
            "name": "csfjl",
            "description": "",
            "codeSection": [
              {
                "num": "1",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "aaaa",
                "sectionCode": "gdmd",
                "secType": "codefixedsec",
                "codeSecLength": "10",
                "parentClassifySecOid": "",
                "secTypeText": "固定码段",
                "sectionValue": [
                  {
                    "num": "2",
                    "name": "",
                    "description": "",
                    "pid": "",
                    "id": "1673235273523269632",
                    "value": "002"
                  },
                  {
                    "num": "1",
                    "name": "",
                    "description": "",
                    "pid": "",
                    "id": "1673235247598276608",
                    "value": "001"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "固定码段",
                "id": "1673235191453323264",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "2",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "",
                "sectionCode": "flmdf",
                "secType": "codeclassifysec",
                "codeSecLength": "10",
                "parentClassifySecOid": "",
                "secTypeText": "分类码段",
                "sectionValue": [
                  {
                    "num": "1",
                    "name": "二",
                    "description": "",
                    "pid": "",
                    "id": "1673235471532167168",
                    "value": "001"
                  },
                  {
                    "num": "1",
                    "name": "一",
                    "description": "",
                    "pid": "",
                    "id": "1673235449524654080",
                    "value": "001"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "分类码段父",
                "id": "1673235394948370432",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "3",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "sss",
                "sectionCode": "flmdz",
                "secType": "codeclassifysec",
                "codeSecLength": "10",
                "parentClassifySecOid": "1673235394948370432",
                "secTypeText": "分类码段",
                "sectionValue": [
                  {
                    "num": "1",
                    "name": "小二",
                    "description": "",
                    "pid": "1673235471532167168",
                    "id": "1673235791276544000",
                    "value": "0012"
                  },
                  {
                    "num": "1",
                    "name": "小一",
                    "description": "",
                    "pid": "1673235449524654080",
                    "id": "1673235759584382976",
                    "value": "0011"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "分类码段子",
                "id": "1673235616541839360",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "4",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "sss",
                "sectionCode": "kbmd",
                "secType": "codevariablesec",
                "codeSecLength": "10",
                "parentClassifySecOid": "",
                "secTypeText": "可变码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "可变码段",
                "id": "1673235886290112512",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "5",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "引用码段",
                "sectionCode": "yy",
                "secType": "coderefersec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "引用码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "引用码段",
                "id": "1676048203809689600",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "6",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "fes",
                "sectionCode": "ge",
                "secType": "codeattrsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "属性码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "属性码段",
                "id": "1676052431290634240",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "7",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "层级码段",
                "sectionCode": "cengji",
                "secType": "codelevelsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "层级码段",
                "sectionValue": [
                  {
                    "num": "",
                    "name": "机体构件",
                    "description": "机体构件",
                    "pid": "",
                    "id": "0C600A6A-6398-FC30-D13E-121201FDA908",
                    "value": "0202"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "层级码段",
                "id": "1676837573571514368",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "8",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "层级码段2",
                "sectionCode": "cengj",
                "secType": "codelevelsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "层级码段",
                "sectionValue": [
                  {
                    "num": "",
                    "name": "锁",
                    "description": "锁",
                    "pid": "",
                    "id": "46B5DB5E-F783-DFE9-B48A-C4A367D02AC0",
                    "value": "020201"
                  }
                ],
                "codeDateFormatStr": "",
                "name": "层级码段2",
                "id": "1676837771429416960",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "9",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "",
                "sectionCode": "shux",
                "secType": "codeattrsec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "属性码段",
                "sectionValue": [],
                "codeDateFormatStr": "",
                "name": "属性码段",
                "id": "1676838137894146048",
                "pkCodeRule": "1673234841140858880"
              },
              {
                "num": "10",
                "codeSecLengthType": "code_sec_length_variable",
                "description": "日期码段",
                "sectionCode": "riqi",
                "secType": "codedatesec",
                "codeSecLength": "",
                "parentClassifySecOid": "",
                "secTypeText": "日期码段",
                "sectionValue": [],
                "codeDateFormatStr": "YYYY-MM-DD",
                "name": "日期码段",
                "id": "1676838388730302464",
                "pkCodeRule": "1673234841140858880"
              }
            ],
            "id": "1673234841140858880"
          },
          "id": "46B5DB5E-F783-DFE9-B48A-C4A367D02AC0",
          "fullPathName": "",
          "leaf": false
        }
      ],
      "name": "",
      "id": "wupin"
    },
    "errorid": "0"
  }
}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/test1.json

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,75 @@
{
  "backPath": "",
  "mapFields": "",
  "method": "GET",
  "muti": false,
  "onlyLeaf": false,
  "paramForFormKey": "",
  "referType": "coderule",
  "remoteSort": false,
  "tableConfig": {
    "cols": [
      {
        "field": "id",
        "fieldType": "text",
        "fieldTypeText": "文本框",
        "isQuery": "true",
        "sort": "true",
        "sortField": "id",
        "title": "编号",
        "width": 150
      },
      {
        "field": "name",
        "fieldType": "text",
        "fieldTypeText": "文本框",
        "isQuery": "true",
        "sort": "true",
        "sortField": "name",
        "title": "名称",
        "width": 180
      },
      {
        "field": "name",
        "fieldType": "text",
        "fieldTypeText": "文本框",
        "isQuery": "false",
        "sort": "false",
        "sortField": "name",
        "title": "名称",
        "width": 150
      },
      {
        "field": "lastmodifier",
        "fieldType": "text",
        "fieldTypeText": "文本框",
        "isQuery": "false",
        "sort": "false",
        "sortField": "lastmodifier",
        "title": "最后时间人",
        "width": 150
      }
    ],
    "page": {
      "limit": 15,
      "page": 1
    },
    "queryColumns": [
      {
        "$ref": "$.tableConfig.cols[0]"
      },
      {
        "$ref": "$.tableConfig.cols[1]"
      }
    ]
  },
  "textField": "name",
  "type": "default",
  "url": "",
  "valueField": "oid",
  "where": {
    "creator_equal": "",
    "tenant_id_equal": "",
    "createtime_equal": ""
  }
}

 Source/UBCS/ubcs-service-api/ubcs-dict-api/src/main/java/com/vci/ubcs/system/feign/IDictBizClient.java

@@ -22,6 +22,7 @@
import com.vci.ubcs.system.entity.DictBiz;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

@@ -79,7 +80,7 @@
     * @param dictBiz å­—典数据
     * @return
     */
    @GetMapping(CHECK_VALUE)
    R getCheck(@Valid @RequestBody DictBiz dictBiz);
    @PostMapping(CHECK_VALUE)
    R getCheck(@RequestBody DictBiz dictBiz);

}

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEdge.java

@@ -1,10 +1,14 @@
package com.vci.ubcs.omd.entity;

import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.Date;

/**
 * ç”Ÿå‘½å‘¨æœŸçš„图的边界内容
@@ -14,7 +18,7 @@
@Data
@TableName("pl_omd_life_cycle_edge")
@ApiModel(value = "生命周期的图的边界内容", description = "生命周期边界内容")
public class LifeCycleEdge extends BaseModel {
public class LifeCycleEdge implements java.io.Serializable{
    /**
     * åºåˆ—化
     */
@@ -22,6 +26,7 @@
    /**
     * æ¥æºçŠ¶æ€
     */
    @TableField("source_status")
    private String source;

    /**
@@ -32,6 +37,7 @@
    /**
     * ç›®æ ‡çŠ¶æ€
     */
    @TableField("target_status")
    private String target;

    /**
@@ -54,10 +60,42 @@
     * æŽ’序号
     */
    @JSONField(name = "index")
    private Integer indexNO;
    private Integer indexNum;

    /**
     * æ‰€å±žç”Ÿå‘½å‘¨æœŸ
     */
    private String lifeCycleOid;


    /**
     * ä¸»é”®
     */
    @TableId
    private String oid;

    /**
     * åˆ›å»ºäºº
     */
    private String creator;

    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;

    /**
     * æœ€åŽä¿®æ”¹äºº
     */
    private String lastModifier;

    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;

    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
}

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java

@@ -1,10 +1,13 @@
package com.vci.ubcs.omd.entity;


import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.Date;


/**
@@ -14,9 +17,9 @@
 * @date 2019/10/17 9:32
 */
@Data
@TableName("pl_omd_life_cycle_event")
@TableName("pl_omd_life_event")
@ApiModel(value = "生命周期事件集合", description = "生命周期事件集合")
public class LifeCycleEvent extends BaseModel {
public class LifeCycleEvent implements java.io.Serializable {

    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
@@ -43,4 +46,35 @@
     */
    private String bizDomain;

    /**
     * ä¸»é”®
     */
    @TableId
    private String oid;

    /**
     * åˆ›å»ºäºº
     */
    private String creator;

    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;

    /**
     * æœ€åŽä¿®æ”¹äºº
     */
    private String lastModifier;

    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;

    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;

}

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java

@@ -1,10 +1,13 @@
package com.vci.ubcs.omd.entity;


import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.Date;

/**
 *
@@ -13,9 +16,9 @@
 * @date 2019/10/11 2:49 PM
 */
@Data
@TableName("pl_omd_life_cycle_line_event")
@TableName("pl_omd_line_event")
@ApiModel(value = "生命周期状态连接线", description = "生命周期状态连接线")
public class LifeCycleLineEvent extends BaseModel {
public class LifeCycleLineEvent implements java.io.Serializable {

    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
@@ -40,12 +43,43 @@
    /**
     * æŽ’序号
     */
    private Integer orderNum;
    private Integer indexNum;

    /**
     * æ‰€å±žé¢†åŸŸ
     */
    private String bizDomain;

    /**
     * ä¸»é”®
     */
    @TableId
    private String oid;

    /**
     * åˆ›å»ºäºº
     */
    private String creator;

    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;

    /**
     * æœ€åŽä¿®æ”¹äºº
     */
    private String lastModifier;

    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;

    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;


}

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleNode.java

@@ -1,10 +1,13 @@
package com.vci.ubcs.omd.entity;

import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.Date;

/**
 * @author weidy
@@ -13,7 +16,7 @@
@Data
@TableName("pl_omd_life_cycle_node")
@ApiModel(value = "生命周期的节点内容", description = "生命周期节点")
public class LifeCycleNode extends BaseModel {
public class LifeCycleNode implements java.io.Serializable {

    /**
     * èŠ‚点的尺寸
@@ -50,7 +53,7 @@
     * æŽ’序号
     */
    @JSONField(name = "index")
    private Integer indexNO;
    private Integer indexNum;

    /**
     * çº¿çš„类型
@@ -61,4 +64,36 @@
     * æ‰€å±žç”Ÿå‘½å‘¨æœŸ
     */
    private String lifeCycleOid;


    /**
     * ä¸»é”®
     */
    @TableId
    private String oid;

    /**
     * åˆ›å»ºäºº
     */
    private String creator;

    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;

    /**
     * æœ€åŽä¿®æ”¹äºº
     */
    private String lastModifier;

    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;

    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
}

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java

@@ -18,7 +18,7 @@
@Data
@TableName("pl_omd_life_cycle_rule")
@ApiModel(value = "生命周期规则", description = "生命周期规则")
public class LifeCycleRule extends BaseModel {
public class LifeCycleRule implements java.io.Serializable {

    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
@@ -51,4 +51,36 @@
     */
    private String startStatusName;


    /**
     * ä¸»é”®
     */
    @TableId
    private String oid;

    /**
     * åˆ›å»ºäºº
     */
    private String creator;

    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;

    /**
     * æœ€åŽä¿®æ”¹äºº
     */
    private String lastModifier;

    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;

    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;

}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java

@@ -460,8 +460,8 @@
            for (String s : prefix) {
                DictBiz dictBiz = new DictBiz();
                dictBiz.setCode(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR);
                dictBiz.setDictKey(s);
                dictBiz.setDictValue("prefix");
                dictBiz.setDictKey("prefix");
                dictBiz.setDictValue(s);
                iDictBizClient.getCheck(dictBiz) ;
            }
//                .saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"prefix",prefix,sessionInfo);
@@ -470,8 +470,8 @@
            for (String s : suffix) {
                DictBiz dictBiz = new DictBiz();
                dictBiz.setCode(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR);
                dictBiz.setDictKey(s);
                dictBiz.setDictValue("suffix");
                dictBiz.setDictKey("suffix");
                dictBiz.setDictValue(s);
                iDictBizClient.getCheck(dictBiz) ;
            }
//            charService.saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"suffix",suffix,sessionInfo);
@@ -480,8 +480,8 @@
            for (String s : dateFormates) {
                DictBiz dictBiz = new DictBiz();
                dictBiz.setCode(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR);
                dictBiz.setDictKey(s);
                dictBiz.setDictValue("dateFormates");
                dictBiz.setDictKey("dateFormates");
                dictBiz.setDictValue(s);
                iDictBizClient.getCheck(dictBiz) ;
            }
//            charService.saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"dateFormates",dateFormates,sessionInfo);

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java

@@ -381,7 +381,7 @@
        QueryWrapper<CodeClassifyValue> wrapper = new QueryWrapper<>();
        wrapper.eq("codeClassifySecOid",classifySecOid);
        if(StringUtils.isNotBlank(parentClassifyValueOid)){
            wrapper.eq("parentClassifyValueOid",parentClassifyValueOid);
            wrapper.in("parentClassifyValueOid",VciBaseUtil.str2List(parentClassifyValueOid));
        }
        wrapper.orderByAsc("ordernum");


 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java

@@ -858,31 +858,57 @@
                        CodeRuleVO resultClassifyRuleVO1=new CodeRuleVO();
                        List<CodeBasicSecVO>  codeBasicSecVOS=    codeRuleVO.getSecVOList();
                        List<CodeSectionVO> codeSectionVOList=new CopyOnWriteArrayList<>();
                        Map<String,List<String>> secIdTOListValueOidMap=new HashMap<>();
                        if(!CollectionUtils.isEmpty(codeBasicSecVOS)){
                            codeBasicSecVOS.stream().forEach(codeBasicSecVO -> {
                                List<CodeSectionValueVO> codeSectionValueVOList=new ArrayList<>();
                                String secType=    codeBasicSecVO.getSecType();
                                if(secType.equals("codevariablesec")){//可变码段
                                    CodeSectionValueVO sectionValueVO=new CodeSectionValueVO("","","","","");
                                    codeSectionValueVOList.add(sectionValueVO);
                                    //空着，前端传
                                }else if(secType.equals("codefixedsec")){//固定码段
                                    List<CodeFixedValueVO> fixedValueVOList=codeBasicSecVO.getFixedValueVOList();
                                    fixedValueVOList.stream().forEach(codeFixedValueVO -> {
                                    CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(codeFixedValueVO.getOid(),codeFixedValueVO.getOrderNum()+"",codeFixedValueVO.getId(),codeFixedValueVO.getName(),codeFixedValueVO.getDescription());
                                        String id=StringUtils.isBlank(codeFixedValueVO.getOid())?"":codeFixedValueVO.getOid();
                                        String value=StringUtils.isBlank(codeFixedValueVO.getId())?"":codeFixedValueVO.getId();
                                        String num=StringUtils.isBlank(codeFixedValueVO.getOrderNum()+"")?"":codeFixedValueVO.getOrderNum()+"";
                                        String name=StringUtils.isBlank(codeFixedValueVO.getName())?"":codeFixedValueVO.getName();
                                        String description=StringUtils.isBlank(codeFixedValueVO.getDescription())?"":codeFixedValueVO.getDescription();
                                    CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,name,"",description);
                                    codeSectionValueVOList.add(sectionValueVO);
                                    });
                                }else if(secType.equals("codeclassifysec")){//分类码段
                                    String  secOid=codeBasicSecVO.getOid();
                                    String parentClassifySecOid= codeBasicSecVO.getParentClassifySecOid();
                                    List<CodeClassifyValueVO> codeClassifyValueVOS=    this.codeClassifyValueService.listCodeClassifyValueBySecOid(secOid,parentClassifySecOid);
                                    if(CollectionUtils.isEmpty(codeClassifyValueVOS)){
                                    String parentClassifyValueOid="";
                                    if(secIdTOListValueOidMap.containsKey(parentClassifySecOid)){
                                        List<String> parentClassifyValueList= secIdTOListValueOidMap.get(parentClassifySecOid);
                                        parentClassifyValueOid=VciBaseUtil.array2String(parentClassifyValueList.toArray(new String[]{}));
                                    }
                                    List<CodeClassifyValueVO> codeClassifyValueVOS=    this.codeClassifyValueService.listCodeClassifyValueBySecOid(secOid,parentClassifyValueOid);
                                    if(!CollectionUtils.isEmpty(codeClassifyValueVOS)){
                                        List<String>valueOidList=new ArrayList<>();

                                        codeClassifyValueVOS.stream().forEach(codeClassifyValueVO -> {
                                            CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(codeClassifyValueVO.getOid(),codeClassifyValueVO.getOrderNum()+"",codeClassifyValueVO.getId(),codeClassifyValueVO.getName(),codeClassifyValueVO.getDescription());
                                            String id=StringUtils.isBlank(codeClassifyValueVO.getOid())?"":codeClassifyValueVO.getOid();
                                            String value=StringUtils.isBlank(codeClassifyValueVO.getId())?"":codeClassifyValueVO.getId();
                                            String num=StringUtils.isBlank(codeClassifyValueVO.getOrderNum()+"")?"":codeClassifyValueVO.getOrderNum()+"";
                                            String name=StringUtils.isBlank(codeClassifyValueVO.getName())?"":codeClassifyValueVO.getName();
                                            String pid=StringUtils.isBlank(codeClassifyValueVO.getParentClassifyValueOid())?"":codeClassifyValueVO.getParentClassifyValueOid();
                                            String description=StringUtils.isBlank(codeClassifyValueVO.getDescription())?"":codeClassifyValueVO.getDescription();
                                            CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,name,pid,description);
                                            codeSectionValueVOList.add(sectionValueVO);
                                            valueOidList.add(id);
                                        });
                                        secIdTOListValueOidMap.put(secOid,valueOidList);
                                    }
                                }else if(secType.equals("codedatesec")){//日期码段

                                    //空着，前端传
                                }else if(secType.equals("coderefersec")){//引用码段
                                    codeBasicSecVO.getReferAttributeId();
                                    codeBasicSecVO.getReferCodeClassifyOid();
                                    codeBasicSecVO.getReferBtmId();
                                    codeBasicSecVO.getReferBtmName();
                                    //codeBasicSecVO.getReferValueInfo();

                                }else if(secType.equals("codelevelsec")) {//层级码段
                                    int level = codeBasicSecVO.getCodeLevelValue();
@@ -896,44 +922,58 @@
                                    }else{//最小层
                                        levelCodeClassifyVO=codeClassifyDO;
                                    }
                                    CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(levelCodeClassifyVO.getOid(),"0",levelCodeClassifyVO.getId(),codeBasicSecVO.getName(),codeBasicSecVO.getDescription());
                                    String id=StringUtils.isBlank(levelCodeClassifyVO.getOid())?"":levelCodeClassifyVO.getOid();
                                    String num="";
                                    String value=StringUtils.isBlank(levelCodeClassifyVO.getId())?"":levelCodeClassifyVO.getId();
                                    String name=StringUtils.isBlank(levelCodeClassifyVO.getName())?"":levelCodeClassifyVO.getName();
                                    String description=StringUtils.isBlank(levelCodeClassifyVO.getDescription())?"":levelCodeClassifyVO.getDescription();
                                    CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,name,"",description);
                                    codeSectionValueVOList.add(sectionValueVO);
                                }else if(secType.equals("codeattrsec")){//属性码段

                                    codeBasicSecVO.getReferAttributeId();
                                    codeBasicSecVO.getReferCodeClassifyOid();
                                    codeBasicSecVO.getReferBtmId();
                                    codeBasicSecVO.getReferBtmName();
                                }else if(secType.equals("codeserialsec")){//流水码段

                                }
                                //构建规则码段
                                CodeSectionVO codeSectionVO=new CodeSectionVO();
                                codeSectionVO.setId(codeBasicSecVO.getOid());//主键
                                codeSectionVO.setName(codeBasicSecVO.getName());//码段名称
                                codeSectionVO.setCodeSecLength(codeBasicSecVO.getCodeSecLength());//码段长度
                                codeSectionVO.setNum(codeBasicSecVO.getId());//码段编号
                                codeSectionVO.setCodeDateFormatStr(codeBasicSecVO.getCodeDateFormatStr());//日期类型
                                codeSectionVO.setCodeSecLengthType(codeBasicSecVO.getCodeSecLengthType());//码段长度类型
                                codeSectionVO.setPkCodeRule(codeRuleVO.getOid());
                                codeSectionVO.setSecType(codeBasicSecVO.getSecType());//码段类型
                                codeSectionVO.setDescription(codeBasicSecVO.getDescription());
                                codeSectionVO.setParentClassifySecOid(codeBasicSecVO.getParentClassifySecOid());
                                codeSectionVO.setSectionValue(codeSectionValueVOList);
                                codeSectionVO.setId(StringUtils.isBlank(codeBasicSecVO.getOid())?"":codeBasicSecVO.getOid());//主键
                                codeSectionVO.setName(StringUtils.isBlank(codeBasicSecVO.getName())?"":codeBasicSecVO.getName());//码段名称
                                codeSectionVO.setCodeSecLength(StringUtils.isBlank(codeBasicSecVO.getCodeSecLength())?"":codeBasicSecVO.getCodeSecLength());//码段长度
                                codeSectionVO.setNum(StringUtils.isBlank(codeBasicSecVO.getOrderNum()+"")?"":codeBasicSecVO.getOrderNum()+"");//码段序号
                                codeSectionVO.setCodeDateFormatStr(StringUtils.isBlank(codeBasicSecVO.getCodeDateFormatStr())?"":codeBasicSecVO.getCodeDateFormatStr());//日期类型
                                codeSectionVO.setCodeSecLengthType(StringUtils.isBlank(codeBasicSecVO.getCodeSecLengthType())?"":codeBasicSecVO.getCodeSecLengthType());//码段长度类型
                                codeSectionVO.setPkCodeRule(StringUtils.isBlank(codeRuleVO.getOid())?"":codeRuleVO.getOid());//规则主键
                                codeSectionVO.setSecType(StringUtils.isBlank(codeBasicSecVO.getSecType())?"":codeBasicSecVO.getSecType());//码段类型
                                codeSectionVO.setDescription(StringUtils.isBlank(codeBasicSecVO.getDescription())?"":codeBasicSecVO.getDescription());//描述
                                codeSectionVO.setParentClassifySecOid(StringUtils.isBlank(codeBasicSecVO.getParentClassifySecOid())?"":codeBasicSecVO.getParentClassifySecOid());//分类码段上级
                                codeSectionVO.setSecTypeText(StringUtils.isBlank(codeBasicSecVO.getSecTypeText())?"":codeBasicSecVO.getSecTypeText());
                                //if(!CollectionUtils.isEmpty(codeSectionValueVOList)) {
                                    codeSectionVO.setSectionValue(codeSectionValueVOList);
                                //}
                                codeSectionVO.setSectionCode(codeBasicSecVO.getId());//码段编号
                                codeSectionVOList.add(codeSectionVO);
                            });
                        }
                        //构建规则信息
                        resultCodeRuleVO.setId(codeRuleVO.getOid());
                        resultCodeRuleVO.setNum(codeRuleVO.getId());
                        resultCodeRuleVO.setDescription(codeRuleVO.getDescription());
                        resultCodeRuleVO.setId(StringUtils.isBlank(codeRuleVO.getOid())?"":codeRuleVO.getOid());//主键
                        resultCodeRuleVO.setNum("");//序号
                        resultCodeRuleVO.setName(StringUtils.isBlank(codeRuleVO.getName())?"":codeRuleVO.getName());//名称设置
                        resultCodeRuleVO.setRuleCode(StringUtils.isBlank(codeRuleVO.getId())?"":codeRuleVO.getId());//规则编号
                        resultCodeRuleVO.setDescription(StringUtils.isBlank(codeRuleVO.getDescription())?"":codeRuleVO.getDescription());//描述
                        resultCodeRuleVO.setCodeSection(codeSectionVOList);
                    }
                    //构建分类信息
                    com.vci.ubcs.code.vo.webserviceModel.coderule.ResultClassifyVO classifyVO=new com.vci.ubcs.code.vo.webserviceModel.coderule.ResultClassifyVO();
                    classifyVO.setId(codeClassifyDO.getOid());
                    classifyVO.setLcStatus(codeClassifyDO.getLcStatus());
                    classifyVO.setClassCode(codeClassifyDO.getId());
                    classifyVO.setDescription(codeClassifyDO.getDescription());
                    classifyVO.setName(codeClassifyDO.getName());
                    classifyVO.setPid(codeClassifyDO.getParentcodeclassifyoid());
                    classifyVO.setFullPathName(codeClassifyDO.getPath());
                    classifyVO.setId(StringUtils.isBlank(codeClassifyDO.getOid())?"":codeClassifyDO.getOid());
                    classifyVO.setLcStatus(StringUtils.isBlank(codeClassifyDO.getLcStatus())?"":codeClassifyDO.getLcStatus());
                    classifyVO.setClassCode(StringUtils.isBlank(codeClassifyDO.getId())?"":codeClassifyDO.getId());
                    classifyVO.setDescription(StringUtils.isBlank(codeClassifyDO.getDescription())?"":codeClassifyDO.getDescription());
                    classifyVO.setName(StringUtils.isBlank(codeClassifyDO.getName())?"":codeClassifyDO.getName());
                    classifyVO.setPid(StringUtils.isBlank(codeClassifyDO.getParentcodeclassifyoid())?"":codeClassifyDO.getParentcodeclassifyoid());
                    classifyVO.setFullPathName(StringUtils.isBlank(codeClassifyDO.getPath())?"":codeClassifyDO.getPath());
                    classifyVO.setCodeRule(resultCodeRuleVO);
                    classifyVOList.add(classifyVO);
                });

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

@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.omd.dto.LifeCycleDTO;
import com.vci.ubcs.omd.entity.LifeCycleEvent;
import com.vci.ubcs.omd.entity.LifeCycleRule;
import com.vci.ubcs.omd.service.ILifeCycleService;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.LifeCycleEventVO;
import com.vci.ubcs.omd.vo.LifeCycleVO;
import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
@@ -36,6 +38,7 @@
     * ç”Ÿå‘½å‘¨æœŸçš„服务
     */
    private final ILifeCycleService lifeCycleService;


    /**
     * åˆ†é¡µæŸ¥è¯¢
@@ -139,5 +142,19 @@
        return R.data(lifeCycleService.listUses(lifeCycleDTO));
    }

    /**
     * å…¨éƒ¨çš„事件
     */
    @GetMapping("page-event")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "全部的事件",notes = "分页查询事件")
    public R<IPage<LifeCycleEventVO>> pageEvent(BladeQueryObject baseQueryObject){
        Map<String, Object> conditionMap = baseQueryObject.getConditionMap();
        if (conditionMap == null){
            conditionMap = new HashMap<>();
        }
        return R.data(lifeCycleService.listEvent(conditionMap,baseQueryObject.getQuery()));
    }


}

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

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

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

/**
 * äº‹ä»¶çš„内容
 * @author weidy
 * @date 2023/7/6
 */
public interface LifeCycleEventMapper extends BaseMapper<LifeCycleEvent> {


}

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

@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.omd.dto.LifeCycleDTO;
import com.vci.ubcs.omd.entity.LifeCycleEvent;
import com.vci.ubcs.omd.entity.LifeCycleRule;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.LifeCycleEventVO;
import com.vci.ubcs.omd.vo.LifeCycleVO;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import org.springblade.core.mp.support.Query;
@@ -27,6 +29,14 @@
     * @return ç”Ÿå‘½å‘¨æœŸçš„显示对象
     */
    IPage<LifeCycleVO> listLife(Map<String, Object> conditionMap, Query query);

    /**
     * èŽ·å–全部的事件
     * @param conditionMap æŸ¥è¯¢æ¡ä»¶
     * @param query åˆ†é¡µ
     * @return äº‹ä»¶çš„显示对象
     */
    IPage<LifeCycleEventVO> listEvent(Map<String, Object> conditionMap, Query query);

    /**
     * æ·»åŠ ä¿å­˜
@@ -74,4 +84,6 @@
     * @return ä¸šåŠ¡ç±»åž‹
     */
    List<BtmTypeVO> listUses(LifeCycleDTO lifeCycleDTO);


}

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

@@ -9,21 +9,17 @@
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.entity.*;
import com.vci.ubcs.omd.mapper.*;
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.LifeCycleEventVO;
import com.vci.ubcs.omd.vo.LifeCycleVO;
import com.vci.ubcs.omd.vo.StatusVO;
import com.vci.ubcs.omd.wrapper.LifeCycleEventWrapper;
import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper;
import com.vci.ubcs.starter.enumpack.NewAppConstantEnum;
import com.vci.ubcs.starter.exception.VciBaseException;
@@ -85,6 +81,9 @@
    @Lazy
    private IBtmTypeService btmTypeService;

    @Resource
    private LifeCycleEventMapper eventMapper;


    /**
     * èŽ·å–生命周期列表
@@ -96,6 +95,18 @@
    @Override
    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)));
    }

    /**
     * èŽ·å–全部的事件
     *
     * @param conditionMap æŸ¥è¯¢æ¡ä»¶
     * @param query        åˆ†é¡µ
     * @return äº‹ä»¶çš„显示对象
     */
    @Override
    public IPage<LifeCycleEventVO> listEvent(Map<String, Object> conditionMap, Query query) {
        return LifeCycleEventWrapper.build().pageVO(eventMapper.selectPage(Condition.getPage(query),Condition.getQueryWrapper(conditionMap, LifeCycleEvent.class).lambda().orderByAsc(LifeCycleEvent::getEventFullName)));
    }

    /**
@@ -132,8 +143,6 @@
        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);
@@ -197,8 +206,6 @@
        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);
@@ -219,8 +226,6 @@
        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);
@@ -247,8 +252,6 @@
        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);

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

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

import com.vci.ubcs.omd.dto.LifeCycleDTO;
import com.vci.ubcs.omd.entity.LifeCycleEvent;
import com.vci.ubcs.omd.entity.LifeCycleEvent;
import com.vci.ubcs.omd.vo.LifeCycleEventVO;
import com.vci.ubcs.omd.vo.LifeCycleEventVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

/**
 * Description:事件
 *
 * @author LiHang
 * @date 2023/5/23
 */
public class LifeCycleEventWrapper extends BaseEntityWrapper<LifeCycleEvent, LifeCycleEventVO> {

    public static LifeCycleEventWrapper build() {
        return new LifeCycleEventWrapper();
    }

    @Override
    public LifeCycleEventVO entityVO(LifeCycleEvent entity) {
        LifeCycleEventVO vo = BeanUtil.copy(entity, LifeCycleEventVO.class);
        //这里处理枚举相关的
        return vo;
    }

    public List<LifeCycleEventVO> listEntityVO(List<LifeCycleEvent> LifeCycleEventList){
        return Optional.ofNullable(LifeCycleEventList).orElseGet(ArrayList::new).stream().map(this::entityVO).collect(Collectors.toList());
    }

    public List<LifeCycleEvent> batchCopyVO2DO(List<LifeCycleEventVO> LifeCycleEventVOList) {
        return Optional.ofNullable(LifeCycleEventVOList).orElseGet(ArrayList::new).stream().map(this::copyVO2DO).collect(Collectors.toList());
    }

    private LifeCycleEvent copyVO2DO(LifeCycleEventVO LifeCycleEventVO) {
        LifeCycleEvent LifeCycleEvent = BeanUtil.copy(LifeCycleEventVO, LifeCycleEvent.class);
        return LifeCycleEvent;
    }


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

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictBizController.java

@@ -16,6 +16,7 @@
 */
package com.vci.ubcs.system.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.system.entity.DictBiz;
@@ -175,5 +176,17 @@
        return R.data(DictBizWrapper.build().listNodeVO(tree));
    }

    /**
     * èŽ·å–可选择的列表
     */
    @GetMapping("/listByFlag")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入dict")
    public R<List<DictBiz>> listByFlag(DictBiz dict) {
//        QueryWrapper<DictBiz> wrapper = new QueryWrapper<>();
        List<DictBiz> details = dictService.list(Condition.getQueryWrapper(dict));
        return R.data(details);
    }


}

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/DictBizClient.java

@@ -23,6 +23,7 @@
import org.springblade.core.tool.api.R;
import com.vci.ubcs.system.entity.DictBiz;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;

@@ -67,7 +68,7 @@
     * @return
     */
    @Override
    @GetMapping(CHECK_VALUE)
    @PostMapping(CHECK_VALUE)
    public R getCheck(DictBiz dictBiz) {
        return service.checkOrInsert(dictBiz);
    }

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java

@@ -121,7 +121,7 @@
    @Override
    public R checkOrInsert(DictBiz dictBiz) {

        LambdaQueryWrapper<DictBiz> lqw = Wrappers.<DictBiz>query().lambda().eq(DictBiz::getCode, dictBiz.getCode()).eq(DictBiz::getDictKey, dictBiz.getDictKey());
        LambdaQueryWrapper<DictBiz> lqw = Wrappers.<DictBiz>query().lambda().eq(DictBiz::getCode, dictBiz.getCode()).eq(DictBiz::getDictKey, dictBiz.getDictKey()).eq(DictBiz::getDictValue, dictBiz.getDictValue());
        Long cnt = baseMapper.selectCount((Func.isEmpty(dictBiz.getId())) ? lqw : lqw.notIn(DictBiz::getId, dictBiz.getId()));
        if (cnt > 0L) {
            return R.fail("字典已经存在！");