更改面积统计字段

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/tdgy/LandIdelConfirmMapper.xml

@@ -4,7 +4,7 @@
 
 
     <select id="getIdleLandList" resultType="Map">
-        SELECT td.id,td.xmmc, td.srf, td.crmj, td.cqzh, public.st_asewkt(public.st_union(tb.geom))
+        SELECT td.id,td.xmmc, td.srf, td.crmj_m as crmj, td.cqzh, public.st_asewkt(public.st_union(tb.geom))
         FROM base.t_land_idle_confirm AS confirm
         JOIN vector.tdgy_sj AS td ON confirm.land_id = td.id::VARCHAR
         JOIN vector."TB_TDGY_SJ" AS tb ON tb.pid = td.id
@@ -24,12 +24,12 @@
         <if test="endTime != null">
             AND confirm.confirm_time &lt;= #{endTime}::timestamp + interval '1 day'
         </if>
-        GROUP BY td.id, td.srf, td.crmj, td.cqzh
+        GROUP BY td.id, td.srf, crmj, td.cqzh
         ORDER BY td.id
         LIMIT #{limit} OFFSET #{offset}
     </select>
     <select id="getIdleLandListInfo" resultType="Map">
-        SELECT COUNT(td.id) as total, COALESCE(SUM(td.crmj::NUMERIC), 0) as area
+        SELECT COUNT(td.id) as total, COALESCE(SUM(td.crmj_m::NUMERIC), 0) as area
         FROM base.t_land_idle_confirm AS confirm
         JOIN vector.tdgy_sj AS td ON confirm.land_id = td.id::VARCHAR
         WHERE confirm.is_idle = #{isConfirm} AND confirm.is_disposal = #{isDisposal}

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/tdgy/TdgyMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.onemap.apply.mapper.tdgy.TdgyMapper">
     <select id="getSuspectedIdleLand" resultType="map">
-        SELECT ts.id, ts.xmmc, ts.crmj, TO_CHAR(ts.ydkgsj, 'yyyy/MM/dd') AS ydkgsj,
+        SELECT ts.id, ts.xmmc, ts.crmj_m as crmj, TO_CHAR(ts.ydkgsj, 'yyyy/MM/dd') AS ydkgsj,
         public.st_asewkt(public.st_union(tb.geom)) AS geom
         FROM tdgy_sj ts
         LEFT JOIN "TB_TDGY_SJ" tb ON tb.pid = ts.id
@@ -16,12 +16,12 @@
         <if test="xzqh != null and xzqh != ''">
             AND ts.xzqh LIKE #{xzqh}|| '%'
         </if>
-        GROUP BY ts.id, ts.xmmc, ts.crmj, ts.ydkgsj
+        GROUP BY ts.id, ts.xmmc, crmj, ts.ydkgsj
         LIMIT #{limit} OFFSET #{offset};
     </select>
 
     <select id="getSuspectedIdleInfo" resultType="map">
-        SELECT count(*) as total, COALESCE(sum(ts.crmj::NUMERIC), 0) as area
+        SELECT count(*) as total, COALESCE(sum(ts.crmj_m::NUMERIC), 0) as area
         FROM tdgy_sj ts
         WHERE (ts.sfjg != true OR ts.sfjg IS NULL)
         AND (NOW() > ts.ydkgsj)
@@ -36,12 +36,12 @@
     </select>
 
     <select id="getLandCountArea" resultType="map">
-        select count(*) as total, COALESCE(sum(ts.crmj::NUMERIC), 0) as area
+        select count(*) as total, COALESCE(sum(ts.crmj_m::NUMERIC), 0) as area
         from tdgy_sj ts
     </select>
 
     <select id="getCountAreaSuspected" resultType="map">
-        SELECT count(ts.id) AS total, COALESCE(sum(ts.crmj::NUMERIC), 0) AS area
+        SELECT count(ts.id) AS total, COALESCE(sum(ts.crmj_m::NUMERIC), 0) AS area
         FROM tdgy_sj ts
         WHERE (ts.sfjg != true OR ts.sfjg IS NULL)
           AND (NOW() > ts.ydkgsj)
@@ -52,7 +52,7 @@
 
     <select id="getCountAreaConfirm" resultType="map">
         SELECT COUNT(td.ID) AS total,
-        COALESCE(SUM(td.crmj::NUMERIC),0) AS area
+        COALESCE(SUM(td.crmj_m::NUMERIC),0) AS area
         FROM base.t_land_idle_confirm AS confirm
         JOIN vector.tdgy_sj AS td ON confirm.land_id = td.ID::VARCHAR
         WHERE confirm.is_idle = TRUE
@@ -68,7 +68,7 @@
     </select>
 
     <select id="getCountAreaDisposal" resultType="map">
-        SELECT COUNT(td.id) AS total, COALESCE(SUM(td.crmj::NUMERIC),0) AS area
+        SELECT COUNT(td.id) AS total, COALESCE(SUM(td.crmj_m::NUMERIC),0) AS area
         FROM base.t_land_idle_confirm AS confirm
         JOIN vector.tdgy_sj AS td ON confirm.land_id = td.id::VARCHAR
         WHERE confirm.is_idle = true AND confirm.is_disposal = true
@@ -85,9 +85,9 @@
 
     <select id="getAreaByDistrict" resultType="map">
         SELECT ts.xzqh AS "districtCode",
-        COALESCE(SUM(ts.crmj::NUMERIC),0) AS "totalArea",
-        COALESCE(SUM(CASE WHEN confirm.is_idle = true THEN ts.crmj::NUMERIC ELSE 0 END),0) AS "confirmArea",
-        COALESCE(SUM(CASE WHEN confirm.is_idle = true AND confirm.is_disposal = true THEN ts.crmj:: NUMERIC ELSE 0
+        COALESCE(SUM(ts.crmj_m::NUMERIC),0) AS "totalArea",
+        COALESCE(SUM(CASE WHEN confirm.is_idle = true THEN ts.crmj_m::NUMERIC ELSE 0 END),0) AS "confirmArea",
+        COALESCE(SUM(CASE WHEN confirm.is_idle = true AND confirm.is_disposal = true THEN ts.crmj_m:: NUMERIC ELSE 0
         END),0) AS "disposalArea"
         FROM vector.tdgy_sj ts
         LEFT JOIN
@@ -104,7 +104,7 @@
     </select>
 
     <select id="getAreaByReason" resultType="map">
-        SELECT COALESCE(SUM(td.crmj::NUMERIC),0) AS area, confirm.idle_reason AS reason
+        SELECT COALESCE(SUM(td.crmj_m::NUMERIC),0) AS area, confirm.idle_reason AS reason
         FROM base.t_land_idle_confirm AS confirm
         JOIN vector.tdgy_sj AS td ON confirm.land_id = td.id::VARCHAR
         WHERE confirm.is_idle = true