save

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

@@ -126,13 +126,15 @@ public class TGdbhGdServiceImpl implements ITGdbhGdService {
             retMap.put("mj_gq", 3572.6);
             retMap.put("mj_qm", 55.73);
             retMap.put("mjbh",  0.91);
+        }else {
+        // 原来是这个
+            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("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));
         }
-//        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("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;
     }