更改返回字段问题

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

@@ -80,11 +80,11 @@ public class TGdbhGdServiceImpl implements ITGdbhGdService {
         BigDecimal d1_mj_gq = (BigDecimal) d1new.get("mj_gq");
         BigDecimal d1_mj_qm = (BigDecimal) d1new.get("mj_qm");
         Map<String, Object> retMap = new HashMap<>();
+        retMap.put("gs", d0_gs - d1_gs);
+        retMap.put("mj", d0_mj.subtract(d1_mj));
         retMap.put("mj_m", d0_mj_m.subtract(d1_mj_m));
-        retMap.put("d1_gs", d0_gs - d1_gs);
-        retMap.put("d1_mj", d0_mj.subtract(d1_mj));
-        retMap.put("d1_mj_gq", d0_mj_gq.subtract(d1_mj_gq));
-        retMap.put("d1_mj_qm", d0_mj_qm.subtract(d1_mj_qm));
+        retMap.put("mj_gq", d0_mj_gq.subtract(d1_mj_gq));
+        retMap.put("mj_qm", d0_mj_qm.subtract(d1_mj_qm));
         retMap.put("mjbh", d0_mj_m.subtract(d1_mj_m).divide(d0_mj_m, 2, BigDecimal.ROUND_HALF_UP));
         return retMap;
     }
@@ -107,12 +107,12 @@ public class TGdbhGdServiceImpl implements ITGdbhGdService {
         }
 
         Map<String, Object> d4map = new HashMap<>();
+        d4map.put("gs",0);
+        d4map.put("mj", 0);
         d4map.put("mj_m", 0);
-        d4map.put("d1_gs", 0);
-        d4map.put("d1_mj", 0);
-        d4map.put("d1_mj_gq", 0);
-        d4map.put("d1_mj_qm", 0);
-        d4map.put("mjbh", 0);
+        d4map.put("mj_gq", 0);
+        d4map.put("mj_qm", 0);
+        d4map.put("mjbh",0);
         d4map.put("year", d1.get(d1.size() - 1).getYear());
         retList.add(d4map);
         return retList;

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

@@ -79,17 +79,18 @@ public class TGdbhYjjbntServiceImpl implements ITGdbhYjjbntService {
         BigDecimal d0_mj = (BigDecimal) d0old.get("mj");
         BigDecimal d0_mj_gq = (BigDecimal) d0old.get("mj_gq");
         BigDecimal d0_mj_qm = (BigDecimal) d0old.get("mj_qm");
+
         BigDecimal d1_mj_m = (BigDecimal) d1new.get("mj_m");
         Long d1_gs = (Long) d1new.get("gs");
         BigDecimal d1_mj = (BigDecimal) d1new.get("mj");
         BigDecimal d1_mj_gq = (BigDecimal) d1new.get("mj_gq");
         BigDecimal d1_mj_qm = (BigDecimal) d1new.get("mj_qm");
         Map<String, Object> retMap = new HashMap<>();
+        retMap.put("gs", d0_gs - d1_gs);
+        retMap.put("mj", d0_mj.subtract(d1_mj));
         retMap.put("mj_m", d0_mj_m.subtract(d1_mj_m));
-        retMap.put("d1_gs", d0_gs - d1_gs);
-        retMap.put("d1_mj", d0_mj.subtract(d1_mj));
-        retMap.put("d1_mj_gq", d0_mj_gq.subtract(d1_mj_gq));
-        retMap.put("d1_mj_qm", d0_mj_qm.subtract(d1_mj_qm));
+        retMap.put("mj_gq", d0_mj_gq.subtract(d1_mj_gq));
+        retMap.put("mj_qm", d0_mj_qm.subtract(d1_mj_qm));
         retMap.put("mjbh", d0_mj_m.subtract(d1_mj_m).divide(d0_mj_m, 2, BigDecimal.ROUND_HALF_UP));
         return retMap;
     }
@@ -112,12 +113,12 @@ public class TGdbhYjjbntServiceImpl implements ITGdbhYjjbntService {
         }
 
         Map<String, Object> d4map = new HashMap<>();
+        d4map.put("gs",0);
+        d4map.put("mj", 0);
         d4map.put("mj_m", 0);
-        d4map.put("d1_gs", 0);
-        d4map.put("d1_mj", 0);
-        d4map.put("d1_mj_gq", 0);
-        d4map.put("d1_mj_qm", 0);
-        d4map.put("mjbh", 0);
+        d4map.put("mj_gq", 0);
+        d4map.put("mj_qm", 0);
+        d4map.put("mjbh",0);
         d4map.put("year", d1.get(d1.size() - 1).getYear());
         retList.add(d4map);
         return retList;