1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -5042,12 +5042,18 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 item.add(String.valueOf(map.get("unitPrice")));
             }else {
                 item.add(String.valueOf(map.get("workingTime"))+" h");
-                item.add(String.valueOf(map.get("unitPrice"))+" 元/h");
+                item.add((map.get("unitPrice")==null?0:String.valueOf(map.get("unitPrice")))+" 元/h");
             }
             String cost = String.valueOf(map.get("cost"));
-            BigDecimal finishNum = new BigDecimal(map.get("finishNum")==null?String.valueOf(0):String.valueOf(map.get("finishNum")));
-            finishNum=finishNum.multiply(new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")))).setScale(2,RoundingMode.HALF_UP);
-            item.add(String.valueOf(finishNum.doubleValue()));
+            if(planType==0){
+                BigDecimal finishNum = new BigDecimal(map.get("finishNum")==null?String.valueOf(0):String.valueOf(map.get("finishNum")));
+                finishNum=finishNum.multiply(new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")))).setScale(2,RoundingMode.HALF_UP);
+                item.add(String.valueOf(finishNum.doubleValue()));
+            }else {
+                BigDecimal workingTime = new BigDecimal(map.get("workingTime")==null?String.valueOf(0):String.valueOf(map.get("workingTime")));
+                workingTime=workingTime.multiply(new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")))).setScale(2,RoundingMode.HALF_UP);
+                item.add(String.valueOf(workingTime.doubleValue()));
+            }
 //            item.add(cost);
             item.add(String.valueOf(map.get("userName")));
             item.add(String.valueOf(map.get("createDate")));