From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:25:56 +0800
Subject: [PATCH] 1、实现万功能token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并相应修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index c4b2f4f..5852ca9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -378,7 +378,7 @@
AND bindNumTb.num = #{bindNumber}
</if>
</where>
- ORDER BY ge.operateDt DESC
+ ORDER BY ge.divideId DESC, ge.id DESC
<trim prefix="limit ">
<if test="start != null and count != null">
#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
@@ -774,8 +774,8 @@
FROM pr_intake tb
<where>
tb.deleted = 0
- <if test="intakeName != null and intakeName != ''">
- AND tb.name LIKE CONCAT('%', #{intakeName})
+ <if test="intakeNum != null and intakeNum != ''">
+ AND tb.name LIKE CONCAT('%', #{intakeNum})
</if>
</where>
</select>
@@ -790,8 +790,8 @@
INNER JOIN pr_controller con ON con.intakeId = inta.id
<where>
inta.deleted = 0
- <if test="intakeName != null and intakeName != ''">
- AND inta.name LIKE CONCAT('%', #{intakeName})
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name LIKE CONCAT('%', #{intakeNum})
</if>
</where>
ORDER BY inta.id DESC
--
Gitblit v1.8.0