From f6672d6695f0018c1c8bb7ea488c1983dba2309a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 17 Nov 2023 16:49:13 +0800
Subject: [PATCH] 统计代码

---
 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index fea83d2..1a77b02 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -11,7 +11,7 @@
         <result column="associated_user_id" property="associatedUserId"/>
         <result column="associated_user_name" property="associatedUserName"/>
         <result column="relationship" property="relationship"/>
-        <result column="primary_contact" property="primaryContact"/>
+<!--        <result column="primary_contact" property="primaryContact"/>-->
         <result column="residential_status" property="residentialStatus"/>
         <result column="gender" property="gender"/>
         <result column="birthday" property="birthday"/>
@@ -28,7 +28,7 @@
         <result column="other_contact" property="otherContact"/>
         <result column="current_address" property="currentAddress"/>
         <result column="disability_cert" property="disabilityCert"/>
-        <result column="data_status" property="dataStatus"/>
+<!--        <result column="data_status" property="dataStatus"/>-->
         <result column="role_type" property="roleType"/>
         <result column="party_ember" property="partyEmber"/>
         <result column="create_user" property="createUser"/>
@@ -37,6 +37,7 @@
         <result column="update_time" property="updateTime"/>
         <result column="remark" property="remark"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="confirm_flag" property="confirmFlag"/>
     </resultMap>
 
     <sql id="selectHousehold">
@@ -72,9 +73,9 @@
             update_user,
             update_time,
             remark,
-            is_deleted
-        from
-            jczz_household
+            is_deleted,
+            confirm_flag
+        from jczz_household
     </sql>
 
     <resultMap id="householdAndLabelMap" type="org.springblade.modules.house.vo.HouseholdVO" autoMapping="true">
@@ -106,6 +107,9 @@
         </if>
         <if test="household.aoiName!=null and household.aoiName !=''">
             and jhs.district_name like concat('%',#{household.aoiName},'%')
+        </if>
+        <if test="household.confirmFlag != null ">
+            and jh.confirm_flag = #{household.confirmFlag}
         </if>
     </select>
 
@@ -185,4 +189,20 @@
     </select>
 
 
+    <select id="statistics" resultType="java.lang.Integer">
+
+        SELECT
+            count(1)
+        FROM
+            jczz_grid_range jgr
+                LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+                LEFT JOIN jczz_household jh on jh.house_code=jgr.house_code
+        WHERE
+            jg.is_deleted = 0
+          and jh.confirm_flag = 0
+          AND jg.user_id = #{userId}
+
+    </select>
+
+
 </mapper>

--
Gitblit v1.9.3