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

 Source/BladeX-Tool/blade-core-tool/src/main/java/org/springblade/core/tool/jackson/BladeBeanSerializerModifier.java

@@ -43,7 +43,7 @@
            JavaType type = writer.getType();
            Class<?> clazz = type.getRawClass();
            if (type.isTypeOrSubTypeOf(Number.class)) {
                writer.assignNullSerializer(NullJsonSerializers.NUMBER_JSON_SERIALIZER);
//                writer.assignNullSerializer(NullJsonSerializers.NUMBER_JSON_SERIALIZER);
            } else if (type.isTypeOrSubTypeOf(Boolean.class)) {
                writer.assignNullSerializer(NullJsonSerializers.BOOLEAN_JSON_SERIALIZER);
            } else if (type.isTypeOrSubTypeOf(Character.class)) {

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

@@ -6,7 +6,7 @@
    append-to-body

    top="5vh"

  >

    <div>

    <!-- <div>

      <FormTemplate

        v-if="type === 'batchApplyCode'"

        type="add"

@@ -16,9 +16,9 @@
        @getFormData="getCodeApplyFormData"

        @referConfigDataUpdate="referConfigDataUpdate"

      ></FormTemplate>

    </div>

    </div> -->

    <div class="flex_box">

      <div class="left" :style="{ width: leftWidth + 'px' }">

      <div class="left" :style="{ width: leftWidth + 'px' }" v-show="false">

        <div class="isExpand_box">

          <el-link type="primary" @click="hideTree">

            <i

@@ -91,23 +91,7 @@
                </el-table-column>

              </el-table>

              <div v-else style="height: 400px"></div>

            </el-tab-pane>

            <el-tab-pane :label="tab2Name" name="tab2">

              <el-table border :data="tab2Table" height="400px">

                <el-table-column

                  v-for="item in cloNamesList"

                  :key="item.field"

                  :prop="item.field"

                  :label="item.title"

                  :width="item.width"

                  align="center"

                >

                </el-table-column>

              </el-table>

            </el-tab-pane>

          </el-tabs>

        </div>

        <div>

              <div>

          <el-table

            border

            :data="currentSelectedResemble"

@@ -141,6 +125,23 @@
            ></el-table-column>

          </el-table>

        </div>

            </el-tab-pane>

            <el-tab-pane :label="tab2Name" name="tab2">

              <el-table border :data="tab2Table" height="600px">

                <el-table-column

                  v-for="item in cloNamesList"

                  :key="item.field"

                  :prop="item.field"

                  :label="item.title"

                  :width="item.width"

                  align="center"

                >

                </el-table-column>

              </el-table>

            </el-tab-pane>

          </el-tabs>

        </div>

        
      </div>

    </div>

    <template #footer>

@@ -176,7 +177,7 @@
export default {

  name: "ShowImportData",

  components: { ResembleQuery, FormTemplate },

  mixins: [codeApply],

  // mixins: [codeApply],

  props: {

    title: {

      type: String,

@@ -199,7 +200,11 @@
      type: String,

      default: "",

    },

    type: String

    type: String,

    secDTOList: {

      type: Array,

      default: () => ({})

    }

  },

  computed: {

    dialogVisible: {

@@ -295,8 +300,8 @@
    },

    submit() {

      const params = {

        classifyAttr: this.classifyAttr,

        improt: true,

        classifyAttr: this.type === 'historyImport' ? this.classifyAttr : undefined,

        improt: this.type === 'historyImport' ? true : false,

        codeImprotSaveDatVOList: [

          {

            Clos: this.cloNamesList.map((item) => item.title),

@@ -304,7 +309,7 @@
            orderDTO: {

              codeClassifyOid: this.codeClassifyOid,

              templateOid: this.templateOid,

              secDTOList: [],

              secDTOList: this.secDTOList,

            },

          },

        ],

@@ -329,6 +334,7 @@
      handler(arr) {

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

          this.treeNodeClick(arr[0])

          this.leftWidth = 0

        }

      }

    }


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

@@ -76,6 +76,8 @@
      :codeClassifyOid="codeClassifyOid"

      :redisOid="redisOid"

      :type="type"

      :title="title"

      :secDTOList="secDTOList"

    ></ShowImportData>

  </el-dialog>

</template>

@@ -135,7 +137,7 @@
      return this.currentTypeObj[this.type]["tipList"];

    },

    downloadTemplateApi() {

      console.log(this.currentTypeObj[this.type], 'this.type');

      console.log(this.currentTypeObj[this.type], "this.type");

      return this.currentTypeObj[this.type]["downloadTemplateFun"];

    },

    action() {

@@ -148,15 +150,16 @@
          classifyAttr: this.classifyAttr,

        };

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

        const secDTOList = this.localSecVOList.map(item => {

            return {

              secOid: item.oid,

              secValue: this.codeApplyForm[item.id]

            }

          })

        // eslint-disable-next-line vue/no-side-effects-in-computed-properties

        this.secDTOList = this.localSecVOList.map((item) => {

          return {

            secOid: item.oid,

            secValue: this.codeApplyForm[item.id],

          };

        });

        return {

          codeClassifyOid: this.codeClassifyOid,

          secDTOList: JSON.stringify(secDTOList),

          secDTOList: JSON.stringify(this.secDTOList),

          ...this.codeApplyForm,

        };

      } else if (this.type === "batchApplyCode") {

@@ -212,6 +215,7 @@
          upParams: "classifyAttr",

        },

      },

      secDTOList: [],

    };

  },

  methods: {

@@ -252,9 +256,9 @@
    },

    onSuccess(res) {

      if (Object.keys(res.data).length === 0) {

        this.$message.success(this.title + '导入成功！')

        this.dialogVisible = false

        return

        this.$message.success(this.title + "导入成功！");

        this.dialogVisible = false;

        return;

      }

      if (res.data.fileOid) {

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

@@ -277,7 +281,7 @@
      }

    },

    onError(err) {

      console.log(err, 'err');

      console.log(err, "err");

      this.pageLoading.close();

    },

    uploadChange(file) {


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

@@ -456,6 +456,7 @@
        this.$message.warning("编码状态不是“编辑中”,不可编辑");
      } else {
        this.editvisible = true;
        this.rowOid = this.selectRow[0]['oid']
      }
    },
    //高级查询按钮

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

