增加关于历史现势的数据过滤

siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/ZdjbxxMapper.xml

@@ -96,6 +96,7 @@
         SELECT *
         FROM vector.zdjbxx
         WHERE bsm = #{bsm}
+          AND valid_flag = 0 AND zt IN ('1', '2')
     </select>
 
     <select id="getListByDjzqdm" resultMap="BaseResultMap">
@@ -123,6 +124,7 @@
         SELECT zddm
         FROM vector.zdjbxx
         <where>
+            valid_flag = 0 AND zt IN ('1', '2')
             <if test="qllxIds != null and qllxIds != ''">
                 AND qllx  in(#{qllxIds})
             </if>
@@ -133,6 +135,7 @@
     <select id="getList" resultMap="BaseResultMap">
         SELECT *
         FROM vector.zdjbxx
+        WHERE valid_flag = 0 AND zt IN ('1', '2')
     </select>
 
     <update id="update" parameterType="com.siwei.apply.domain.cadastre.Zdjbxx">
@@ -266,6 +269,7 @@
             ) AS area_mu
         FROM vector.zdjbxx
         WHERE qllx IS NOT NULL
+          AND valid_flag = 0 AND zt IN ('1', '2')
         GROUP BY COALESCE(NULLIF(TRIM(qllx), ''), '其他'), djzt
         ORDER BY COALESCE(NULLIF(TRIM(qllx), ''), '其他')
     </select>
@@ -298,7 +302,7 @@
             ON LEFT(zd.zddm, 12) = dq.djzqdm
         WHERE zd.qllx IS NOT NULL
           AND zd.zdmj IS NOT NULL
-          AND (zd.valid_flag IS NULL OR zd.valid_flag = 0)
+          AND zd.valid_flag = 0 AND zd.zt IN ('1', '2')
           AND (dq.valid_flag IS NULL OR dq.valid_flag = 0)
         <if test="qllxCodes != null and qllxCodes.size() > 0">
             AND zd.qllx IN
@@ -335,7 +339,7 @@
         FROM vector.zdjbxx zd
         WHERE zd.yt IS NOT NULL
           AND zd.zdmj IS NOT NULL
-          AND (zd.valid_flag IS NULL OR zd.valid_flag = 0)
+          AND zd.valid_flag = 0 AND zd.zt IN ('1', '2')
           AND LENGTH(TRIM(zd.yt)) >= 2
         GROUP BY LEFT(zd.yt, 2), zd.qlxz
         ORDER BY LEFT(zd.yt, 2), zd.qlxz

siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/ZrzMapper.xml

@@ -94,6 +94,7 @@
         SELECT *, ST_AsEWKT(geom) as geom
         FROM vector.zrz
         WHERE bsm = #{bsm}
+          AND valid_flag = 0 AND zt IN ('1', '2')
     </select>
 
     <select id="getListByDjzqdm" resultMap="BaseResultMap">
@@ -106,6 +107,7 @@
         shyj, shy, shrq, fwdcb, fcct, bdcdyb, dcdw,ST_AsEWKT(geom) as geom
         FROM vector.zrz
         <where>
+            valid_flag = 0  and  zt in('1','2')
             <if test="djzqdm != null and djzqdm != ''">
                 and LEFT(zddm, 12) = #{djzqdm}
             </if>
@@ -115,6 +117,7 @@
     <select id="getList" resultMap="BaseResultMap">
         SELECT *, ST_AsEWKT(geom) as geom
         FROM vector.zrz
+        WHERE valid_flag = 0 AND zt IN ('1', '2')
     </select>
 
     <update id="update" parameterType="com.siwei.apply.domain.cadastre.Zrz">
@@ -194,6 +197,7 @@
             COUNT(*) as count,
             SUM(scjzmj) as total_scjzmj
         FROM vector.zrz
+        WHERE valid_flag = 0 AND zt IN ('1', '2')
         GROUP BY ghyt, ytmc, djzt
     </select>
 
@@ -206,6 +210,7 @@
             SUM(scjzmj) as total_area
         FROM vector.zrz
         <where>
+            valid_flag = 0 AND zt IN ('1', '2')
             <if test="ghytCodes != null and ghytCodes.size() > 0">
                 AND ghyt IN
                 <foreach item="code" collection="ghytCodes" open="(" separator="," close=")">