修复项目成本查询bug

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -244,7 +244,7 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
                 //如果是普通查询就走这个方法
                 ProjectCostHuiji projectCostHuiji1;  //筛选合计
                 if (taskList.isEmpty()) {
-                    projectCostHuiji1 = projectCostHuijiService.costHJSumByProjectCost(projectCost);
+                    projectCostHuiji1 = initProjectCostHuiji();
                 } else {
                     projectCostHuiji1 = projectCostHuijiService.costHJSumByProjectCostByTaskList(taskList);
                 }
@@ -298,10 +298,12 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
             BigDecimal lre = projectCostHuiji1.getLre(); //利润额
             BigDecimal cpt = BigDecimal.ZERO; //固定比较值
             BigDecimal lrl = BigDecimal.ZERO; //利润率
-            if (contractfpe.compareTo(cpt)!= 0){
-                lrl = lre.divide(contractfpe, 2, RoundingMode.HALF_UP);
-            }else if (estimationcoat.compareTo(cpt) != 0){
-                lrl = lre.divide(estimationcoat,2,RoundingMode.HALF_UP);
+            if (lre.compareTo(cpt) != 0) {
+                if (contractfpe.compareTo(cpt) != 0) {
+                    lrl = lre.divide(contractfpe, 2, RoundingMode.HALF_UP);
+                } else if (estimationcoat.compareTo(cpt) != 0) {
+                    lrl = lre.divide(estimationcoat, 2, RoundingMode.HALF_UP);
+                }
             }
             projectCostHuiji1.setLrl(lrl);
 
@@ -346,6 +348,27 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
         return x;
     }
 
+    private ProjectCostHuiji initProjectCostHuiji(){
+        ProjectCostHuiji huiji = new ProjectCostHuiji();
+        huiji.setContractfpe(BigDecimal.ZERO);
+        huiji.setEstimationcoat(BigDecimal.ZERO);
+        huiji.setZcb(BigDecimal.ZERO);
+        huiji.setYzsl(0);
+        huiji.setLre(BigDecimal.ZERO);
+        huiji.setLrl(BigDecimal.ZERO);
+        huiji.setClf(BigDecimal.ZERO);
+        huiji.setZyf(BigDecimal.ZERO);
+        huiji.setSwf(BigDecimal.ZERO);
+        huiji.setWxf(BigDecimal.ZERO);
+        huiji.setGdzczj(BigDecimal.ZERO);
+        huiji.setGlf(BigDecimal.ZERO);
+        huiji.setRldlf(BigDecimal.ZERO);
+        huiji.setWorkhour(BigDecimal.ZERO);
+        huiji.setScgs(BigDecimal.ZERO);
+        huiji.setSjgs(BigDecimal.ZERO);
+        return huiji;
+    }
+
     /**
      * 添加
      *