代码提交

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

@@ -5,6 +5,8 @@
        :visible.sync="referBtmDialogParams.isShowDialog"
        @close="recoverPage"
        width="65%"
        top="0"
        class= "avue-dialog avue-dialog--top"
        style="height: 150vh; margin-top: -13vh;">
        <avue-crud
            :page.sync="referBtmDialogParams.referBtmDataPage"

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

@@ -6,6 +6,8 @@
      :visible.sync="isShowReferConfigForm"
      width="90%"
      id="refer-config-form"
      top="0"
      class= "avue-dialog avue-dialog--top"
      destroy-on-close
      @close="recoveryDataAndForm('initData')"
      style="height: 115vh; margin-top: -14vh; overflow-y: hidden">
@@ -1050,6 +1052,8 @@
                    return;
                }
                Object.assign(this.$data,this.$options.data());
                //this.preClickAttrRow.$cellEdit = false;
                //console.log(this.preClickAttrRow.$cellEdit);
                // ç§»é™¤ç»‘定在该页面对话框上的全局监听事件
                if(this.element != ''){
                   let te = window.removeEventListener('click', this.element)
@@ -1231,7 +1235,6 @@
                    })
                }
            },


        }
    };

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

@@ -4,6 +4,8 @@
        append-to-body
        :visible.sync="crudParams.isShowDialog"
        width="65%"
        top="0"
        class= "avue-dialog avue-dialog--top"
        destroy-on-close
        @close="clearTableRowSelection"
        style="height: 110vh; margin-top: -12vh; overflow-y: hidden">

 Source/UBCS-WEB/src/views/code/code.vue

@@ -47,7 +47,7 @@
          </el-button>
          <el-button
            v-show="scope.row.lcStatus == 'Editing' ? true : false"
            :disabled="releadDisabled"
            :loading="releadDisabled"
            icon="el-icon-position"
            plain
            size="small"
@@ -326,6 +326,7 @@
      append-to-body
      title="转移所有者"
      width="30%"
      class= "avue-dialog avue-dialog--top"
    >
      <el-select v-model="ruleOwner" class="selects" placeholder="请选择">
        <el-option
@@ -468,7 +469,7 @@
      append-to-body
      class="avue-dialog avue-dialog--top"
      destroy-on-close
      style="height: 100vh"
      style="height: 110vh"
      title="码段码值管理"
      top="-3%"
      @close="clearFixedOrClassifyForm('close')"
@@ -1274,9 +1275,8 @@
        <el-button
          :disabled="!showbtn"
          type="primary"
          @click="saveOrEditBasicCode"
          >保 å­˜</el-button
        >
          :loading="isLoadingSecCodeAddBtn"
          @click="saveOrEditBasicCode">保 å­˜</el-button>
        <el-button @click="addBasicCodeSettingBox = false">取 æ¶ˆ</el-button>
      </div>

@@ -1455,7 +1455,6 @@
import { mapGetters } from "vuex";
import { getByRoleUserList } from "@/api/system/user";
import func from "@/util/func";
import logeVue from '../docking/loge.vue';

