|
@@ -13746,7 +13746,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
if(afterSetPlanHour>0){
|
|
if(afterSetPlanHour>0){
|
|
planHour=planHour-afterSetPlanHour;
|
|
planHour=planHour-afterSetPlanHour;
|
|
}
|
|
}
|
|
- item.put("process",percentFormat.format(realHour/planHour));
|
|
|
|
|
|
+ if (planHour == 0) {
|
|
|
|
+ item.put("process", "0.00%");
|
|
|
|
+ } else {
|
|
|
|
+ item.put("process", percentFormat.format(realHour / planHour));
|
|
|
|
+ }
|
|
}else {
|
|
}else {
|
|
item.put("planHour",0);
|
|
item.put("planHour",0);
|
|
item.put("realHour",0);
|
|
item.put("realHour",0);
|
|
@@ -13801,7 +13805,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
if(afterSetPlanHour>0){
|
|
if(afterSetPlanHour>0){
|
|
planHour=planHour-afterSetPlanHour;
|
|
planHour=planHour-afterSetPlanHour;
|
|
}
|
|
}
|
|
- item.put("process",percentFormat.format(realHour/planHour));
|
|
|
|
|
|
+ if (planHour == 0) {
|
|
|
|
+ item.put("process", "0.00%");
|
|
|
|
+ } else {
|
|
|
|
+ item.put("process", percentFormat.format(realHour / planHour));
|
|
|
|
+ }
|
|
}else {
|
|
}else {
|
|
item.put("planHour",0);
|
|
item.put("planHour",0);
|
|
item.put("realHour",0);
|
|
item.put("realHour",0);
|
|
@@ -13858,7 +13866,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
if(afterSetPlanHour>0){
|
|
if(afterSetPlanHour>0){
|
|
planHour=planHour-afterSetPlanHour;
|
|
planHour=planHour-afterSetPlanHour;
|
|
}
|
|
}
|
|
- item.put("process",percentFormat.format(realHour/planHour));
|
|
|
|
|
|
+ if (planHour == 0) {
|
|
|
|
+ item.put("process", "0.00%");
|
|
|
|
+ } else {
|
|
|
|
+ item.put("process", percentFormat.format(realHour / planHour));
|
|
|
|
+ }
|
|
}else {
|
|
}else {
|
|
item.put("planHour",0);
|
|
item.put("planHour",0);
|
|
item.put("realHour",0);
|
|
item.put("realHour",0);
|