1.修改核算人天

src/main/java/com/galaxis/manatee/dao/ChuanyunPersonDaysDao.java

@@ -5,6 +5,7 @@ import com.galaxis.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunLaborCostDO;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPersonDaysDO;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -37,6 +38,6 @@ public interface ChuanyunPersonDaysDao extends GalaxisRepository<ChuanyunPersonD
     @Query(value="SELECT chuanyun_day_log.object_id,SUM(chuanyun_day_log.hours_worked) AS hours_worked,chuanyun_log.user_id,chuanyun_day_log.project_id FROM chuanyun_day_log"+
             " LEFT JOIN chuanyun_log ON chuanyun_day_log.parent_object_id = chuanyun_log.object_id WHERE chuanyun_log.user_id = ?1 AND chuanyun_day_log.project_id=?2"+
             " GROUP BY chuanyun_day_log.project_id,chuanyun_log.user_id",nativeQuery = true)
-    ChuanyunPersonDaysDO getTotalWorkHour(String userId,String projectId);
+    ChuanyunPersonDaysDO getTotalWorkHour(@Param("userId") String userId, @Param("projectId") String projectId);
 
 }

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

@@ -187,7 +187,7 @@ public class ChuanyunProjectScheduledTask {
     /**
      * 项目核算登记
      */
-//    @Scheduled(fixedDelay = 3600000L)
+    @Scheduled(fixedDelay = 3600000L)
     private void saveAdjustAccount() {
         var objectMapper=new ObjectMapper();
         var flag = true;
@@ -300,7 +300,7 @@ public class ChuanyunProjectScheduledTask {
        List<ChuanyunPersonDaysDO> selfWorkHourList = chuanyunPersonDaysDao.getSelfWorkHour(projectId);
        for (ChuanyunPersonDaysDO chuanyunPersonDaysDO : selfWorkHourList) {
            //项目总工时
-           ChuanyunPersonDaysDO totalWorkHour = chuanyunPersonDaysDao.getTotalWorkHour(projectId,chuanyunPersonDaysDO.getUserId());
+           ChuanyunPersonDaysDO totalWorkHour = chuanyunPersonDaysDao.getTotalWorkHour(chuanyunPersonDaysDO.getUserId(),projectId);
            if (totalWorkHour != null){
                BigDecimal totalDays = (chuanyunPersonDaysDO.getHoursWorked().divide(totalWorkHour.getHoursWorked(), 2, BigDecimal.ROUND_HALF_UP)).multiply(standard);
                personDays= personDays.add(totalDays);
@@ -312,7 +312,7 @@ public class ChuanyunProjectScheduledTask {
     /**
      * 人力成本
      */
-    @Scheduled(fixedDelay = 3600000L)
+//    @Scheduled(fixedDelay = 3600000L)
     private void laborcost() {
         var flag = true;
         var pageSize = 20;
@@ -363,6 +363,10 @@ public class ChuanyunProjectScheduledTask {
         }
     }
 
+    /**
+     * 工时标准化
+     * @param chuanyunUserCompanyDO
+     */
     private void standardHour(ChuanyunUserCompanyDO chuanyunUserCompanyDO) {
         BigDecimal standard = new BigDecimal(8);
         //每人每个项目每天工时
@@ -392,6 +396,10 @@ public class ChuanyunProjectScheduledTask {
         });
     }
 
+    /**
+     * 薪资成本
+     * @param chuanyunUserCompanyDO
+     */
     private void selfCost(ChuanyunUserCompanyDO chuanyunUserCompanyDO) {
         //每月每项目工时
         List<ChuanyunSelfWorkHourDO> list = chuanyunSelfWorkHourDao.getMonthProjectHour(chuanyunUserCompanyDO.getUserId());