Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -223,6 +223,8 @@ public class PlanProcedureTotalServiceImpl extends ServiceImpl<PlanProcedureTota
             Integer planNum = (Integer)prodProcedureTeam.get("num");
             double remainNum = planNum - allFileProcNum;
             if (remainNum < 0) remainNum = 0;
+            //四舍五入，精确到小数点后2位
+            remainNum = (double)Math.round(remainNum*100)/100;
             prodProcedureTeam.put("num", remainNum);
 
             Stream<String> sorted = list.stream().distinct().sorted();

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

@@ -5029,7 +5029,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             }
             planProcedureTotal.setTotalFillTime(workingTime);
             BigDecimal bigDecimal = new BigDecimal(workingTime);
-            bigDecimal=bigDecimal.divide(new BigDecimal(planProcedureTotal.getTotalWorkingHours()));
+            bigDecimal=bigDecimal.divide(new BigDecimal(planProcedureTotal.getTotalWorkingHours()), 4,RoundingMode.HALF_UP);
             bigDecimal=bigDecimal.multiply(new BigDecimal(100)).setScale(0,RoundingMode.HALF_UP);
             planProcedureTotal.setTotalProgress(bigDecimal.intValue());
 //            planProcedureTotal.setTotalProgress((int)((workingTime / planProcedureTotal.getTotalWorkingHours()) * 100));