ludc
2023-06-27 67b0b28fc5e4364c27362fcbf13b655a75b0315a
修改编码规则引用码段参照字段存储时json格式问题
已修改4个文件
75 ■■■■■ 文件已修改
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UITablePageVO.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -640,7 +640,7 @@
                                    prop: 'id',
                                    rules: [{
                                        required: true,
                                        message: "(开始持久化时编号)必填项不能为空",
                                        message: "(开启持久化时编号)必填项不能为空",
                                        trigger: "blur",
                                    }],
                                    span: 6,
@@ -650,7 +650,7 @@
                                    prop: 'name',
                                    rules: [{
                                        required: true,
                                        message: "(开始持久化时名称)必填项不能为空",
                                        message: "(开启持久化时名称)必填项不能为空",
                                        trigger: "blur",
                                    }],
                                    span: 6,
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
@@ -100,7 +100,7 @@
    /**
     * 每页显示条数
     */
    private String limit;
    private Integer limit;
    /**
     * 排序字段
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UITablePageVO.java
@@ -23,6 +23,14 @@
     */
    private Integer page = 1;
    public UITablePageVO(Integer limit, Integer page) {
        this.limit = limit;
        this.page = page;
    }
    public UITablePageVO() {
    }
    public Integer getLimit() {
        return limit;
    }
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -17,6 +17,8 @@
package com.vci.ubcs.code.service.impl;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -28,6 +30,7 @@
import com.vci.ubcs.code.dto.CodeBasicSecDTO;
import com.vci.ubcs.code.dto.CodeRuleDTO;
import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
import com.vci.ubcs.code.lifecycle.CodeRuleLC;
import com.vci.ubcs.code.mapper.CodeRuleMapper;
import com.vci.ubcs.code.mapper.CodeSerialValueMapper;
@@ -36,16 +39,18 @@
import com.vci.ubcs.code.service.ICodeBasicSecService;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.ICodeRuleService;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
import com.vci.ubcs.starter.web.pagemodel.*;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.WebUtil;
@@ -486,11 +491,61 @@
            //如果有lcstatus的类的话
            vo.setLcStatusText(CodeRuleLC.getTextByValue(vo.getLcStatus()));
            if (hasSec) {
                List<CodeBasicSecVO> codeBasicSecVOS = codeBasicSecService.listCodeBasicSecByRuleOid(vo.getOid());
                // 判断是否为引用码段,如果是应用码段的话,为了适配前端组件,这里要对表进行处理一下,按照以前的参照格式进行转换
                codeBasicSecVOS.stream().peek(item->{
                    //引用码段
                    if(item.getSecType().equals(CodeSecTypeEnum.CODE_REFER_SEC) && StringUtils.isNotEmpty(item.getReferConfig())){
                        item.setReferConfig(referConfigTOUIUiTable(item));
                    }
                });
                //查询码段
                vo.setSecVOList(codeBasicSecService.listCodeBasicSecByRuleOid(vo.getOid()));
                vo.setSecVOList(codeBasicSecVOS);
            }
        }
        return vo;
    }
    /**
     * 将referconfig转换为JSON格式的UIFormReferVO
     * @param item
     * @return
     */
    private String referConfigTOUIUiTable(CodeBasicSecVO item){
        // JSON格式的参照配置转换为对象
        CodeReferConfig codeReferConfig = JSONObject.parseObject(item.getReferConfig(), CodeReferConfig.class);
        // 拷贝为以前的老对象
        UIFormReferVO uiFormReferVO = new UIFormReferVO();
        BeanUtil.copy(codeReferConfig,uiFormReferVO);
        // 表格的自定义定义
        UITableCustomDefineVO uiTableCustomDefineVO = new UITableCustomDefineVO();
        uiTableCustomDefineVO.setPage(new UITablePageVO(codeReferConfig.getLimit(),1));
        // 列表的列的信息转换
        List<UITableFieldVO> uiTableFieldVOs = new ArrayList<>();
        // 快速查询列
        List<UITableFieldVO> queryColumns = new ArrayList<>();
        codeReferConfig.getCodeShowFieldConfigs().stream().forEach(showField ->{
            UITableFieldVO uiTableFieldVO = new UITableFieldVO();
            BeanUtil.copy(showField,uiTableFieldVO);
            uiTableFieldVOs.add(uiTableFieldVO);
            if(showField.getIsQuery().equals("true")){
                queryColumns.add(uiTableFieldVO);
            }
        });
        // 显示的列
        uiTableCustomDefineVO.setCols(uiTableFieldVOs);
        // 快速查询列
        uiTableCustomDefineVO.setQueryColumns(queryColumns);
        // 筛选条件
        HashMap<String, String> whereMap = new HashMap<>();
        codeReferConfig.getCodeSrchCondConfigs().stream().forEach(srch->{
            whereMap.put(srch.getFilterValue()+"_"+srch.getFilterType(),srch.getFilterValue());
        });
        uiFormReferVO.setWhere(whereMap);
        return JSONObject.toJSONString(uiFormReferVO);
    }
}