From eb5a6e5a54efa997971beffc909bcadc06dc8886 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 21 四月 2025 10:45:16 +0800 Subject: [PATCH] 1、江海测试系统设备类型默认为阀; 2、完善通信中间件测试消息推送代码; 3、增加队列数据结构注释; 4、121服务器相关的初始化配置文件bug修改; 5、其他注释完善。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml index 970d0b6..a2636b2 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml @@ -250,7 +250,7 @@ grp.group_code AS groupCode, (SELECT COUNT(*) FROM ir_group_intake WHERE group_id = grp.id) AS intakeCount, grp.default_duration AS defaultDuration, - 0 as sort, + pg.sort, grp.operate_time FROM ir_irrigate_group grp LEFT JOIN ir_project_group pg ON pg.group_id = grp.id @@ -265,7 +265,7 @@ AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%') </if> </where> - ORDER BY grp.operate_time DESC + ORDER BY pg.sort <trim prefix="limit "> <if test="start != null and count != null"> #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER} -- Gitblit v1.8.0