@@ -1,36 +1,38 @@
<template>
  <div>
    <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag">
      <el-button-group>
      <!--新增-->
      <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary"
                 @click="busineHandle">＋ 添加 {{ msg }}
      </el-button>
      <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">添加 {{ msg }}</el-button>
      <!--        全屏编辑-->
      <el-button v-if=" attrEditVisible == false && attrFlagChiledren==false" size="small" @click="fullscreenHandle">
        全屏编辑
      </el-button>
      <!--    组合规则-->
      <el-button size="small" @click="isShowHandler">组合规则</el-button>
      <el-button v-if=" attrEditVisible == false && attrFlagChiledren==false" size="small" @click="fullscreenHandle" icon="el-icon-full-screen">全屏编辑</el-button>
      <!--        验证规则-->
      <el-button icon="el-icon-info" size="small" @click="rulesVisible=true">验证规则</el-button>
      <!--        属性分组-->
      <el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">属性分组</el-button>
      </el-button-group>
      <el-button-group>
      <!--        分类注入-->
      <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">分类注入</el-button>
        <!--    组合规则-->
        <el-button size="small" @click="isShowHandler">组合规则</el-button>
      <!--        枚举注入-->
      <el-button size="small" @click="enmuVisHandle">枚举注入</el-button>
      <!--    级联属性-->
      <el-button size="small" @click="CascadeHandle">级联属性</el-button>
      <!--    预览排序-->
      <el-button size="small">预览排序</el-button>
      <el-button size="small" icon="el-icon-arrow-down">预览排序</el-button>
      </el-button-group>
      <el-button-group>
      <!--    保存-->
      <el-button size="small" @click="addsHandler">保存</el-button>
      <el-button size="small" @click="addsHandler" icon="el-icon-check">保存</el-button>
      <!--    删除-->
      <el-button size="small" @click="CrudRemove">删除</el-button>
      <el-button size="small" @click="CrudRemove" icon="el-icon-delete">删除</el-button>
      <!--    重置-->
      <el-button size="small" @click="reset">重置</el-button>
      <el-button size="small" @click="reset" icon="el-icon-refresh-right">重置</el-button>
      <!--    同步到其他模板-->
      <el-button size="small"@click="syncHandle">同步到其他模板</el-button>
      <el-button size="small"@click="syncHandle" icon="el-icon-share">同步到其他模板</el-button>
      </el-button-group>
      <!--    编码申请预览-->
      <el-button size="small" @click="applicationHandle" style="">编码申请预览</el-button>
      <!--        验证规则-->
