代码提交

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeExportAttrDTO.java

@@ -46,7 +46,7 @@
    /**
     * 查询条件
     */
    private Map<String,Object> conditionMap;
    private Map<String,String> conditionMap;

    /**
     * 分类的主键
@@ -101,11 +101,11 @@
        this.order = order;
    }

    public Map<String, Object> getConditionMap() {
    public Map<String, String> getConditionMap() {
        return conditionMap;
    }

    public void setConditionMap(Map<String, Object> conditionMap) {
    public void setConditionMap(Map<String, String> conditionMap) {
        this.conditionMap = conditionMap;
    }


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

@@ -34,7 +34,6 @@
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.LocalFileUtil;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
import com.vci.ubcs.starter.web.enumpck.UserSecretEnum;
@@ -1474,7 +1473,7 @@
        CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(exportAttrDTO.getCodeClassifyOid());
        //先查询数据
        String btmTypeId = classifyFullInfo.getTopClassifyVO().getBtmTypeId();
        Map<String, Object> conditionMap = exportAttrDTO.getConditionMap();
        Map<String, String> conditionMap = exportAttrDTO.getConditionMap();
        if(conditionMap == null){
            conditionMap = new HashMap<>();
        }
@@ -1490,7 +1489,15 @@
        conditionMap.put("codeclsfpath","*" + exportAttrDTO.getCodeClassifyOid() + "*");
        conditionMap.put("lastr", "1");
        conditionMap.put("lastv", "1");
        UBCSSqlKeyword.buildSqlwhere(conditionMap);

        // 查询出表名


        String countSql = "select count(*) from " + VciBaseUtil.getTableName(btmTypeId) +" where 1=1" +
            " and lastr = '1'" +
            " and lastv='1'" +
            " and codeclsfpath like '%" + exportAttrDTO.getCodeClassifyOid() + "%'";

        //先查询总数
        int total = 0;
        if(exportAttrDTO.getEndPage()!=null && exportAttrDTO.getEndPage()>0
@@ -1504,11 +1511,11 @@
                thisPage.setOrder(exportAttrDTO.getOrder());
                thisPage.addDefaultDesc("createTime");

                total += boService.queryCount(btmTypeId, conditionMap);
                total += commonsMapper.queryCountBySql(countSql);
            }
        }else{

            total=boService.queryCount(btmTypeId, conditionMap);
            total = commonsMapper.queryCountBySql(countSql);
        }
        List<String> selectFieldList = new ArrayList<>();
        if(!CollectionUtils.isEmpty(exportAttrDTO.getAttrIdIndexMap())){
@@ -1581,9 +1588,6 @@
        LocalFileUtil.deleteTempFile(file,true);
        return zipFileName;
    }

    private


    /**
     * 查询数据并导出到excel