收储统计更新表结构数据

siwei-modules/siwei-apply/src/main/resources/mapper/GjShijiShouchuMapper.xml

@@ -11,28 +11,26 @@
         <result column="scjg" property="scjg"/>
         <result column="scwh" property="scwh"/>
         <result column="scsj" property="scsj"/>
-        <result column="mj" property="mj"/>
         <result column="scfs" property="scfs"/>
         <result column="scnd" property="scnd"/>
         <result column="tdzl" property="tdzl"/>
-        <result column="ytdyt" property="ytdyt"/>
+        <result column="ghyt" property="ghyt"/>
         <result column="ytdsyqxz" property="ytdsyqxz"/>
         <result column="wzfbck" property="wzfbck"/>
         <result column="bz" property="bz"/>
-        <result column="bsm" property="bsm"/>
         <result column="xzq" property="xzq"/>
         <result column="dabh" property="dabh"/>
         <result column="shape_leng" property="shapeLeng"/>
         <result column="shape_area" property="shapeArea"/>
-        <result column="项目名" property="xmmc"/>
+        <result column="xmmc" property="xmmc"/>
         <result column="sccb" property="sccb"/>
-        <result column="面积_亩" property="mjMu"/>
+        <result column="mj_m" property="mjMu"/>
         <result column="geom" property="geom"/>
     </resultMap>
 
     <insert id="add" parameterType="com.siwei.apply.domain.GjShijiShouchu">