@@ -92,7 +94,7 @@
            </el-table-column>
            <el-table-column fixed="right" label="操作" width="120">
              <template slot-scope="scope">
                <el-button size="small" type="text" @click.native.prevent="enumDeleteRow(scope.$index, tableData)">
                <el-button size="small" type="text" plain @click="enumDeleteRow">
                  移除
                </el-button>
              </template>
@@ -224,7 +226,7 @@
        </avue-crud>
        <div style="display: flex;justify-content: flex-end;margin-top: 15px">
          <el-button size="small" type="primary" @click="busineAddHandle">保存</el-button>
          <el-button size="small" type="primary">取消</el-button>
          <el-button size="small" type="primary" @click="addVisible=false">取消</el-button>
        </div>
      </el-dialog>
    </div>
@@ -232,6 +234,7 @@
              style="width: 100%"
              @cell-click="handleCellClicks"
              @select="selectHandle"
              @selection-change="selectionChange"
              v-if="this.crudArrayFlag"
    >
      <el-table-column
@@ -243,7 +246,7 @@
                       :label="item.label"
                       :prop="item.prop"
                       :formatter="formAttr"
                       :width="item.label.length >=4 ?'150':item.label.length==3 ?'120':'90'"
                       :width="item.width||(item.label.length >=4 ?'150':item.label.length==3 ?'120':'90')"
                       :show-overflow-tooltip="true"
                       align="center"
      >
@@ -901,11 +904,27 @@
          },
          {
            label: "数据类型",
            prop: "attrDataType"
            prop: "attrDataType",
            formatter:function(row,column){
              let vciFieldTypeMap = {
                VTBoolean: "布尔型",
                VTClob: "长文本",
                VTDate: "日期",
                VTDateTime: "日期时间",
                VTTime: "时间",
                VTLong: "长整型",
                VTDouble: "金额/双精度",
                VTInteger: "整形",
                VTFilePath: "文件",
                VTString: "字符串"
              }
              return vciFieldTypeMap[row.attrDataType];
            }
          },
          {
            label: "可空",
            prop: "nullableFlag"
            prop: "nullableFlag",
            formatter:function(row,column){return row.nullableFlag=='true' || row.nullableFlag=='1'?'是':'否'}
          },
          {
            label: "默认值",
@@ -925,11 +944,25 @@
          },
          {
            label: "参照",
            prop: "referFlag"
            prop: "referFlag",
            formatter: function (d) {
              if (!d.referFlag) {
                return '';
              } else {
                return d.referBtmTypeId
              }
            }
          },
          {
            label: "枚举",
            prop: "enumFlag"
            prop: "enumFlag",
            formatter: function (d) {
              if (!d.enumFlag) {
                return '';
              } else {
                return d.enumId
              }
            }
          },
        ]
      },
@@ -959,7 +992,7 @@
          label: '排序号',
          sortable: true,
          edit: 'number',
          width: 60,
          width: 70,
          fixed: true
        }, {
            label: "属性英文编号",
@@ -1016,14 +1049,14 @@
          {
            label: "高级查询属性",
            prop: "seniorQueryAttrFlag",
            width: 95,
            width: 110,
            cell: false,
            edit: "switch"
          },
          {
            label: "相似查重属性",
            prop: "sameRepeatAttrFlag",
            width: 95,
            width: 110,
            cell: false,
            edit: "switch"
          },
@@ -1285,7 +1318,6 @@
        this.$message.warning('请选择属性集');
        return false;
      }
debugger;
      let ordernum = this.ProData.length;
      this.busineSelectList.forEach((citem) => {
        let isCopy = false;
@@ -1320,8 +1352,6 @@
          this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
        }
      })


      this.addVisible = false;

    },
