有效工时率编写,待威派格提供人员名单,代码修改2

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

@@ -11325,7 +11325,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             System.out.println("============="+inActiveDays);
             System.out.println("============="+isActiveCount);
             laborHourRateVo.setDay_time(8);
-            laborHourRateVo.setRate(timeSum/(8*inActiveDays+isActiveCount*8*dayCount)*100);
+
+            BigDecimal bd = new BigDecimal(timeSum/(8*inActiveDays+isActiveCount*8*dayCount)*100);
+            bd = bd.setScale(2, RoundingMode.HALF_UP);
+            laborHourRateVo.setRate(bd.doubleValue());
             laborHourRateVos.add(laborHourRateVo);
         }
 
@@ -11339,7 +11342,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         laborHourRateVo.setTotal_time(sumTotalTime);
         laborHourRateVo.setDay_time(8);
         laborHourRateVo.setDate_count(dayCount);
-        laborHourRateVo.setRate(totalWorkTime/sumTotalTime*100);
+
+        BigDecimal bd = new BigDecimal(totalWorkTime/sumTotalTime*100);
+        bd = bd.setScale(2, RoundingMode.HALF_UP);
+        laborHourRateVo.setRate(bd.doubleValue());
 
         laborHourRateVos.add(laborHourRateVo);
 

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/UserMapper.xml

@@ -193,7 +193,6 @@
             #{id}
         </foreach>
         AND r.create_date BETWEEN #{startDate} AND #{endDate})
         AND is_active=1 AND induction_date &lt;= #{startDate}
     </select>