-        INSERT INTO vector.gj_shiji_shouchu (yqsdw, scmj, scjg, scwh, scsj, mj, scfs, scnd, tdzl, ytdyt, ytdsyqxz, wzfbck, bz, bsm, xzq, dabh, shape_leng, shape_area, "项目名", sccb, "面积_亩", geom)
-        VALUES (#{yqsdw}, #{scmj}, #{scjg}, #{scwh}, #{scsj}, #{mj}, #{scfs}, #{scnd}, #{tdzl}, #{ytdyt}, #{ytdsyqxz}, #{wzfbck}, #{bz}, #{bsm}, #{xzq}, #{dabh}, #{shapeLeng}, #{shapeArea}, #{xmmc}, #{sccb}, #{mjMu}, ST_GeomFromEWKT(#{geom}))
+        INSERT INTO vector.gj_shouchu_xiangmu_shiji (yqsdw, scmj, scjg, scwh, scsj, scfs, scnd, tdzl, ghyt, ytdsyqxz, wzfbck, bz, xzq, dabh, shape_leng, shape_area, xmmc, sccb, mj_m, geom)
+        VALUES (#{yqsdw}, #{scmj}, #{scjg}, #{scwh}, #{scsj}, #{scfs}, #{scnd}, #{tdzl}, #{ghyt}, #{ytdsyqxz}, #{wzfbck}, #{bz}, #{xzq}, #{dabh}, #{shapeLeng}, #{shapeArea}, #{xmmc}, #{sccb}, #{mjMu}, ST_GeomFromEWKT(#{geom}))
     </insert>
 
     <select id="get" resultMap="gjShijiShouchuMap">

siwei-modules/siwei-apply/src/main/resources/mapper/GjShouchuJihuaMapper.xml

@@ -7,36 +7,36 @@
     <select id="getPlanSummaryByYear" resultType="map">
         SELECT
             COUNT(*) AS plan_project_count,
-            ROUND(COALESCE(SUM(mj_mu), 0), 2) AS plan_area,
+            ROUND(COALESCE(SUM(mj_m), 0), 2) AS plan_area,
             ROUND(COALESCE(SUM(sccb), 0), 2) AS plan_cost
-        FROM vector.gj_shouchu_jihua
+        FROM vector.gj_shouchu_xiangmu
         WHERE 1=1
         <if test="year != null and year != '' and year != '0'">
-            AND scnd = #{year}
+            AND scnf = #{year}
         </if>
     </select>
 
     <select id="getPlanStatsByLandUse" resultType="map">
         SELECT
-            COALESCE(tdyt, '其他') AS category,
-            ROUND(COALESCE(SUM(mj_mu), 0), 2) AS plan_area
-        FROM vector.gj_shouchu_jihua
+            COALESCE(ghyt, '其他') AS category,
+            ROUND(COALESCE(SUM(mj_m), 0), 2) AS plan_area
+        FROM vector.gj_shouchu_xiangmu
         WHERE 1=1
         <if test="year != null and year != '' and year != '0'">
-            AND scnd = #{year}
+            AND scnf = #{year}
         </if>
-        GROUP BY COALESCE(tdyt, '其他')
+        GROUP BY COALESCE(ghyt, '其他')
         ORDER BY plan_area DESC
     </select>
 
     <select id="getPlanStatsByMethod" resultType="map">
         SELECT
             COALESCE(scfs, '其他') AS category,
-            ROUND(COALESCE(SUM(mj_mu), 0), 2) AS plan_area
-        FROM vector.gj_shouchu_jihua
+            ROUND(COALESCE(SUM(mj_m), 0), 2) AS plan_area
+        FROM vector.gj_shouchu_xiangmu
         WHERE 1=1
         <if test="year != null and year != '' and year != '0'">
-            AND scnd = #{year}
+            AND scnf = #{year}
         </if>
         GROUP BY COALESCE(scfs, '其他')
         ORDER BY plan_area DESC
@@ -47,32 +47,30 @@
             CAST(gid AS VARCHAR) AS projectId,
             CAST(gid AS VARCHAR) AS nodeId,
             '暂无' AS company,
-            mj_pfm AS mjPfm,
-            ROUND(COALESCE(mj_mu, 0), 2) AS mjMu,
-            COALESCE(xmmc, htmc, xssmc, dzjgh, CONCAT('收储计划-', gid)) AS xmmc,
-            tdyt,
+            mj_12 AS mjPfm,
+            ROUND(COALESCE(mj_m, 0), 2) AS mjMu,
+            COALESCE(xmmc, htmc, dzjgh, CONCAT('收储计划-', gid)) AS xmmc,
+            ghyt AS tdyt,
             scfs AS gyfs,
-            COALESCE(qdrq, TO_DATE(scnd || '-01-01', 'YYYY-MM-DD')) AS gysj,
+            COALESCE(qdrq, TO_DATE(scnf || '-01-01', 'YYYY-MM-DD')) AS gysj,
             sccb AS cost,
-            bz,
             ST_AsEWKT(geom) AS geom
-        FROM vector.gj_shouchu_jihua
+        FROM vector.gj_shouchu_xiangmu
         WHERE 1=1
         <if test="year != null and year != '' and year != '0'">
-            AND scnd = #{year}
+            AND scnf = #{year}
         </if>
         <if test="keyWord != null and keyWord != ''">
             AND (
                 COALESCE(xmmc, '') LIKE CONCAT('%', #{keyWord}, '%')
                 OR COALESCE(htmc, '') LIKE CONCAT('%', #{keyWord}, '%')
-                OR COALESCE(xssmc, '') LIKE CONCAT('%', #{keyWord}, '%')
                 OR COALESCE(dzjgh, '') LIKE CONCAT('%', #{keyWord}, '%')
-                OR COALESCE(tdyt, '') LIKE CONCAT('%', #{keyWord}, '%')
+                OR COALESCE(ghyt, '') LIKE CONCAT('%', #{keyWord}, '%')
                 OR COALESCE(scfs, '') LIKE CONCAT('%', #{keyWord}, '%')
             )
         </if>
         <if test="(startYear != null and startYear != '') and (endYear != null and endYear != '')">
-            AND scnd::NUMERIC BETWEEN #{startYear}::NUMERIC AND #{endYear}::NUMERIC
+            AND scnf::NUMERIC BETWEEN #{startYear}::NUMERIC AND #{endYear}::NUMERIC
         </if>
         ORDER BY gid
     </select>
@@ -80,43 +78,35 @@
     <select id="getPlanProject" resultType="Map">
         SELECT
             gid,
-            scnd,
+            xmmc,
+            sccb,
+            scsj,
+            scnf,
+            tdyyt,
+            ghyt,
+            mj_m,
             scfs,
-            COALESCE(xmmc, htmc, xssmc, dzjgh, CONCAT('收储计划-', gid)) AS xmmc,
-            tdyt,
-            mj_pfm,
-            mj_mu,
-            bz,
-            xzqdm,
+            dkmc,
             xzqmc,
+            wz,
+            jhxzmj,
+            yscmj,
+            bndscmj,
+            qqkf,
+            bndkfmj,
+            bndwccb,
+            ngymj,
+            ngysj,
+            gyfs,
+            yjgysr,
+            mj_12,
+            xzqdm,
             dzjgh,
-            sqsmc,
-            xssmc,
             htbh,
             htmc,
-            gdfs,
             qdrq,
-            yddgrq,
-            ydjgrq,
-            sjkgsj,
-            sjjgsj,
-            lrxztdnf,
-            czfs,
-            dgzpzt,
-            sgxkzt,
-            nybz,
-            jk,
-            gdmj,
-            objectid,
-            fid,
-            shape_leng,
-            shape_area,
-            source_file,
-            source_layer,
-            source_id,
-            raw_props::text AS raw_props,
             ST_AsEWKT(geom) AS geom
-        FROM vector.gj_shouchu_jihua
+        FROM vector.gj_shouchu_xiangmu
         WHERE gid::varchar = #{gid}
         LIMIT 1
     </select>