ludc
2023-03-31 b0dc3b48be862f09da13a212d8a731d546b7dfc2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -2,19 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
import com.vci.ubcs.code.dao.CodeBasicSecDaoI;
import com.vci.ubcs.code.mapper.CodeClassifyValueMapper;
import com.vci.ubcs.code.mapper.CodeFixedValueMapper;
import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
import com.vci.ubcs.code.lifecycle.CodeRuleLC;
import com.vci.ubcs.code.entity.CodeBasicSecDO;
import com.vci.ubcs.code.entity.CodeClassifyValueDO;
import com.vci.ubcs.code.entity.CodeFixedValueDO;
import com.vci.ubcs.code.service.CodeBasicSecServiceI;
import com.vci.ubcs.code.service.CodeClassifyValueServiceI;
import com.vci.ubcs.code.service.CodeFixedValueServiceI;
import com.vci.ubcs.code.service.CodeRuleServiceI;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
import com.vci.starter.revision.bo.TreeWrapperOptions;
import com.vci.starter.revision.service.RevisionModelUtil;
@@ -25,6 +13,24 @@
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciParentQueryOption;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
import com.vci.ubcs.code.dto.CodeBasicSecDTO;
import com.vci.ubcs.code.entity.CodeBasicSecDO;
import com.vci.ubcs.code.entity.CodeClassifyValueDO;
import com.vci.ubcs.code.entity.CodeFixedValueDO;
import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
import com.vci.ubcs.code.lifecycle.CodeRuleLC;
import com.vci.ubcs.code.mapper.CodeBasicSecMapper;
import com.vci.ubcs.code.mapper.CodeClassifyValueMapper;
import com.vci.ubcs.code.mapper.CodeFixedValueMapper;
import com.vci.ubcs.code.service.CodeBasicSecServiceI;
import com.vci.ubcs.code.service.CodeClassifyValueServiceI;
import com.vci.ubcs.code.service.CodeFixedValueServiceI;
import com.vci.ubcs.code.service.CodeRuleServiceI;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.web.enumpck.OsCodeFillTypeEnum;
import com.vci.web.pageModel.BatchCBO;
import com.vci.web.pageModel.UIFormReferVO;
@@ -34,11 +40,7 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.vci.ubcs.code.dto.CodeBasicSecDTO;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -70,7 +72,7 @@
     * 数据操作层
     */
    @Resource
    private CodeBasicSecDaoI codeBasicSecMapper;
    private CodeBasicSecMapper codeBasicSecMapper;
    /**
     * 业务类型操作的服务
@@ -101,7 +103,7 @@
    /**
     * 分类码段的码值数据操作层
     */
    @Autowired
    @Resource
    private CodeClassifyValueMapper codeClassifyValueMapper;
    /**
@@ -113,12 +115,13 @@
    /**
     * 固定码段的码值数据操作层
     */
    @Autowired
    @Resource
    private CodeFixedValueMapper fixedValueMapper;
    /**
     * 上层分类码段的属性名称
     */
    private static  final String PARENT_FIELD_NAME = "parentclassifysecoid";
    private static final String PARENT_FIELD_NAME = "parentclassifysecoid";
    /**
     * 上级分类码值的属性名称
@@ -148,7 +151,7 @@
        if(!conditionMap.containsKey("pkCodeRule") || StringUtils.isBlank(conditionMap.get("pkCodeRule"))){
            return new DataGrid<>();
        }
        List<CodeBasicSecDO> doList = codeBasicSecMapper.selectByCondition(conditionMap, pageHelper);
        List<CodeBasicSecDO> doList = codeBasicSecMapper.(conditionMap, pageHelper);
        DataGrid<CodeBasicSecVO> dataGrid = new DataGrid<CodeBasicSecVO>();
        if (!CollectionUtils.isEmpty(doList)) {
            dataGrid.setData(codeBasicSecDO2VOs(doList));