1.修改每日工时统计

src/main/java/com/galaxis/manatee/task/ChuanyunProjectScheduledTask.java

@@ -374,9 +374,11 @@ public class ChuanyunProjectScheduledTask {
      */
     private void standardHour(ChuanyunUserCompanyDO chuanyunUserCompanyDO) {
         BigDecimal standard = new BigDecimal(8);
+
         //每人每个项目每天工时
         List<ChuanyunWorkHourDO> selfList = chuanyunWorkHourDao.getSelfWorkHour(chuanyunUserCompanyDO.getUserId());
         selfList.forEach(self->{
+            if (self.getProjectType()!="生产项目"){
             try{
                 ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO = new ChuanyunSelfWorkHourDO();
                 chuanyunSelfWorkHourDO.setStatus(self.getStatus());
@@ -392,7 +394,7 @@ public class ChuanyunProjectScheduledTask {
                 ChuanyunWorkHourDO chuanyunWorkHourDO = chuanyunWorkHourDao.getDayWorkHour(chuanyunUserCompanyDO.getUserId(),self.getDayLogDate());
                 //工时标准化
                 if (chuanyunWorkHourDO != null) {
-                    if (chuanyunWorkHourDO.getHoursWorked().compareTo(standard)<0) {
+                    if (chuanyunWorkHourDO.getHoursWorked().compareTo(standard)<=0) {
                         chuanyunSelfWorkHourDO.setStandardWorkHour(self.getHoursWorked());
                     }else {
                         BigDecimal personDays = (self.getHoursWorked().divide(chuanyunWorkHourDO.getHoursWorked(), 2, RoundingMode.HALF_UP)).multiply(standard);
@@ -409,6 +411,7 @@ public class ChuanyunProjectScheduledTask {
                 log.error(""+self);
                 e.printStackTrace();
             }
+            }
         });
     }