代码提交

 Source/UBCS-WEB/src/components/code-dialog-page/cloneOtherBasicSecDialog.vue

@@ -1,5 +1,6 @@
<template>
  <el-dialog
    :close-on-click-modal="false"
    :visible.sync="cloneOtherCodeRuleSettingBox"
    append-to-body
    class="avue-dialog avue-dialog--top"

 Source/UBCS-WEB/src/components/code-dialog-page/cloneRuleDialog.vue

@@ -1,5 +1,6 @@
<template>
  <el-dialog
      :close-on-click-modal="false"
      :visible.sync="cloneSettingBox"
      append-to-body
      class="avue-dialog avue-dialog--top"

 Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue

@@ -3,6 +3,7 @@
  <el-dialog
    title="公式编辑框"
    append-to-body
    :close-on-click-modal="false"
    :visible.sync="isShowformulaEdit"
    @close="closeFormulaEdit"
    width="75%"

 Source/UBCS-WEB/src/components/code-dialog-page/referBtmTypeCrudDialog.vue

@@ -1,5 +1,6 @@
<template>
    <el-dialog 
        :close-on-click-modal="false"
        title="为【参照引用的业务类型】选取值"
        append-to-body
        :visible.sync="referBtmDialogParams.isShowDialog"

 Source/UBCS-WEB/src/components/code-dialog-page/referConfigCrudDialog.vue

@@ -1,5 +1,6 @@
<template>
    <el-dialog
        :close-on-click-modal="false"
        title="选择参照配置"
        append-to-body
        :visible.sync="isShowReferConfigCrud"

 Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue

@@ -1,6 +1,7 @@
<template>
    <!-- 第二层对话框,属性码段，公式编辑框弹窗 -->
    <el-dialog
      :close-on-click-modal="false"
      title="参照配置"
      append-to-body
      :visible.sync="isShowReferConfigForm"

 Source/UBCS-WEB/src/components/code-dialog-page/referSelectBtmAttrDialog.vue

@@ -1,5 +1,6 @@
<template>
     <el-dialog 
        :close-on-click-modal="false"
        :title="options.title"
        append-to-body
        :visible.sync="crudParams.isShowDialog"

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java

@@ -16,6 +16,8 @@

    List<String> selectAllLevelChildOid(@Param("oid") String oid);

    List<String> selectChildOid(@Param("oid") String oid);

    Long countAllLevelChildOid(@Param("oid") String oid);

    String getClassifyValueStr(@Param("oid") String oid);

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

@@ -130,11 +130,15 @@
        BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyValueDTO,codeClassifyValueDO);
        //填充一些默认值
        DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyValueDO, MdmBtmTypeConstant.CODE_CLASSIFY_VALUE);
        LambdaQueryWrapper<CodeClassifyValue> wrapper = Wrappers.<CodeClassifyValue>query()
            .lambda().eq(CodeClassifyValue::getCodeClassifySecOid, codeClassifyValueDO.getCodeClassifySecOid());
        if(Func.isEmpty(codeClassifyValueDO.getParentClassifyValueOid())){
            wrapper.isNull(CodeClassifyValue::getParentClassifyValueOid);
        }else{
            wrapper.eq(CodeClassifyValue::getParentClassifyValueOid, codeClassifyValueDO.getParentClassifyValueOid());
        }
        //查询
        List<CodeClassifyValue> existList = codeClassifyValueMapper.selectList(Wrappers.<CodeClassifyValue>query()
            .lambda().eq(CodeClassifyValue::getCodeClassifySecOid, codeClassifyValueDO.getCodeClassifySecOid())
            .eq(CodeClassifyValue::getParentClassifyValueOid, codeClassifyValueDO.getParentClassifyValueOid())
        );
        List<CodeClassifyValue> existList = codeClassifyValueMapper.selectList(wrapper);
        codeClassifyValueDO.setOrderNum(existList.size() + 1);
        boolean resBoolean = codeClassifyValueMapper.insert(codeClassifyValueDO) > 0;
        return resBoolean;
@@ -244,19 +248,17 @@
        VciBaseUtil.alertNotNull(codeClassifyValueDTO,"分类码段的码值数据对象",codeClassifyValueDTO.getOid(),"分类码段的码值的主键");
        CodeClassifyValue codeClassifyValueDO = selectByOid(codeClassifyValueDTO.getOid());
        R baseResult = checkIsCanDeleteForDO(codeClassifyValueDTO,codeClassifyValueDO);
        if(!baseResult.isSuccess()) {
            //找下级的，这个是可以删除的时候R
            List<String> childrenOids = codeClassifyValueMapper.selectAllLevelChildOid(codeClassifyValueDO.getOid().trim());
        if(baseResult.isSuccess()) {
            //先删除下级码值，找下级的，这个是可以删除的时候
            List<String> childrenOids = codeClassifyValueMapper.selectChildOid(codeClassifyValueDO.getOid().trim());
            if (!CollectionUtils.isEmpty(childrenOids)) {
                Collection<Collection<String>> childrenCollections = VciBaseUtil.switchCollectionForOracleIn(childrenOids);
                for(Collection<String> s : childrenCollections){
                    codeClassifyValueMapper.delete(Wrappers.<CodeClassifyValue>query().lambda().eq(CodeClassifyValue::getOid,s));
                    codeClassifyValueMapper.deleteBatchIds(s);
                }
            }
        }else{
            return baseResult;
        }
        //执行删除操作
        //执行删除操作，再删除父的码值
        boolean resBoolean = codeClassifyValueMapper.deleteById(codeClassifyValueDO.getOid()) > 0;
        return R.status(resBoolean);
    }

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyValueMapper.xml

@@ -9,6 +9,9 @@
        CONNECT BY PRIOR PARENTCLASSIFYVALUEOID = OID
    </select>

    <select id="selectChildOid" resultType="java.lang.String">
        select OID from PL_CODE_CLASSIFYVALUE where PARENTCLASSIFYVALUEOID =#{oid}
    </select>

    <select id="countAllLevelChildOid" resultType="java.lang.Long">
        select count(OID) countsize