From 7efbf921192559cad13a4f8086c46c3617ad2a05 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 08:34:42 +0800
Subject: [PATCH] 1、协议解析中，关阀报（83）中的RTU时钟改为关阀时间，但代码误注解掉了这行代码，修改之； 2、通信中间件测试web系统增加查询所在在线情况的命令下发。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackReplyMapper.xml |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackReplyMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackReplyMapper.xml
index 1b5bbf5..9200aaf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackReplyMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackReplyMapper.xml
@@ -99,4 +99,52 @@
       replier_id = #{replierId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
+
+  <select id="getRecordCount" resultType="java.lang.Long">
+    select count(*) from ope_feedback_reply ofbr
+    inner join ope_feedback ofb on ofbr.feedback_id = ofb.id
+    <where>
+      <if test="feedbackId != null and feedbackId != '' ">
+        and ofbr.feedback_id = #{feedbackId,jdbcType=BIGINT}
+      </if>
+      <if test="replierId != null and replierId != '' ">
+        and ofbr.replier_id = #{replierId,jdbcType=BIGINT}
+      </if>
+      <if test="replyTimeStart != null">
+        and ofbr.reply_time &gt;= #{replyTimeStart}
+      </if>
+      <if test="replyTimeStop != null">
+        and ofbr.reply_time &lt;= #{replyTimeStop}
+      </if>
+    </where>
+    </select>
+
+  <select id="getFeedbackReply" resultType="com.dy.pipIrrGlobal.voOp.VofeedbackReply">
+    select
+    CAST(ofbr.id as char) AS id,
+    CAST(ofbr.feedback_id as char) AS feedbackId,
+    ofbr.reply_content as replyContent,
+    ofbr.reply_time as replyTime,
+    CAST(ofbr.replier_id as char) AS replierId
+    from ope_feedback_reply ofbr
+    inner join ope_feedback ofb on ofbr.feedback_id = ofb.id
+    <where>
+      <if test="feedbackId != null and feedbackId != '' ">
+        and ofbr.feedback_id = #{feedbackId,jdbcType=BIGINT}
+      </if>
+      <if test="replierId != null and replierId != '' ">
+        and ofbr.replier_id = #{replierId,jdbcType=BIGINT}
+      </if>
+      <if test="replyTimeStart != null">
+        and ofbr.reply_time &gt;= #{replyTimeStart}
+      </if>
+      <if test="replyTimeStop != null">
+        and ofbr.reply_time &lt;= #{replyTimeStop}
+      </if>
+    </where>
+    order by ofbr.id desc
+    <if test="pageCurr != null and pageSize != null">
+      LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
+    </if>
+  </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0