From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml | 8 +++++++-
1 files changed, 7 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 b09680d..ef46d1b 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,6 +106,7 @@
jt.article_id,
jt.LEVEL,
jt.option_number,
+ jt.option_number_min,
jt.mandatory_flag,
jt.attachment,
( SELECT
@@ -112,7 +116,9 @@
LEFT JOIN jczz_topics jts ON jts.id = jut.topics_id
WHERE
jut.article_id = jt.article_id
- AND jts.parent_id = jt.id AND jut.user_id = #{userId}
+ 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
--
Gitblit v1.9.3