永久基本农田占耕地现状

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/gdbh/TGdbhGdMapper.java

@@ -15,7 +15,7 @@ public interface TGdbhGdMapper {
 
     public Map<String, Object> ntzl(@Param("sjy") String sjy, @Param("areacolumn") String areacolumn, @Param("yaer") String yaer, @Param("xzqhdm") String xzqhdm, @Param("dlbm") String dlbm);
 
-    public Map<String, Object> gdnhmb(@Param("xzqhdm") String xzqhdm, @Param("dlbm") String dlbm);
+    public Map<String, Object> gdbhmb(@Param("xzqhdm") String xzqhdm, @Param("dlbm") String dlbm);
 
     public List<Map<String, Object>> ntzlfl(@Param("sjy") String sjy, @Param("areacolumn") String areacolumn, @Param("yaer") String yaer, @Param("xzqhdm") String xzqhdm, @Param("dlbm") String dlbm);
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/gdbh/TGdbhYjjbntMapper.java

@@ -15,6 +15,8 @@ public interface TGdbhYjjbntMapper {
 
     public Map<String, Object> ntzl(@Param("sjy") String sjy, @Param("areacolumn") String areacolumn, @Param("yaer") String yaer, @Param("xzqhdm") String xzqhdm, @Param("dlbm") String dlbm);
 
+    public Map<String, Object> gdxz();
+
     public List<Map<String, Object>> ntzlfl(@Param("sjy") String sjy, @Param("areacolumn") String areacolumn, @Param("yaer") String yaer, @Param("xzqhdm") String xzqhdm, @Param("dlbm") String dlbm);
 
     public List<Map<String, Object>> qxfl(@Param("sjy") String sjy, @Param("areacolumn") String areacolumn, @Param("yaer") String yaer, @Param("xzqhdm") String xzqhdm, @Param("dlbm") String dlbm);

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/TGdbhGdServiceImpl.java

@@ -48,25 +48,22 @@ public class TGdbhGdServiceImpl implements ITGdbhGdService {
         String areacolumn = d2.getAreaColumn();
         String sjy = d2.getSjy();
         Map<String, Object> retMap = tGdbhGdMapper.ntzl(sjy, areacolumn, yaer, xzqhdm, dlbm);
-        Map<String, Object> gdnhmbMap = null;
+        BigDecimal yjjbnt_mj = (BigDecimal) retMap.get("mj");
+
+        Map<String, Object> gdnhmbMap;
+        BigDecimal gd_mj;
         if (StringUtils.isEmpty(dlbm) || dlbm.equals("01")) {
-            gdnhmbMap = tGdbhGdMapper.gdnhmb(xzqhdm, dlbm);
+            gdnhmbMap = tGdbhGdMapper.gdbhmb(xzqhdm, dlbm);
+            gd_mj = (BigDecimal) gdnhmbMap.get("bh_mj");
+            retMap.putAll(gdnhmbMap);
         } else {
             gdnhmbMap = tGdbhGdMapper.ntzl(sjy, areacolumn, yaer, xzqhdm, "01");
+            gd_mj = (BigDecimal) gdnhmbMap.get("mj");
         }
-
-        if (gdnhmbMap == null || gdnhmbMap.size() == 0) {
-            retMap.put("zb", "暂无");
-            retMap.put("bh_mj", "暂无");
+        if (yjjbnt_mj.doubleValue() != 0 && gd_mj.doubleValue() != 0) {
+            retMap.put("zb", yjjbnt_mj.divide(gd_mj, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, RoundingMode.DOWN));
         } else {
-            BigDecimal yjjbnt_mj = (BigDecimal) retMap.get("mj");
-            BigDecimal gd_mj = (BigDecimal) gdnhmbMap.get("mj");
-            if (yjjbnt_mj.doubleValue() != 0 && gd_mj.doubleValue() != 0) {
-                retMap.put("zb", yjjbnt_mj.divide(gd_mj, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, RoundingMode.DOWN));
-            } else {
-                retMap.put("zb", 0);
-            }
-            retMap.put("bh_mj", gd_mj);
+            retMap.put("zb", 0);
         }
         return retMap;
     }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/TGdbhYjjbntServiceImpl.java

@@ -60,23 +60,21 @@ public class TGdbhYjjbntServiceImpl implements ITGdbhYjjbntService {
         String sjy = d2.getSjy();
         Map<String, Object> retMap = tGdbhYjjbntMapper.ntzl(sjy, areacolumn, yaer, xzqhdm, dlbm);
         Map<String, Object> gdMap = null;
+        BigDecimal yjjbnt_mj;
+        BigDecimal gd_mj;
         if (StringUtils.isEmpty(dlbm) || dlbm.equals("01")) {
-            gdMap = itGdbhGdService.ntzllist(yaer, xzqhdm, dlbm);
+            gdMap = tGdbhYjjbntMapper.gdxz();
+            yjjbnt_mj = (BigDecimal) retMap.get("mj_qm");
+            gd_mj = (BigDecimal) gdMap.get("mj_qm");
         } else {
             gdMap = tGdbhYjjbntMapper.ntzl(sjy, areacolumn, yaer, xzqhdm, "01");
+            yjjbnt_mj = (BigDecimal) retMap.get("mj");
+            gd_mj = (BigDecimal) gdMap.get("mj");
         }
-        if (gdMap == null || gdMap.size() == 0) {
-            retMap.put("zb", "暂无");
-            retMap.put("gd_mj", "暂无");
+        if (yjjbnt_mj.doubleValue() != 0 && gd_mj.doubleValue() != 0) {
+            retMap.put("zb", yjjbnt_mj.divide(gd_mj, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, RoundingMode.DOWN));
         } else {
-            BigDecimal yjjbnt_mj = (BigDecimal) retMap.get("mj");
-            BigDecimal gd_mj = (BigDecimal) gdMap.get("mj");
-            if (yjjbnt_mj.doubleValue() != 0 && gd_mj.doubleValue() != 0) {
-                retMap.put("zb", yjjbnt_mj.divide(gd_mj, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, RoundingMode.DOWN));
-            } else {
-                retMap.put("zb", 0);
-            }
-            retMap.put("gd_mj", gd_mj);
+            retMap.put("zb", 0);
         }
         return retMap;
     }

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/gdbh/TGdbhGdMapper.xml

@@ -15,8 +15,8 @@
         )t1)t2
     </select>
 
-    <select id="gdnhmb" parameterType="String" resultType="map">
-        select t2.*, round(mj*0.0015,2) mj_m, round(mj*0.0001,2) mj_gq, round(mj*0.000001,2) mj_qm from (
+    <select id="gdbhmb" parameterType="String" resultType="map">
+        select round(mj*0.0015,2) bh_mj_m, round(mj*0.0001,2) bh_mj_gq, round(mj*0.000001,2) bh_mj_qm,mj bh_mj from (
         select round((coalesce(sum(mj::numeric), 0)),2) mj ,count(*) gs  from (
         select "tbmj" as mj from vector."TB_GDBHMB"
         where bsm like concat(#{xzqhdm},'%')

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/gdbh/TGdbhYjjbntMapper.xml

@@ -39,4 +39,8 @@
     </select>
 
 
+    <select id="gdxz" parameterType="String" resultType="map">
+        SELECT  gd as mj_qm FROM vector."AFTER_JCSH" WHERE xzqdm ='460200'
+    </select>
+
 </mapper>