Просмотр исходного кода

耕地保护中永久基本农田,耕地查询全部数据

DESKTOP-2K9OVK9\siwei 7 месяцев назад
Родитель
Сommit
680effa972

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

@@ -54,6 +54,7 @@ public class TGdbhYjjbntServiceImpl implements ITGdbhYjjbntService {
         if (d1 == null || d1.size() == 0) {
         if (d1 == null || d1.size() == 0) {
             return null;
             return null;
         }
         }
+        dlbm = dlbmHanle(dlbm);
         TGdbhYjjbntServerDTO d2 = d1.get(0);
         TGdbhYjjbntServerDTO d2 = d1.get(0);
         String areacolumn = d2.getAreaColumn();
         String areacolumn = d2.getAreaColumn();
         String sjy = d2.getSjy();
         String sjy = d2.getSjy();
@@ -88,9 +89,7 @@ public class TGdbhYjjbntServiceImpl implements ITGdbhYjjbntService {
         if (d1 == null || d1.size() == 0) {
         if (d1 == null || d1.size() == 0) {
             return null;
             return null;
         }
         }
-        if (StringUtils.isEmpty(dlbm) || "01".equals(dlbm)) {
-            dlbm = null;
-        }
+        dlbm = dlbmHanle(dlbm);
         TGdbhYjjbntServerDTO d2 = d1.get(0);
         TGdbhYjjbntServerDTO d2 = d1.get(0);
         String areacolumn = d2.getAreaColumn();
         String areacolumn = d2.getAreaColumn();
         String sjy = d2.getSjy();
         String sjy = d2.getSjy();
@@ -101,6 +100,7 @@ public class TGdbhYjjbntServiceImpl implements ITGdbhYjjbntService {
 
 
     @Override
     @Override
     public Map<String, Object> ntzlbhqk(String sourceyaer, String targetyaer, String xzqhdm, String dlbm) {
     public Map<String, Object> ntzlbhqk(String sourceyaer, String targetyaer, String xzqhdm, String dlbm) {
+        dlbm = dlbmHanle(dlbm);
         Map<String, Object> d0old = ntzllist(sourceyaer, xzqhdm, dlbm);
         Map<String, Object> d0old = ntzllist(sourceyaer, xzqhdm, dlbm);
         Map<String, Object> d1new = ntzllist(targetyaer, xzqhdm, dlbm);
         Map<String, Object> d1new = ntzllist(targetyaer, xzqhdm, dlbm);
         BigDecimal d0_mj_m = (BigDecimal) d0old.get("mj_m");
         BigDecimal d0_mj_m = (BigDecimal) d0old.get("mj_m");
@@ -126,6 +126,7 @@ public class TGdbhYjjbntServiceImpl implements ITGdbhYjjbntService {
 
 
     @Override
     @Override
     public List<Map<String, Object>> ntzllnbhqk(String xzqhdm, String dlbm) {
     public List<Map<String, Object>> ntzllnbhqk(String xzqhdm, String dlbm) {
+        dlbm = dlbmHanle(dlbm);
         TGdbhYjjbntServerDTO d0_tGdbhYjjbntServer = new TGdbhYjjbntServerDTO();
         TGdbhYjjbntServerDTO d0_tGdbhYjjbntServer = new TGdbhYjjbntServerDTO();
         List<TGdbhYjjbntServerDTO> d1 = selectTGdbhYjjbntServerList(d0_tGdbhYjjbntServer);
         List<TGdbhYjjbntServerDTO> d1 = selectTGdbhYjjbntServerList(d0_tGdbhYjjbntServer);
         if (d1 == null || d1.size() == 0) {
         if (d1 == null || d1.size() == 0) {
@@ -155,6 +156,7 @@ public class TGdbhYjjbntServiceImpl implements ITGdbhYjjbntService {
 
 
     @Override
     @Override
     public List<Map<String, Object>> ntzlqxfl(String yaer, String xzqhdm, String dlbm) {
     public List<Map<String, Object>> ntzlqxfl(String yaer, String xzqhdm, String dlbm) {
+        dlbm = dlbmHanle(dlbm);
         TGdbhYjjbntServerDTO d0_tGdbhYjjbntServer = new TGdbhYjjbntServerDTO();
         TGdbhYjjbntServerDTO d0_tGdbhYjjbntServer = new TGdbhYjjbntServerDTO();
         d0_tGdbhYjjbntServer.setYear(yaer);
         d0_tGdbhYjjbntServer.setYear(yaer);
         List<TGdbhYjjbntServerDTO> d1 = selectTGdbhYjjbntServerList(d0_tGdbhYjjbntServer);
         List<TGdbhYjjbntServerDTO> d1 = selectTGdbhYjjbntServerList(d0_tGdbhYjjbntServer);
@@ -168,4 +170,12 @@ public class TGdbhYjjbntServiceImpl implements ITGdbhYjjbntService {
         return retMap;
         return retMap;
     }
     }
 
 
+    private String dlbmHanle(String dlbm) {
+        if (StringUtils.isEmpty(dlbm) || "01".equals(dlbm)) {
+            dlbm = null;
+        }
+        return dlbm;
+    }
+
+
 }
 }