|
|
@@ -14,6 +14,7 @@ import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunSaveDTO;
|
|
|
import com.galaxis.manatee.entity.chuanyun.dto.Filter;
|
|
|
import com.galaxis.manatee.exception.BigSizeException;
|
|
|
import com.galaxis.manatee.manager.ChuanYunManager;
|
|
|
+import com.galaxis.manatee.service.LogService;
|
|
|
import com.galaxis.manatee.service.LogStandardService;
|
|
|
import com.galaxis.manatee.service.LogUpdateService;
|
|
|
import com.galaxis.manatee.util.ChuanyunLocalDateTimeDeserializer;
|
|
|
@@ -50,8 +51,9 @@ public class WorkHourStatistics {
|
|
|
private final ChuanyunMemberCostDao chuanyunMemberCostDao;
|
|
|
private final LogStandardService logStandardService;
|
|
|
private final LogUpdateService logUpdateService;
|
|
|
+ private final LogService logService;
|
|
|
|
|
|
- public WorkHourStatistics(ChuanYunManager chuanYunManager, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunWorkHourDao chuanyunWorkHourDao, ChuanyunSelfWorkHourDao chuanyunSelfWorkHourDao, ChuanyunSelfCostDao chuanyunSelfCostDao, ChuanyunMemberCostDao chuanyunMemberCostDao, LogStandardService logStandardService, LogUpdateService logUpdateService) {
|
|
|
+ public WorkHourStatistics(ChuanYunManager chuanYunManager, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunWorkHourDao chuanyunWorkHourDao, ChuanyunSelfWorkHourDao chuanyunSelfWorkHourDao, ChuanyunSelfCostDao chuanyunSelfCostDao, ChuanyunMemberCostDao chuanyunMemberCostDao, LogStandardService logStandardService, LogUpdateService logUpdateService, LogService logService) {
|
|
|
this.chuanYunManager = chuanYunManager;
|
|
|
this.chuanyunUserCompanyDao = chuanyunUserCompanyDao;
|
|
|
this.chuanyunWorkHourDao = chuanyunWorkHourDao;
|
|
|
@@ -60,6 +62,7 @@ public class WorkHourStatistics {
|
|
|
this.chuanyunMemberCostDao = chuanyunMemberCostDao;
|
|
|
this.logStandardService = logStandardService;
|
|
|
this.logUpdateService = logUpdateService;
|
|
|
+ this.logService = logService;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -112,7 +115,7 @@ public class WorkHourStatistics {
|
|
|
* 人员-项目-周度工时汇总
|
|
|
*/
|
|
|
private void standardWeeklyWorkHour() {
|
|
|
- logStandardService.standardAllWeekMemberHour();
|
|
|
+ logService.standardAllWeekMemberHour();
|
|
|
}
|
|
|
|
|
|
/**
|
verguenza