gushoubang пре 4 месеци
родитељ
комит
d83bdc5efc

+ 0 - 1
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/yzt/ZymlTreeDataDTO.java

@@ -2,7 +2,6 @@ package com.onemap.apply.domain.yzt;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 
 import java.util.ArrayList;
 import java.util.Date;

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

@@ -111,12 +111,28 @@ 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("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));
+        // TODO 测试数据
+        if (targetyaer.equals("2023")) {
+            retMap.put("gs",3428);
+            retMap.put("mj", 49725985.56);
+            retMap.put("mj_m", 60588.98);
+            retMap.put("mj_gq", 4972.6);
+            retMap.put("mj_qm", 46.73);
+            retMap.put("mjbh",  0.8);
+        }else if(targetyaer.equals("2022")){
+            retMap.put("gs",2228);
+            retMap.put("mj", 55725985.56);
+            retMap.put("mj_m", 48588.98);
+            retMap.put("mj_gq", 3572.6);
+            retMap.put("mj_qm", 55.73);
+            retMap.put("mjbh",  0.91);
+        }
+//        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;
     }