1

13693261870

2023-03-28 9b574e0e759e10bfc4dfb58d8dba594876e012cb

 src/main/java/com/lf/server/service/show/DataLibService.java

@@ -156,16 +156,13 @@
            return null;
        }

        //


        return null;
    }

    /**
     * 查询数据
     */
    private void queryData(DownloadReqEntity dr, Map<String, List<?>> dataMap , Map<String, String> annexMap) {
    private void queryData(DownloadReqEntity dr, Map<String, List<?>> dataMap, Map<String, String> annexMap) {
        for (String enity : dr.getEntities()) {
            try {
                BasicMapper baseMapper = ClassHelper.getBasicMapper(enity);
@@ -174,17 +171,24 @@
                }

                QueryWrapper wrapper = createQueryWrapper(baseMapper, dr);
                List<?> list = baseMapper.selectList(wrapper);
                List list = baseMapper.selectList(wrapper);
                if (null == list || list.size() == 0) {
                    continue;
                }

                // SQL片段
                String sqlSegment = wrapper.getSqlSegment();

                if (!dataMap.containsKey(enity)) {
                    dataMap.put(enity, list);
                } else {
                    dataMap.get(enity).addAll(list);
                }

                String tab = BaseQueryService.getTabName(baseMapper);
                List<AttachEntity> annex = baseMapper.selectAnnex(tab, wrapper);
                if (null == annex || annex.isEmpty()) {
                    continue;
                }

                //
            } catch (Exception ex) {
                log.error(ex.getMessage(), ex);
            }
@@ -202,6 +206,7 @@
            wrapper.apply(dirs);
        }
        if (!StringHelper.isEmpty(dr.getDepcode())) {
            // wrapper.apply(String.format("depid like '%s'", StringHelper.getRightLike(dr.getDepcode())))
            wrapper.likeRight("depid", dr.getDepcode());
        }
        if (baseMapper instanceof GeomBaseMapper && !StringHelper.isEmpty(dr.getWkt())) {
@@ -421,7 +426,7 @@
        removeDuplicate(list);
        setRightLike(list, field);

        return StringHelper.join(list, " or ");
        return "(" + StringHelper.join(list, " or ") + ")";
    }

    /**