export default {
  data() {
@@ -1544,6 +1543,7 @@
      selectionBasicList: [],
      addBasicCodeSettingBox: false,
      showbtn: false, //基础码段新增是否显示基础码段
      isLoadingSecCodeAddBtn: false,
      basicSecDialogTitle: "", //基础码段第一层对话框标题
      basicSecOnlyRead: false, //新增基础码段表单是否只读

@@ -2514,6 +2514,7 @@
    updateStatus(oid, update) {
      updateStatus({ oid: oid, ts: new Date().getTime, update: update }).then(
        () => {
          this.releadDisabled = false;
          this.onLoad(this.page);
          this.$message({
            type: "success",
@@ -2528,8 +2529,8 @@
    /** å‘布编码规则 */
    async enableOrDeactivatse(oid, update) {
      if (update === "release") {
        // é¿å…ç”¨æˆ·é‡å¤ç‚¹å‡»æŒ‰é’®
        this.releadDisabled = true;
        // é¿å…ç”¨æˆ·é‡å¤ç‚¹å‡»æŒ‰é’®
        await checkLikeCodeRule(oid)
          .then((res) => {
            //console.log(res)
@@ -2540,17 +2541,15 @@
                distinguishCancelAndClose: true,
                confirmButtonText: "继续发布",
                cancelButtonText: "取消",
              })
              .then(() => {
              }).then(() => {
                this.updateStatus(oid, update);
                this.releadDisabled = false;
              })
              .catch((action) => {
                this.releadDisabled = false;
              }).catch((action) => {
                this.$message({
                  type: "info",
                  message: "取消发布!",
                });
                this.releadDisabled = false;
              });
            }
          })
@@ -2871,6 +2870,7 @@
    /** é˜²æ­¢æ‰“开过编辑窗口之后表单中存在值，所以需要清空,并初始化form表单属性*/
    clearBasicAddForm() {
      this.form = this.$options.data().form;
      //this.isLoadingSecCodeAddBtn = false;
      // this.changeSectypeFormItems(null);
    },
    /** æ‰“开新增窗口*/
@@ -2912,6 +2912,7 @@
    },
    /** æ–°å¢žåŸºç¡€ç æ®µ*/
    async saveOrEditBasicCode() {
      this.isLoadingSecCodeAddBtn = true;
      if (
        this.selectionList[0].oid == null ||
        this.selectionList[0].oid == ""
@@ -2966,6 +2967,7 @@
        // å…³é—­å¯¹è¯æ¡†
        this.addBasicCodeSettingBox = false;
      }
      this.isLoadingSecCodeAddBtn = false;
    },
    /** å› ä¸ºelementui的表单校验设置不上所以采用判断的方式来做表单检验方式*/
    checkForm() {

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.entity.CodeClassify;
@@ -172,8 +173,8 @@
     * @return æ‰§è¡Œçš„结果
     */
    @GetMapping("/defaultReferDataGrid")
    public R<IPage<BaseModel>> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){
        IPage<BaseModel> iPage=    mdmEngineService.referDataGrid(referConfigVO,baseQueryObject);
    public R<IPage<BaseModelVO>> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){
        IPage<BaseModelVO> iPage=    mdmEngineService.referDataGrid(referConfigVO,baseQueryObject);
        return R.data(iPage);

    }

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java

@@ -5,6 +5,7 @@
import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO;
import com.vci.ubcs.code.dto.CodeDeleteBatchDTO;
import com.vci.ubcs.code.dto.CodeExportAttrDTO;
import com.vci.ubcs.code.dto.CodeOrderDTO;
@@ -726,7 +727,7 @@
     * @return æ‰§è¡Œçš„结果
     */
    @GetMapping("/defaultReferDataGrid")
    public IPage<BaseModel> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){
    public IPage<BaseModelVO> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){
        return engineService.referDataGrid(referConfigVO,baseQueryObject);
    }


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

@@ -2,6 +2,7 @@


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
import com.vci.ubcs.code.dto.CodeDeleteBatchDTO;
@@ -416,7 +417,7 @@
     * @param referConfigVO
     * @return
     */
    IPage<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException;
    IPage<BaseModelVO> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException;

    /**
     * èŽ·å–树形的参照

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

@@ -378,16 +378,16 @@
            }
            //引用码段的时候，需要判断参照的信息是否正确
            if(CodeSecTypeEnum.CODE_REFER_SEC.getValue().equalsIgnoreCase(codeBasicSecDO.getSecType())){
                if(StringUtils.isBlank(codeBasicSecDO.getReferConfig())){
                if(StringUtils.isBlank(codeBasicSecDTO.getReferConfig())){
                    throw new VciBaseException("引用码段的时候，需要填写参照配置的内容");
                }
                try{
                    // JSONObject.parseObject(codeBasicSecDO.getReferConfig(), UIFormReferVO.class);
                    codeReferConfigVO = JSONObject.parseObject(codeBasicSecDO.getReferConfig(), CodeReferConfigVO.class);
                    codeReferConfigVO = JSONObject.parseObject(codeBasicSecDTO.getReferConfig(), CodeReferConfigVO.class);
                }catch (Throwable e){
                    throw new VciBaseException("引用码段的时候，参照配置的内容的格式不正确,",new String[0],e);
                }
                // åˆ¤æ–­æ˜¯å¦ä¸ºå¼•ç”¨ç æ®µï¼Œå¦‚果是应用码段的话，为了适配前端组件，这里要对表进行处理一下，按照以前的参照格式进行转换
                // åˆ¤æ–­æ˜¯å¦ä¸ºå¼•ç”¨ç æ®µï¼Œå¦‚果是引用码段的话，为了适配前端组件，这里要对表进行处理一下，按照以前的参照格式进行转换
                codeBasicSecDO.setReferValueInfo(referConfigToUIUiTable(codeReferConfigVO));
                if(codeReferConfigVO.getIsPersistence()=="true"){
                    codeReferConfigService.insert(codeReferConfigVO);

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
@@ -20,6 +21,7 @@
import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO;
import com.vci.ubcs.code.vo.pagemodel.UITablePageVO;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.BaseMdodelWrapper;
import com.vci.ubcs.flow.core.dto.FlowStatusDTO;
import com.vci.ubcs.flow.core.feign.IMDMIFlowAttrClient;
import com.vci.ubcs.flow.core.vo.ProcessStageAttrVO;
@@ -3560,7 +3562,6 @@
        return baseModels;
    }


    /**
     * æ ¹æ®ä¸šåŠ¡ç±»åž‹åç§°åˆ›å»ºä¸šåŠ¡æ•°æ®æºå¯¹è±¡
     *
@@ -3677,7 +3678,7 @@
     * @return åˆ—表数据
     */
    @Override
    public IPage<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException {
    public IPage<BaseModelVO> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException {
        //checkReferConfig(referConfigVO);
        //使用业务类型查询
        R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
@@ -3758,27 +3759,28 @@
                            ZonedDateTime zdt = localDateTime.atZone(zoneId);
                            Date date = Date.from(zdt.toInstant());
                            setter.invoke(obj, date);
                            map.remove(property.getName().toUpperCase());
                            //map.remove(property.getName().toUpperCase());
                        } //oracle的数字为BigDecimal的，需要进行转换成Integer，否则将报错
                        else if (map.get(property.getName().toUpperCase()) instanceof BigDecimal
                                && ("Integer").equals(setter.getParameterTypes()[0].getSimpleName())) {
                            setter.invoke(obj, ((BigDecimal) map.get(property.getName().toUpperCase())).intValue());
                            map.remove(property.getName().toUpperCase());
                            //map.remove(property.getName().toUpperCase());
                        } else if (map.get(property.getName().toUpperCase()) != null) {
                            if(setter.getParameterTypes()[0].getSimpleName().equals("String")){
                                setter.invoke(obj, map.get(property.getName().toUpperCase()) == null ? null:String.valueOf(map.get(property.getName().toUpperCase())));
                            }else{
                                setter.invoke(obj, map.get(property.getName().toUpperCase()));
                            }
                            map.remove(property.getName().toUpperCase());
                            //map.remove(property.getName().toUpperCase());
                        }
                    }
                }
                for (Object key : map.keySet()) {
                    map.put(key, String.valueOf(map.get(key)));
                }

                ((BaseModel) obj).setData(map);
                Map<String, String> newMap = new HashMap<>();
                map.forEach((key, value) -> newMap.put(String.valueOf(key).toLowerCase(), String.valueOf(value)));
                ((BaseModel) obj).setData(newMap);
                baseModels.add((BaseModel) obj);
            }
        } catch (Exception e) {
@@ -3789,10 +3791,10 @@
                + "and lastv = " + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())) + " and" : "where") + SPACE + "1=1 "
                + lcstatusSql + namesql + codesql
        );
        IPage<BaseModel> objectDataGrid = new Page<>();
        IPage<BaseModelVO> objectDataGrid = new Page<>();
        objectDataGrid.setPages(baseQueryObject.getPage());
        objectDataGrid.setCurrent(baseQueryObject.getPage());
        objectDataGrid.setRecords(baseModels);
        objectDataGrid.setRecords(BaseMdodelWrapper.build().listVO(baseModels));
        objectDataGrid.setSize(baseQueryObject.getLimit());
        objectDataGrid.setTotal(total);
        return objectDataGrid;

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java

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

