修改

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

@@ -28,6 +28,7 @@ import org.springframework.web.client.RestTemplate;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.FileOutputStream;
+import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -506,8 +507,12 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
 
                 // 5. 项目工时
                 Cell cell8 = row.createCell(7);
-//                cell8.setCellValue(fmwDetail.getProjectWorkingHours() == null ? 0 : fmwDetail.getProjectWorkingHours());
-                cell8.setCellValue(3);
+                double v1 = fmwDetail.getCleanTime() == null ? 0 : fmwDetail.getCleanTime();
+                double v2 = fmwDetail.getBustripTime() == null ? 0 : fmwDetail.getBustripTime();
+                double sum = v1 + v2;
+                DecimalFormat df = new DecimalFormat("#.#");
+                double roundedSum = Double.parseDouble(df.format(sum));
+                cell8.setCellValue(roundedSum);
                 cell8.setCellStyle(dataStyle);
 
                 // 6. 协助工时
@@ -521,8 +526,8 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
                 cell10.setCellStyle(dataStyle);
 
                 // 8. 工时合计（计算字段）
-                double totalHours = 0
-//                        (fmwDetail.getMaintanceTime() != null ? fmwDetail.getMaintanceTime() : 0)
+                double totalHours =
+                        (fmwDetail.getRepairTime() != null ? fmwDetail.getRepairTime() : 0)
                         + (fmwDetail.getDebugTime() != null ? fmwDetail.getDebugTime() : 0)
                         + (fmwDetail.getWaitingTime() != null ? fmwDetail.getWaitingTime() : 0)
                         + (fmwDetail.getAssistTime() != null ? fmwDetail.getAssistTime() : 0)