收储统计更新表结构及字段

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/GjShijiShouchu.java

@@ -19,15 +19,13 @@ public class GjShijiShouchu {
 
     private String scsj;
 
-    private BigDecimal mj;
-
     private String scfs;
 
     private Double scnd;
 
     private String tdzl;
 
-    private String ytdyt;
+    private String ghyt;
 
     private String ytdsyqxz;
 
@@ -35,8 +33,6 @@ public class GjShijiShouchu {
 
     private String bz;
 
-    private String bsm;
-
     private String xzq;
 
     private String dabh;

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

@@ -34,17 +34,17 @@
     </insert>
 
     <select id="get" resultMap="gjShijiShouchuMap">
-        SELECT gid, yqsdw, scmj, scjg, scwh, scsj, mj, scfs, scnd, tdzl, ytdyt, ytdsyqxz, wzfbck, bz, bsm, xzq, dabh, shape_leng, shape_area, "项目名", sccb, "面积_亩", ST_AsEWKT(geom) as geom
-        FROM vector.gj_shiji_shouchu
+        SELECT gid, yqsdw, scmj, scjg, scwh, scsj, scfs, scnd, tdzl, ghyt, ytdsyqxz, wzfbck, bz, xzq, dabh, shape_leng, shape_area, xmmc, sccb, mj_m, ST_AsEWKT(geom) as geom
+        FROM vector.gj_shouchu_xiangmu_shiji
         WHERE gid = #{gid}
     </select>
 
     <select id="getList" parameterType="com.siwei.apply.domain.vo.GjShijiShouchuFilterVo" resultMap="gjShijiShouchuMap">
-        SELECT gid, yqsdw, scmj, scjg, scwh, scsj, mj, scfs, scnd, tdzl, ytdyt, ytdsyqxz, wzfbck, bz, bsm, xzq, dabh, shape_leng, shape_area, "项目名", sccb, "面积_亩", ST_AsEWKT(geom) as geom
-        FROM vector.gj_shiji_shouchu
+        SELECT gid, yqsdw, scmj, scjg, scwh, scsj, scfs, scnd, tdzl, ghyt, ytdsyqxz, wzfbck, bz, xzq, dabh, shape_leng, shape_area, xmmc, sccb, mj_m, ST_AsEWKT(geom) as geom
+        FROM vector.gj_shouchu_xiangmu_shiji
         <where>
             <if test="xmmc != null and xmmc != ''">
-                AND "项目名" LIKE CONCAT('%', #{xmmc}, '%')
+                AND xmmc LIKE CONCAT('%', #{xmmc}, '%')
             </if>
             <if test="xzq != null and xzq != ''">
                 AND xzq = #{xzq}
@@ -65,10 +65,10 @@
 
     <select id="getCount" parameterType="com.siwei.apply.domain.vo.GjShijiShouchuFilterVo" resultType="int">
         SELECT COUNT(*)
-        FROM vector.gj_shiji_shouchu
+        FROM vector.gj_shouchu_xiangmu_shiji
         <where>
             <if test="xmmc != null and xmmc != ''">
-                AND "项目名" LIKE CONCAT('%', #{xmmc}, '%')
+                AND xmmc LIKE CONCAT('%', #{xmmc}, '%')
             </if>
             <if test="xzq != null and xzq != ''">
                 AND xzq = #{xzq}
@@ -86,36 +86,34 @@
     </select>
 
     <update id="update" parameterType="com.siwei.apply.domain.GjShijiShouchu">
-        UPDATE vector.gj_shiji_shouchu
+        UPDATE vector.gj_shouchu_xiangmu_shiji
         <set>
             <if test="yqsdw != null">yqsdw = #{yqsdw},</if>
             <if test="scmj != null">scmj = #{scmj},</if>
             <if test="scjg != null">scjg = #{scjg},</if>
             <if test="scwh != null">scwh = #{scwh},</if>
             <if test="scsj != null">scsj = #{scsj},</if>
-            <if test="mj != null">mj = #{mj},</if>
             <if test="scfs != null">scfs = #{scfs},</if>
             <if test="scnd != null">scnd = #{scnd},</if>
             <if test="tdzl != null">tdzl = #{tdzl},</if>
-            <if test="ytdyt != null">ytdyt = #{ytdyt},</if>
+            <if test="ghyt != null">ghyt = #{ghyt},</if>
             <if test="ytdsyqxz != null">ytdsyqxz = #{ytdsyqxz},</if>
             <if test="wzfbck != null">wzfbck = #{wzfbck},</if>
             <if test="bz != null">bz = #{bz},</if>
-            <if test="bsm != null">bsm = #{bsm},</if>
             <if test="xzq != null">xzq = #{xzq},</if>
             <if test="dabh != null">dabh = #{dabh},</if>
             <if test="shapeLeng != null">shape_leng = #{shapeLeng},</if>
             <if test="shapeArea != null">shape_area = #{shapeArea},</if>
-            <if test="xmmc != null">"项目名" = #{xmmc},</if>
+            <if test="xmmc != null">xmmc = #{xmmc},</if>
             <if test="sccb != null">sccb = #{sccb},</if>
-            <if test="mjMu != null">"面积_亩" = #{mjMu},</if>
+            <if test="mjMu != null">mj_m = #{mjMu},</if>
             <if test="geom != null">geom = ST_GeomFromEWKT(#{geom}),</if>
         </set>
         WHERE gid = #{gid}
     </update>
 
     <delete id="batchDelete">
-        DELETE FROM vector.gj_shiji_shouchu
+        DELETE FROM vector.gj_shouchu_xiangmu_shiji
         WHERE gid IN
         <foreach collection="gids" item="gid" open="(" separator="," close=")">
             #{gid}
@@ -126,11 +124,11 @@
     <select id="getCompleteStatsByMethod" resultType="map">
         SELECT
         COALESCE(scfs, '其他') AS category,
-        ROUND(COALESCE(SUM("面积_亩"), 0), 2) AS complate_area
-        FROM vector.gj_shiji_shouchu
+        ROUND(COALESCE(SUM(CAST(mj_m AS NUMERIC)), 0), 2) AS complate_area
+        FROM vector.gj_shouchu_xiangmu_shiji
         WHERE 1=1
         <if test="year != null and year != '' and year != '0'">
-            AND scnd = #{year}::NUMERIC
+            AND scnd = #{year}
         </if>
         GROUP BY COALESCE(scfs, '其他')
         ORDER BY complate_area DESC
@@ -140,54 +138,54 @@
 
     <select id="getStatsByYear" resultType="map">
         SELECT
-            COALESCE(CAST(scnd AS VARCHAR), '其它') AS year,
+            COALESCE(scnd, '其它') AS year,
             ROUND(COALESCE(SUM(CAST(scmj AS NUMERIC)), 0), 2) AS in_data_area
-        FROM vector.gj_shiji_shouchu
+        FROM vector.gj_shouchu_xiangmu_shiji
         GROUP BY scnd
         ORDER BY year
     </select>
 
     <select id="getStatsByYearAndUse" resultType="map">
         SELECT
-            COALESCE(ytdyt, '其它') AS use_name,
+            COALESCE(ghyt, '其它') AS use_name,
             ROUND(COALESCE(SUM(CAST(scmj AS NUMERIC)), 0), 2) AS in_data_area
-        FROM vector.gj_shiji_shouchu
+        FROM vector.gj_shouchu_xiangmu_shiji
         <where>
             <if test="year != null and year != '' and year != '0'">
-                AND CAST(scnd AS VARCHAR) = #{year}
+                AND scnd = #{year}
             </if>
         </where>
-        GROUP BY ytdyt
+        GROUP BY ghyt
         ORDER BY in_data_area DESC
     </select>
 
     <select id="getByGeomIntersects" resultMap="gjShijiShouchuMap">
-        SELECT gid, yqsdw, scmj, scjg, scwh, scsj, mj, scfs, scnd, tdzl, ytdyt, ytdsyqxz, wzfbck, bz, bsm, xzq, dabh, shape_leng, shape_area, "项目名", sccb, "面积_亩", ST_AsEWKT(geom) as geom
-        FROM vector.gj_shiji_shouchu
+        SELECT gid, yqsdw, scmj, scjg, scwh, scsj, scfs, scnd, tdzl, ghyt, ytdsyqxz, wzfbck, bz, xzq, dabh, shape_leng, shape_area, xmmc, sccb, mj_m, ST_AsEWKT(geom) as geom
+        FROM vector.gj_shouchu_xiangmu_shiji
         WHERE public.ST_Intersects(geom, public.ST_GeomFromEWKT(#{ewkt}))
     </select>
 
     <select id="gjShijiShouchuListByYear" resultType="com.siwei.apply.domain.res.TdgyStatisticsRes" parameterType="String">
         SELECT
             '' AS projectId,
-            "项目名" AS xmmc,
+            xmmc AS xmmc,
             yqsdw AS company,
             CAST(gid AS VARCHAR) AS nodeId,
-            COALESCE(ytdyt, '其它') AS tdyt,
+            COALESCE(ghyt, '其它') AS tdyt,
             scfs AS gyfs,
             to_timestamp(scsj, 'YYYY/MM/DD') AS gysj,
-            ROUND("面积_亩", 2) AS mjMu,
+            ROUND(CAST(mj_m AS NUMERIC), 2) AS mjMu,
             bz,
-            sccb AS cost,
+            CAST(sccb AS NUMERIC) AS cost,
             scnd   as nf,
             ST_AsEWKT(geom) AS geom
-        FROM vector.gj_shiji_shouchu
+        FROM vector.gj_shouchu_xiangmu_shiji
         WHERE 1=1
         <if test="year != null and year != '' and year != '0'">
-            AND CAST(scnd AS VARCHAR) = #{year}
+            AND scnd = #{year}
         </if>
         <if test="landTypeCode != null">
-            AND ytdyt LIKE CONCAT('%', #{landTypeCode}, '%')
+            AND ghyt LIKE CONCAT('%', #{landTypeCode}, '%')
         </if>
         <if test="startTime != null and startTime != ''">
             AND scsj &gt;= #{startTime}
@@ -196,9 +194,9 @@
             AND scsj &lt;= #{endTime}
         </if>
         <if test="(startYear != null and startYear != '') and (endYear != null and endYear != '')">
-            AND scnd::NUMERIC BETWEEN #{startYear}::NUMERIC AND #{endYear}::NUMERIC
+            AND CAST(scnd AS NUMERIC) BETWEEN #{startYear}::NUMERIC AND #{endYear}::NUMERIC
         </if>
-        order BY "项目名"
+        order BY xmmc
     </select>
 
     <select id="getActualProject" resultType="Map" parameterType="String">
@@ -209,23 +207,21 @@
             scjg,
             scwh,
             scsj,
-            mj,
             scfs,
             scnd,
             tdzl,
-            ytdyt,
+            ghyt,
             ytdsyqxz,
             wzfbck,
             bz,
-            bsm,
             xzq,
             dabh,
-            "项目名" AS xmmc,
+            xmmc,
             sccb,
-            "面积_亩" AS mj_mu,
+            mj_m,
             shape_area,
             ST_AsEWKT(geom) AS geom
-        FROM vector.gj_shiji_shouchu
+        FROM vector.gj_shouchu_xiangmu_shiji
         WHERE gid::varchar = #{gid}
         LIMIT 1
     </select>