|
@@ -4951,7 +4951,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
dpetStatisticsProgressList.forEach(pt->{
|
|
|
BigDecimal planWorkTime = new BigDecimal(pt.get("planWorkTime") == null ? 0 : Double.valueOf(String.valueOf(pt.get("planWorkTime"))));
|
|
|
BigDecimal nowWorkTime = new BigDecimal(pt.get("nowWorkTime") == null ? 0 : Double.valueOf(String.valueOf(pt.get("nowWorkTime"))));
|
|
|
- if(nowWorkTime.compareTo(BigDecimal.ZERO)!=0){
|
|
|
+ if(nowWorkTime.compareTo(BigDecimal.ZERO)!=0&&planWorkTime.compareTo(BigDecimal.ZERO)!=0){
|
|
|
BigDecimal divide = nowWorkTime.divide(planWorkTime, 4, RoundingMode.HALF_UP);
|
|
|
pt.put("progress",format.format(divide.doubleValue()));
|
|
|
}
|