|
@@ -248,7 +248,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
workingTime = 0.0;
|
|
|
}
|
|
|
planProcedureTotal.setTotalFillTime(workingTime);
|
|
|
- planProcedureTotal.setTotalProgress((int)(workingTime / planProcedureTotal.getTotalWorkingHours()) * 100);
|
|
|
+ planProcedureTotal.setTotalProgress((int)((workingTime / planProcedureTotal.getTotalWorkingHours()) * 100));
|
|
|
System.out.println("planProcedureTotal.getId()=="+planProcedureTotal.getId()+"--进度 1 workingTime:"+workingTime+" totalWorkingHours:"+planProcedureTotal.getTotalWorkingHours()+" totalProgress:"+planProcedureTotal.getTotalProgress());
|
|
|
planProcedureTotalMapper.updateById(planProcedureTotal);
|
|
|
//检查该计划下的所有工序是否都已经完成
|
|
@@ -4772,7 +4772,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
workingTime = curReportSumItem.getWorkingTime();
|
|
|
}
|
|
|
planProcedureTotal.setTotalFillTime(workingTime);
|
|
|
- planProcedureTotal.setTotalProgress((int)(workingTime / planProcedureTotal.getTotalWorkingHours()) * 100);
|
|
|
+ planProcedureTotal.setTotalProgress((int)((workingTime / planProcedureTotal.getTotalWorkingHours()) * 100));
|
|
|
System.out.println("planProcedureTotal.getId()=="+planProcedureTotal.getId()+"--进度 2 workingTime:"+workingTime+" totalWorkingHours:"+planProcedureTotal.getTotalWorkingHours()+" totalProgress:"+planProcedureTotal.getTotalProgress());
|
|
|
planProcedureTotalMapper.updateById(planProcedureTotal);
|
|
|
return new HttpRespMsg();
|
|
@@ -4819,7 +4819,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
workingTime = curReportSumItem.getWorkingTime();
|
|
|
}
|
|
|
planProcedureTotal.setTotalFillTime(workingTime);
|
|
|
- planProcedureTotal.setTotalProgress((int)(workingTime / planProcedureTotal.getTotalWorkingHours()) * 100);
|
|
|
+ planProcedureTotal.setTotalProgress((int)((workingTime / planProcedureTotal.getTotalWorkingHours()) * 100));
|
|
|
System.out.println("planProcedureTotal.getId()=="+planProcedureTotal.getId()+"--进度 3 workingTime:"+workingTime+" totalWorkingHours:"+planProcedureTotal.getTotalWorkingHours()+" totalProgress:"+planProcedureTotal.getTotalProgress());
|
|
|
planProcedureTotalMapper.updateById(planProcedureTotal);
|
|
|
}
|