代码修改

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/ResourceIntegratedController.java

@@ -436,16 +436,22 @@ public class ResourceIntegratedController extends EnvelopRestEndpoint {
            @RequestParam(value = "resourcesCode", required = true) String resourcesCode,
            @ApiParam(name = "metaData", value = "数据元")
            @RequestParam(value = "metaData", required = true) String metaData,
            @ApiParam(name = "page", value = "数据元")
            @RequestParam(value = "page", required = false) Integer page,
            @ApiParam(name = "rows", value = "数据元")
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "type", value = "类型 1全部 2当前页（默认全部）", required = false)
            @RequestParam(value = "type", required = false) String type,
            @ApiParam(name = "searchParams", value = "查询条件")
            @RequestParam(value = "searchParams", required = false) String searchParams, HttpServletResponse response) {
        try {
            int pageNum = 1;
            int size = 99999;
            if("2".equals(type)){
                size = 50;
                size = rows;
                pageNum = page;
            }
            Page<Map<String, Object>> result = resourceBrowseService.getCustomizeDataMysql(resourcesCode,metaData,searchParams,1, size);
            Page<Map<String, Object>> result = resourceBrowseService.getCustomizeDataMysql(resourcesCode,metaData,searchParams,pageNum, size);
            List<Map<String, Object>> listMap = result.toList();
            //导出
            String fileName = "档案数据导出";

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/ResourceBrowseService.java

@@ -504,6 +504,9 @@ public class ResourceBrowseService extends BaseJpaService {
    public Page<Map<String, Object>> getCustomizeDataMysql(String resourcesCodes, String metaData, String queryCondition, Integer page, Integer size) throws Exception {
        //获取资源编码列表
        List<String> codeList = (List<String>) objectMapper.readValue(resourcesCodes, List.class);
        if(codeList.size()>3){
            throw new ApiException( "不允许同时选择超过3个资源");
        }
        String tableName = "";
        String paramSql = "";
        String where = "";
@@ -758,8 +761,13 @@ public class ResourceBrowseService extends BaseJpaService {
                }
                String cond = String.valueOf(item.get("condition")).trim();
                String value = String.valueOf(item.get("value"));
                stringBuffer.append(" "+andOr+" "+field+cond+"'"+value+"' ");
            }
                if(value.contains(",")){
                    value = value.replaceAll(",","','");
                    stringBuffer.append(" "+andOr+" "+field+" in ('"+value+"') ");
                }else {
                    stringBuffer.append(" "+andOr+" "+field+cond+"'"+value+"' ");
                }
                           }
        }
        return stringBuffer;
    }