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

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/task/FzxzPlanSchedule.java

@@ -1,7 +1,7 @@
 package com.onemap.analyse.task;
 
 import com.onemap.analyse.domain.FzxzDTO;
-import com.onemap.analyse.domain.FzxzXzyzDTO;
+//import com.onemap.analyse.domain.FzxzXzyzDTO;
 import com.onemap.common.core.web.domain.StatusMsg;
 // import com.supermap.data.*;
 // import com.supermap.data.conversion.DataImport;

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

@@ -71,7 +71,7 @@
             from (
                 select v.*,v1.bsmmc yslx_name,v.scxbsm type_column  from t_fzss_hgxfx_rw_jg v
                 left join t_fzss_hgxfx_scx v1 on v.scxbsm = v1.bsm
-                where v.bsm = #{bsm} and v.rwbsm = #{rwbsm} and v1.pbsm = #{scxbsm}
+                where v.rwbsm = #{rwbsm} and v1.pbsm = #{scxbsm}
             )v0
             group by v0.bsm,v0.rwbsm,v0.scxbsm,v0.type_column,v0.yslx_name
         )v1