Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/fzss/HgxfxRwJgMapper.xml

@@ -26,6 +26,7 @@
 
     <select id="selectType" resultType="map">
         select
+        concat(to_char(now() , 'YYYYMMDDHH24MISSMS'),(ROW_NUMBER() OVER (ORDER BY v1.type_column))) id,
         <if test="type_dict != null and type_dict != ''">
             v2.mc yslx_name,
         </if>
@@ -51,6 +52,7 @@
 
     <select id="selectTypeList" resultType="map">
         select
+        concat(to_char(now() , 'YYYYMMDDHH24MISSMS'),(ROW_NUMBER() OVER (ORDER BY v1.yslx_name))) id,
         v1.yslx_name,v1.bsm,v1.rwbsm,v1.scxbsm,v1.mj,public.st_asewkt(ret_geom) geom
         from(
             select v0.yslx_name,v0.bsm bsm,v0.rwbsm rwbsm,v0.scxbsm scxbsm,mj::numeric mj,v0.geom ret_geom
@@ -63,6 +65,7 @@
 
     <select id="selectTypeScxList" resultType="map">
         select
+        concat(to_char(now() , 'YYYYMMDDHH24MISSMS'),(ROW_NUMBER() OVER (ORDER BY v1.type_column))) id,
         v1.type_column as yslx,yslx_name ,v1.bsm,v1.rwbsm,v1.scxbsm,round((v1.mj*0.0015),2) mj, public.st_asewkt(ret_geom) geom
         from(
             select v0.bsm,v0.rwbsm,v0.scxbsm,v0.type_column,v0.yslx_name,

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/fzss/HgxfxScxRwMapper.xml

@@ -17,6 +17,7 @@
                 and t1.pbsm = '0'
             </otherwise>
         </choose>
+        order by t1.xssx asc
     </select>
 
 </mapper>