|
@@ -216,13 +216,13 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
|
|
|
setFmwTime(fmwDetail, report);
|
|
|
} else {
|
|
|
FmwDetail fmwDetail = new FmwDetail();
|
|
|
- fmwDetail.setComposeTime(0.0);
|
|
|
- fmwDetail.setRepairTime(0.0);
|
|
|
- fmwDetail.setDebugTime(0.0);
|
|
|
- fmwDetail.setWaitingTime(0.0);
|
|
|
- fmwDetail.setAssistTime(0.0);
|
|
|
- fmwDetail.setBustripTime(0.0);
|
|
|
- fmwDetail.setCleanTime(0.0);
|
|
|
+ fmwDetail.setComposeTime(0.00);
|
|
|
+ fmwDetail.setRepairTime(0.00);
|
|
|
+ fmwDetail.setDebugTime(0.00);
|
|
|
+ fmwDetail.setWaitingTime(0.00);
|
|
|
+ fmwDetail.setAssistTime(0.00);
|
|
|
+ fmwDetail.setBustripTime(0.00);
|
|
|
+ fmwDetail.setCleanTime(0.00);
|
|
|
|
|
|
fmwDetail.setFmwId(financeMonthlyWorktime.getId());
|
|
|
fmwDetail.setProjectId(report.getProjectId());
|
|
@@ -510,7 +510,7 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
|
|
|
double v1 = fmwDetail.getCleanTime() == null ? 0 : fmwDetail.getCleanTime();
|
|
|
double v2 = fmwDetail.getBustripTime() == null ? 0 : fmwDetail.getBustripTime();
|
|
|
double sum = v1 + v2;
|
|
|
- DecimalFormat df = new DecimalFormat("#.#");
|
|
|
+ DecimalFormat df = new DecimalFormat("#.##");
|
|
|
double roundedSum = Double.parseDouble(df.format(sum));
|
|
|
cell8.setCellValue(roundedSum);
|
|
|
cell8.setCellStyle(dataStyle);
|
|
@@ -576,7 +576,7 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
|
|
|
style.setBorderRight(BorderStyle.THIN);
|
|
|
style.setAlignment(HorizontalAlignment.CENTER);
|
|
|
DataFormat format = workbook.createDataFormat();
|
|
|
- style.setDataFormat(format.getFormat("0.0"));
|
|
|
+ style.setDataFormat(format.getFormat("0.00"));
|
|
|
return style;
|
|
|
}
|
|
|
}
|