@@ -1407,7 +1437,7 @@
    },
    //枚举注入删除
    enumDeleteRow(row) {
      this.tableData.splice(row, 1)
      this.tableData.splice(row.$index, 1)
    },
    //枚举注入按钮
    enmuVisHandle() {
@@ -1507,7 +1537,10 @@
    },
    //表格删除
    CrudRemove() {
      this.ProData.splice(this.attrRow.$index, 1)
      this.attrSelectList.forEach((item)=>{
        this.ProData.splice(item.$index, 1)
      })

    },
    //表格重置
    reset() {

 Source/UBCS-WEB/src/components/template/Stage.vue

@@ -162,9 +162,10 @@
                    item = { oid, id, name, attributeGroup, ...{ checked: false } }
                    if (dataRight.length !== 0) {
                        dataRight.forEach(element => { if (item.id === element.attrId) item.checked = true });
                        return item
                    }
                    return item
                })
                console.log(datas)
                let dataValue = datas.map(item => item.checked ? item.oid : undefined)
                this.attributeValue = dataValue.filter(item => item)
                this.attributeData = datas
@@ -187,8 +188,11 @@
        handleMaintenance(row) {
            console.log(row)
            this.dialogNode = true
            this.modelKey = row.modelKey
            this.saveParam.modelKey = row.modelKey
            this.getStagelist()
        },
        // 维护
        handleMaintenanceTransfer(row) {
            this.saveParam.taskId = row.taskId
            this.saveParam.taskName = row.taskName

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

@@ -57,7 +57,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.exception.ServiceException;
import com.vci.ubcs.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
@@ -365,7 +365,10 @@
        // 回收需要业务数据删除
        if (CodeDefaultLC.TASK_BACK.getValue().equals(baseModelDTO.getLcStatus())) {
            R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(baseModelDTO.getBtmname()));
            commonsMapper.deleteByTaleAndOid(listR.getData().get(0).getTableName(), VciBaseUtil.toInSql(baseModelDTO.getOid()));
            if (!listR.isSuccess() || listR.getData().size() == 0) {
                throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
            }
            commonsMapper.deleteByTaleAndOid(listR.getData().get(0).getTableName(), VciBaseUtil.toInSql(baseModelDTO.getOid()));
        } else {
            for (BaseModel baseModel : baseModels) {
                baseModel.setLcStatus(baseModelDTO.getLcStatus());
@@ -646,6 +649,9 @@
//            final String[] sql = {"select count(*) from " + VciBaseUtil.getTableName(classifyFullInfo.getTopClassifyVO().getBtmtypeid()) + " t where 1 = 1 "};
            R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(classifyFullInfo.getTopClassifyVO().getBtmtypeid()));
//                String referTable = VciBaseUtil.getTableName(referVO.getReferType());
            if (!listR.isSuccess() || listR.getData().size() == 0) {
                throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
            }
            final String[] sql = {"select count(*) from " + listR.getData().get(0).getTableName() + " t where 1 = 1 "};
            conditionMap.forEach((key, value) -> {
                sql[0] += " and " + key + " = " + value;
@@ -1221,7 +1227,8 @@
            fieldVO.setTemplet(attrVO.getTableDisplayJs());
        }
        if (StringUtils.isBlank(fieldVO.getTemplet()) && VciFieldTypeEnum.VTBoolean.name().equalsIgnoreCase(attrVO.getAttributeDataType())) {
            fieldVO.setTemplet("function(d){return $webUtil.formateBoolean(d." + fieldVO.getField() + ");}");
            fieldVO.setTemplet("function(row,column){return row[column.property]=='true' || row[column.property]=='1'?'是':'否'}");
//            fieldVO.setTemplet("function(d){return $webUtil.formateBoolean(d." + fieldVO.getField() + ");}");
        }
        fieldVO.setOptionJsMap(eventJsMap);
        fieldVO.setStyle(attrVO.getTableDisplayStyle());
@@ -1595,6 +1602,9 @@
                //使用传入的业务类型查询表
                R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referVO.getReferType()));