import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO;
import com.vci.ubcs.code.entity.CodeAllCode;
import com.vci.ubcs.code.entity.CodeRule;
import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.starter.revision.model.BaseModel;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;

import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * @author ludc
 * @date 2023/9/8 10:30
 */
public class BaseMdodelWrapper extends BaseEntityWrapper<BaseModel, BaseModelVO> {

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

    @Override
    public BaseModelVO entityVO(BaseModel baseModel) {
        BaseModelVO baseModelVO = Objects.requireNonNull(BeanUtil.copy(baseModel, BaseModelVO.class));
        if(StringUtils.isNotBlank(baseModelVO.getLcStatus())){
            baseModelVO.setLcStatusText(EnumCache.getValue(EnumEnum.CODE_RULE_LC,baseModel.getLcStatus()));
        }
        return baseModelVO;
    }

    @Override
    public List<BaseModelVO> listVO(List<BaseModel> list) {
        return (List)list.stream().map(this::entityVO).collect(Collectors.toList());
    }

}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeAllcodeWrapper.java

@@ -29,7 +29,7 @@
 * @author ludc
 * @since 2023-04-03
 */
public class CodeAllcodeWrapper extends BaseEntityWrapper<CodeAllCode, CodeAllCodeVO>  {
public class CodeAllcodeWrapper extends BaseEntityWrapper<CodeAllCode, CodeAllCodeVO> {

    public static CodeAllcodeWrapper build() {
        return new CodeAllcodeWrapper();