|
@@ -12,6 +12,7 @@ import org.springblade.control.dto.ControlProjectInfoDTO;
|
|
|
import org.springblade.control.dto.ProjectCostBudgetDTO;
|
|
|
import org.springblade.control.dto.ProjectCostBudgetStatsDTO;
|
|
|
import org.springblade.control.entity.*;
|
|
|
+import org.springblade.control.mapper.DepartmentPlanLogMapper;
|
|
|
import org.springblade.control.mapper.ProjectCostBudgetMapper;
|
|
|
import org.springblade.control.mapper.ProjectInfoMapper;
|
|
|
import org.springblade.control.service.IDepartmentPlanLogService;
|
|
@@ -44,7 +45,7 @@ import java.util.stream.Collectors;
|
|
|
@AllArgsConstructor
|
|
|
public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBudgetMapper, ProjectCostBudget> implements IProjectCostBudgetService {
|
|
|
|
|
|
- private final IDepartmentPlanLogService logService;
|
|
|
+ private final DepartmentPlanLogMapper logMapper;
|
|
|
|
|
|
private final ProjectInfoMapper infoMapper;
|
|
|
|
|
@@ -1159,7 +1160,7 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
|
|
|
}
|
|
|
Double money = userInfo.getOneMoney();
|
|
|
//为固定计划,则获取最后一条任务日志
|
|
|
- DepartmentPlanLog planLog = logService.getNewestTaskLog(PlanId);
|
|
|
+ DepartmentPlanLog planLog = logMapper.getNewestPlanLog(PlanId);
|
|
|
Integer realWorkDays = 0;
|
|
|
//日志类型为暂停,和status=3则 直接用实际工作时间
|
|
|
if (planLog.getStatus() == 0){
|