各项目经营分析管理费用总计问题调整

mjava-lanyun/src/main/java/com/malk/lanyun/controller/TimerController.java

@@ -70,6 +70,21 @@ public class TimerController {
         ncService.getNcCollection();
         return McR.success();
     }
+    @RequestMapping("testSix")
+    McR testSix() {
+        ncService.getNcCollectionOld();
+        return McR.success();
+    }
+    @RequestMapping("testSeven")
+    McR testSeven() {
+        ncService.getNcTax();
+        return McR.success();
+    }
+    @RequestMapping("testSevenOld")
+    McR testSevenOld(@RequestBody Map data) {
+        ncService.getNcTax(data);
+        return McR.success();
+    }
     @RequestMapping("testGetNcCollection")
     McR testGetNcCollection(@RequestBody Map data) {
         ncService.getNcCollection(data);

mjava-lanyun/src/main/java/com/malk/lanyun/service/NCService.java

@@ -22,6 +22,10 @@ public interface NCService {
 
     void getNcCollectionOld();
 
+    void getNcTax();
+
+    void getNcTax(Map data);
+
     //供应商付款
     void getSupplierPay();
 

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/FImplService.java

@@ -266,8 +266,8 @@ public class FImplService implements FService {
                             YDConf.searchCondition_TextFiled("textField_m5297e3q", uuid, "eq")
                     ));
                     // 回款状态与未回款金额记录, 用于催款函查询
-                    float figure = UtilMap.getFloat(dataForm, "numberField_lvdnme0z") - UtilMap.getFloat(dataForm, "numberField_lvg084l9");
-                    dataForm.put("radioField_m4qrz687", figure == 0 ? "是" : "否");
+                    BigDecimal figure = BigDecimal.valueOf(UtilMap.getDouble(dataForm, "numberField_lvdnme0z")).subtract(BigDecimal.valueOf(UtilMap.getDouble(dataForm, "numberField_lvg084l9")));
+                    dataForm.put("radioField_m4qrz687", BigDecimal.ZERO.compareTo(figure) == 0 ? "是" : "否");
                     dataForm.put("numberField_m4qrz685", figure);
 //                Thread.sleep(30); // QPS上限 40
                     ydClient.operateData(_initLYParam()