fix: 成果下载+成果列表+飞手查询所有

linwei

2026-04-15 29dd08effe0fc26c83449d90d0c8d6983affb88d

fix: 成果下载+成果列表+飞手查询所有

 drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml

@@ -43,10 +43,10 @@
    <select id="selectGdFlyerPage" resultMap="gdFlyerVOResultMap">
        select
            *,
            CASE 
                WHEN CAST(#{param2.areaCode} AS VARCHAR) IS NOT NULL 
                     AND CAST(#{param2.areaCode} AS VARCHAR) != '' 
                     AND area_code LIKE concat('%',CAST(#{param2.areaCode} AS VARCHAR),'%') THEN 1
            CASE
                WHEN CAST(#{param2.skilledTaskType} AS VARCHAR) IS NOT NULL
                     AND CAST(#{param2.skilledTaskType} AS VARCHAR) != ''
                     AND skilled_task_type = #{param2.skilledTaskType} THEN 1
                ELSE 0
            END as area_match_flag
        from
@@ -75,7 +75,7 @@
            <!--     </foreach> -->
            <!-- </if> -->
        </where>
        ORDER BY area_match_flag DESC, create_time DESC
        ORDER BY task_type_match_flag DESC, create_time DESC
    </select>



 drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/impl/GdFlyerServiceImpl.java

@@ -49,21 +49,6 @@

    @Override
    public IPage<GdFlyerVO> selectGdFlyerPage(IPage<GdFlyerVO> page, GdFlyerPageParam gdFlyer) {
         // if (!AuthUtil.isAdministrator()) {
        //     List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        //     gdFlyer.setDeptList(deptList);
        // }
                // 通过经纬度获取行政区划
        if (StringUtil.isNotBlank(gdFlyer.getLongitude()) && StringUtil.isNotBlank(gdFlyer.getLatitude())) {
            String areaCode = GdGeoAddressUtil.getCountyCode(Double.valueOf(gdFlyer.getLongitude()), Double.valueOf(gdFlyer.getLatitude()));
            log.info("selectGdFlyerPageareaCode:{}",areaCode);
            // 去掉前面三位数字
            if (areaCode != null && areaCode.length() > 3) {
                areaCode = areaCode.substring(3);
                gdFlyer.setAreaCode(HeaderUtils.fillZero(areaCode));
            }
        }
        log.info("selectGdFlyerPageareagdFlyer:{}", JSON.toJSONString(gdFlyer));
        return page.setRecords(baseMapper.selectGdFlyerPage(page, gdFlyer));
    }