//                String referTable = VciBaseUtil.getTableName(referVO.getReferType());
                if (!listR.isSuccess() || listR.getData().size() == 0) {
                    throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
                }
                String referTable = listR.getData().get(0).getTableName();
//                String referTable = "pl_code_classify";
                String referTableNick = attrVO.getId() + "0";
@@ -1691,6 +1701,9 @@
        }
//        String tableName = VciBaseUtil.getTableName(btmType);
        R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(btmType));
        if (!listR.isSuccess() || listR.getData().size() == 0) {
            throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
        }
//                String referTable = VciBaseUtil.getTableName(referVO.getReferType());
        String tableName = listR.getData().get(0).getTableName();
        String sql = "select " + selectFieldList.stream().map(s -> (s.contains(".") ? s : ("t." + s))).collect(Collectors.joining(","))
@@ -2229,9 +2242,9 @@
//        baseMapper.deleteBatchIds(cboList);
        //使用传入的业务类型查询表
        R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(classifyFullInfo.getCurrentClassifyVO().getBtmtypeid()));
        if (listR.getData().size() == 0) {
            throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
        }
        if (!listR.isSuccess() || listR.getData().size() == 0) {
            throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
        }
        commonsMapper.deleteByTaleAndOid(listR.getData().get(0).getTableName(),
                "'" + (StringUtils.join(cboList.stream().map(BaseModel::getOid).collect(Collectors.toSet()), "','")) + "'");
        //        );
@@ -3166,9 +3179,9 @@
    public Integer insertBatchByType(String btmType, List<BaseModel> baseModels) {
        //使用传入的业务类型查询表
        R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(btmType));
        if (listR.getData().size() == 0) {
            throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
        }
        if (!listR.isSuccess() || listR.getData().size() == 0) {
            throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
        }
        //将bean转为map,mybatis统一处理
        List<Map<String, String>> maps = new ArrayList<>();
        baseModels.stream().forEach(model -> {
@@ -3193,9 +3206,9 @@

        //使用传入的业务类型查询表
        R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(btmType));
        if (listR.getData().size() == 0) {
            throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
        }
        if (!listR.isSuccess() || listR.getData().size() == 0) {
            throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
        }
        //查询数据
        List<Map> maps = commonsMapper.selectBySql("select * from " + listR.getData().get(0).getTableName() + " where oid in ("
                + VciBaseUtil.toInSql(oids.toString()) + ")");
@@ -3251,6 +3264,9 @@
     */
    public BaseModel createBaseModel(String boName) {
        R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(boName));
        if (!listR.isSuccess() || listR.getData().size() == 0) {
            throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
        }
        String userName = String.valueOf(AuthUtil.getUser().getUserId());
        BaseModel bo = new BaseModel();
//        bo.setOid(VciBaseUtil.getPk());
@@ -3318,9 +3334,9 @@
    public R updateBatchByBaseModel(String btmType, List<BaseModel> baseModels) {
        //使用传入的业务类型查询表
        R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(btmType));
        if (listR.getData().size() == 0) {
            throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
        }
        if (!listR.isSuccess() || listR.getData().size() == 0) {
            throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
        }
        //将bean转为map,mybatis统一处理
        List<Map<String, String>> maps = new ArrayList<>();

@@ -3579,7 +3595,10 @@
        toBo.setVersionRule(fromBo.getVersionRule());
//        RevisionValueObject rvObj = this.getNextRevision(fromBo.getBtmName(), fromBo.getNameoid(), item.revRuleName, item.revInput, revisionVal);
        R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(fromBo.getBtmname()));
        Map<String, Object> nextRevision = commonsMapper.getNextRevision(listR.getData().get(0).getTableName(), fromBo.getNameOid());
        if (!listR.isSuccess() || listR.getData().size() == 0) {
            throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
        }
        Map<String, Object> nextRevision = commonsMapper.getNextRevision(listR.getData().get(0).getTableName(), fromBo.getNameOid());
        toBo.setRevisionSeq(Integer.parseInt(nextRevision.get("REVISIONSEQ").toString()));
        toBo.setRevisionValue(nextRevision.get("REVISIONVAL").toString());
//        VersionValueObject versionObj = this.getVersionValue(item.verRuleName);