From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
index 03a632b..113fc29 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
@@ -22,6 +22,7 @@
         <result property="optionNumber"    column="option_number"    />
         <result property="mandatoryFlag"    column="mandatory_flag"    />
         <result property="attachment"    column="attachment"    />
+        <result property="optionNumberMin"    column="option_number_min"    />
     </resultMap>
 
 
@@ -42,6 +43,7 @@
         <result property="selected"    column="selected"    />
         <result property="articleId"    column="article_id"    />
         <result property="optionNumber"    column="option_number"    />
+        <result property="optionNumberMin"    column="option_number_min"    />
         <result property="mandatoryFlag"    column="mandatory_flag"    />
         <result property="attachment"    column="attachment"    />
         <collection property="children" column="id" javaType="list" ofType="org.springblade.modules.discuss.dto.TopicsDTO"  select="selectStlCount">
@@ -77,6 +79,7 @@
             selected,
             article_id,
             option_number,
+            option_number_min,
             mandatory_flag,
             attachment
         from
@@ -103,9 +106,19 @@
         jt.article_id,
         jt.LEVEL,
         jt.option_number,
+        jt.option_number_min,
         jt.mandatory_flag,
         jt.attachment,
-        ( SELECT jut.selected FROM jczz_user_topics jut WHERE jut.article_id = jt.article_id AND jut.user_id = #{userId}
+        (	SELECT
+        jut.selected
+        FROM
+        jczz_user_topics jut
+        LEFT JOIN jczz_topics jts ON jts.id = jut.topics_id
+        WHERE
+        jut.article_id = jt.article_id
+        AND jts.parent_id = jt.id
+        <if test="householdId != null ">   AND jut.household_id = #{householdId}</if>
+          AND jut.house_code = #{houseCode}
         limit 1
         ) selected
         FROM
@@ -130,4 +143,20 @@
     </select>
 
 
+    <select id="getTopicstotalbyarticleid" resultType="org.springblade.modules.discuss.dto.TopicsDTO">
+
+        SELECT
+            jt.discuss_content,
+            jt.option_content,
+            ( SELECT count( 1 ) FROM jczz_user_topics jut WHERE jut.topics_id = jt.id ) number
+        FROM
+            jczz_topics jt
+        WHERE
+            jt.article_id = #{articleId}
+          AND jt.`level` = 2
+          and jt.delete_flag = 0
+
+    </select>
+
+
 </mapper>

--
Gitblit v1.9.3