历史导入下载模板接口调试完善

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/utils/VciOmdUtil.java

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

import com.vci.ubcs.omd.vo.EnumVO;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.List;
@@ -14,6 +15,7 @@
     */
    public static List<KeyValue> enumsToListKeyVale(List<EnumVO> enums) {
        List<KeyValue> keyValues = new ArrayList<>();
        if(CollectionUtils.isEmpty(enums)){ return keyValues;}
        for (EnumVO anEnum : enums) {
            KeyValue keyValue = new KeyValue();
            keyValue.setKey(anEnum.getItemName());

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/bo/WriteExcelOption.java

@@ -2,53 +2,111 @@


import com.vci.ubcs.starter.bo.WriteExcelData;
import org.apache.commons.collections4.map.LinkedMap;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

public class WriteExcelOption {
    private Map<String, List<WriteExcelData>> writeDataMap;

    /**
     * 要写入的数据
     */
    private LinkedMap<String/**工作表的名称**/, LinkedList<WriteExcelData> /**要写入的数据**/> writeDataMap ;

    /**
     * 要隐藏的工作表名称
     */
    private List<String> hideSheetList;

    /**
     * 是否为追加的内容，即工作表已经存在
     */
    private boolean append = false;

    /**
     * 是否07的版本
     */
    private boolean revision07 = false;
    private Map<String, List<ExcelColumnMap>> extendAttrMap;

    public WriteExcelOption() {
    /**
     * 扩展属性的映射配置，po对象上属性是map的形式时使用，key与excelColumn注解的value()相同，值是对应的标题
     */
    private LinkedMap<String,List<ExcelColumnMap>> extendAttrMap ;

    /**
     * 默认构造方法
     */
    public WriteExcelOption(){

    }

    public WriteExcelOption(List<WriteExcelData> excelDataList) {
        this.writeDataMap = new HashMap();
        this.writeDataMap.put("Sheet1", excelDataList);
    /**
     * 包含一个工作表的内容
     * @param excelDataList 要写入的工作表内容，工作表的名称默认为Sheet1
     */
    public  WriteExcelOption(List<WriteExcelData> excelDataList){
        writeDataMap = new LinkedMap<>();
        LinkedList newList=new LinkedList();
        newList.addAll(excelDataList);
        writeDataMap.put("Sheet1",newList);
    }

    public void addSheetDataList(String sheetName, List<WriteExcelData> excelDataList) {
        if (this.writeDataMap == null) {
            this.writeDataMap = new HashMap();
    /**
     * 包含一个工作表的内容
     * @param excelDataList 要写入的工作表内容，工作表的名称默认为Sheet1
     */
    public  WriteExcelOption(LinkedList<WriteExcelData> excelDataList){
        writeDataMap = new LinkedMap<>();
        writeDataMap.put("Sheet1",excelDataList);
    }

    /**
     * 添加工作表的数据对象
     * @param sheetName 工作表名称
     * @param excelDataList 工作表的数据列表
     */
    public  void addSheetDataList(String sheetName,LinkedList<WriteExcelData> excelDataList){
        if(writeDataMap == null){
            writeDataMap = new LinkedMap<>();
        }

        this.writeDataMap.put(sheetName, excelDataList);
        writeDataMap.put(sheetName,excelDataList);
    }

    public void addHideSheet(String sheetName) {
        if (this.hideSheetList == null) {
            this.hideSheetList = new ArrayList();
    /**
     * 添加工作表的数据对象
     * @param sheetName 工作表名称
     * @param excelDataList 工作表的数据列表
     */
    public  void addSheetDataList(String sheetName,List<WriteExcelData> excelDataList){
        if(writeDataMap == null){
            writeDataMap = new LinkedMap<>();
        }

        this.hideSheetList.add(sheetName);
        LinkedList newList=new LinkedList();
        newList.addAll(excelDataList);
        writeDataMap.put(sheetName,newList);
    }

    public Map<String, List<WriteExcelData>> getWriteDataMap() {
        return this.writeDataMap;
    /**
     * 添加需要影响的工作表名称
     * @param sheetName 工作表名称
     */
    public void  addHideSheet(String sheetName){
        if(hideSheetList == null){
            hideSheetList = new ArrayList<>();
        }
        hideSheetList.add(sheetName);
    }

    public void setWriteDataMap(Map<String, List<WriteExcelData>> writeDataMap) {
    public Map<String, LinkedList<WriteExcelData>> getWriteDataMap() {
        return writeDataMap;
    }

    public void setWriteDataMap(LinkedMap<String, LinkedList<WriteExcelData>> writeDataMap) {
        this.writeDataMap = writeDataMap;
    }

    public List<String> getHideSheetList() {
        return this.hideSheetList;
        return hideSheetList;
    }

    public void setHideSheetList(List<String> hideSheetList) {
@@ -56,7 +114,7 @@
    }

    public boolean isAppend() {
        return this.append;
        return append;
    }

    public void setAppend(boolean append) {
@@ -64,22 +122,29 @@
    }

    public boolean isRevision07() {
        return this.revision07;
        return revision07;
    }

    public void setRevision07(boolean revision07) {
        this.revision07 = revision07;
    }

    public Map<String, List<ExcelColumnMap>> getExtendAttrMap() {
        return this.extendAttrMap;
    public LinkedMap<String, List<ExcelColumnMap>> getExtendAttrMap() {
        return extendAttrMap;
    }

    public void setExtendAttrMap(Map<String, List<ExcelColumnMap>> extendAttrMap) {
    public void setExtendAttrMap(LinkedMap<String, List<ExcelColumnMap>> extendAttrMap) {
        this.extendAttrMap = extendAttrMap;
    }

    @Override
    public String toString() {
        return "WriteExcelOption{writeDataMap=" + this.writeDataMap + ", hideSheetList=" + this.hideSheetList + ", append=" + this.append + ", revision07=" + this.revision07 + ", extendAttrMap=" + this.extendAttrMap + '}';
        return "WriteExcelOption{" +
            "writeDataMap=" + writeDataMap +
            ", hideSheetList=" + hideSheetList +
            ", append=" + append +
            ", revision07=" + revision07 +
            ", extendAttrMap=" + extendAttrMap +
            '}';
    }
}

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

@@ -113,5 +113,5 @@
     */
    List<CodeClassify> selectByFieldNamePath(@Param("fieldPath") String fieldPath,@Param("fieldName") String fieldName);


    public List<CodeClassifyVO> getIdPathToNamePathByParentId(@Param("parentId")String parentId);
}

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

@@ -547,9 +547,10 @@
     */
    @Override
    public List<CodeClassifyVO> getIdPathToNamePathByParentId(String classifyId, boolean enable) {
        return null;
        return codeClassifyMapper.getIdPathToNamePathByParentId(classifyId);
    }


    //    /**
//     * 根据树形查询对象来查询数据对象
//     *

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

@@ -196,7 +196,7 @@
                String field=codetemplateAttr.getId();
                String name=codetemplateAttr.getName();
                CodeClassifyTemplateAttrVO codeBaseAttributeDTO=new CodeClassifyTemplateAttrVO();
                boolean res=codetemplateAttr.getAttributeGroup().equals(BATCHADD_EXCEPORT_ATTR_TYPE)//基本属性字段显示
                boolean res=(StringUtils.isNotBlank(codetemplateAttr.getAttributeGroup())&& codetemplateAttr.getAttributeGroup().equals(BATCHADD_EXCEPORT_ATTR_TYPE))//基本属性字段显示
                    ||(StringUtils.isNotBlank(codetemplateAttr.getKeyAttrFlag())&&Boolean.parseBoolean(codetemplateAttr.getKeyAttrFlag()))//关键属性的存入
                    ||(StringUtils.isNotBlank(codetemplateAttr.getSameRepeatAttrFlag())&&Boolean.parseBoolean(codetemplateAttr.getSameRepeatAttrFlag())) //相似属性的存入
                    ||(StringUtils.isNotBlank(codetemplateAttr.getRequireFlag())&&Boolean.parseBoolean(codetemplateAttr.getRequireFlag()));

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

@@ -145,6 +145,39 @@
               level from pl_code_classify start with oid= #{oid} connect by prior PARENTCODECLASSIFYOID = oid
    </select>


    <select id="getIdPathToNamePathByParentId"  resultMap="plCodeClassifyResultMap">
        select codeclassify0.OWNER                 as owner,
        codeclassify0.BTMTYPEID             as btmtypeid,
        codeclassify0.CREATOR               as creator,
        codeclassify0.CREATETIME            as createtime,
        codeclassify0.LASTMODIFIER          as lastmodifier,
        codeclassify0.DESCRIPTION           as description,
        codeclassify0.ORDERNUM              as ordernum,
        codeclassify0.CODERULEOID           as coderuleoid,
        codeclassify0.OID                   as oid,
        codeclassify0.BTMNAME               as btmname,
        codeclassify0.BTMTYPENAME           as btmtypename,
        codeclassify0.CODEKEYATTRREPEATOID  as codekeyattrrepeatoid,
        codeclassify0.PARENTCODECLASSIFYOID as parentcodeclassifyoid,
        codeclassify0.NAME                  as name,
        codeclassify0.LASTMODIFYTIME        as lastmodifytime,
        codeclassify0.ID                    as id,
        codeclassify0.CODERESEMBLERULEOID   as coderesembleruleoid,
        codeclassify0.LCSTATUS              as lcstatus,
        codeclassify0.TS                    as ts,
        codeclassify0.namePath                 as namepath,
        codeclassify0.idPath                 as idpath
        from (select plcodeclassify.*,
                SYS_CONNECT_BY_PATH(name, '#')   as namePath,
                SYS_CONNECT_BY_PATH(id, '#')   as idPath
        from pl_code_classify  plcodeclassify
        START WITH parentCodeClassifyOid is null
        CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
        where codeclassify0.paths =#{fieldPath}
    </select>


    <select id="selectByFieldNamePath"  resultMap="plCodeClassifyResultMap">
        select codeclassify0.OWNER                 as owner,
               codeclassify0.BTMTYPEID             as btmtypeid,
@@ -169,10 +202,10 @@
        from (select plcodeclassify.*,
                <choose>
                     <when test='fieldName=="name"'>
                         SUBSTR(SYS_CONNECT_BY_PATH(name, '##'),3)   as paths
                         SYS_CONNECT_BY_PATH(name, '#')   as paths
                     </when>
                    <otherwise>
                        SUBSTR(SYS_CONNECT_BY_PATH(id, '##'),3)   as paths
                        SYS_CONNECT_BY_PATH(id, '#')   as paths
                    </otherwise>
                </choose>