THENG
/
a-tuoheng-airline
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:增加标注分组

This commit is contained in:
gyb 2026-03-16 18:45:45 +08:00
parent ce41e4a490
commit d4253be537
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java
View File

@ -25,7 +25,7 @@ import java.util.List;
* @author 拓恒 * @author 拓恒
*/ */
@RestController @RestController
@RequestMapping("/markerGroup") @RequestMapping("/marker")
@Tag(name = "标注管理") @Tag(name = "标注管理")
public class AirlineMarkerController extends BaseController { public class AirlineMarkerController extends BaseController {

6
src/main/resources/mapper/airline/AirlineMarkerMapper.xml
View File

@ -120,10 +120,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select distinct am.id, am.marker_name, am.marker_type, am.status, am.color, am.icon, am.font_size, am.coordinates, am.description, am.create_by, am.create_time, am.update_by, am.update_time, am.remark select distinct am.id, am.marker_name, am.marker_type, am.status, am.color, am.icon, am.font_size, am.coordinates, am.description, am.create_by, am.create_time, am.update_by, am.update_time, am.remark
from airline_marker am from airline_marker am
left join airline_marker_group_info amgi on am.id = amgi.marker_id left join airline_marker_group_info amgi on am.id = amgi.marker_id
left join airline_area_group aag on amgi.group_id = aag.group_id left join airline_marker_group amg on amgi.group_id = amg.group_id
<where> <where>
amgi.del_flag = 0 amgi.del_flag = 0
and aag.del_flag = 0 and (amg.del_flag = 0 or amg.del_flag is null)
<if test="createBy != null and createBy != ''"> <if test="createBy != null and createBy != ''">
and am.create_by = #{createBy} and am.create_by = #{createBy}
</if> </if>
@ -144,10 +144,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select distinct am.id, am.marker_name, am.marker_type, am.status, am.color, am.icon, am.font_size, am.coordinates, am.description, am.create_by, am.create_time, am.update_by, am.update_time, am.remark select distinct am.id, am.marker_name, am.marker_type, am.status, am.color, am.icon, am.font_size, am.coordinates, am.description, am.create_by, am.create_time, am.update_by, am.update_time, am.remark
from airline_marker am from airline_marker am
inner join airline_marker_group_info amgi on am.id = amgi.marker_id inner join airline_marker_group_info amgi on am.id = amgi.marker_id
left join airline_marker_group amg on amgi.group_id = amg.group_id
<where> <where>
amgi.del_flag = 0 amgi.del_flag = 0
and amgi.deleted_by is null and amgi.deleted_by is null
and amgi.deleted_time is null and amgi.deleted_time is null
and (amg.del_flag = 0 or amg.del_flag is null)
<if test="createBy != null and createBy != ''"> <if test="createBy != null and createBy != ''">
and am.create_by = #{createBy} and am.create_by = #{createBy}
</if> </if>