From 80662b34fe93b4ede00c7fc03fbd9f01355c94e2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 07 四月 2025 13:52:17 +0800
Subject: [PATCH] 修改任务接口
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index 42058b6..9f8f43a 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -20,10 +20,7 @@
import com.ycl.common.core.domain.BaseEntity;
import com.ycl.common.core.domain.entity.SysDictData;
import com.ycl.common.enums.YesOrNo;
-import com.ycl.common.enums.business.FileTypeEnum;
-import com.ycl.common.enums.business.ImportanceTypeEnum;
-import com.ycl.common.enums.business.ProjectCategoryEnum;
-import com.ycl.common.enums.business.ProjectStatusEnum;
+import com.ycl.common.enums.business.*;
import com.ycl.common.exception.base.BaseException;
import com.ycl.common.utils.CopyUtils;
import com.ycl.common.utils.DateUtils;
@@ -69,6 +66,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
+import java.time.Year;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -99,6 +97,7 @@
private final ProjectUnitRegistrationInfoServiceImpl projectUnitRegistrationInfoServiceImpl;
private final SysDeptMapper sysDeptMapper;
private final ISysDictDataService dictDataService;
+ private final ProcessLogService processLogService;
/**
@@ -352,6 +351,7 @@
baseMapper.getPage(query, page);
List<ProjectInfoVO> records = page.getRecords();
List<ProjectVO> list = new ArrayList<>();
+ int year = Year.now().getValue();
records.forEach(vo -> {
ProjectInfoVO.transform(vo);
ProjectVO projectVO = new ProjectVO();
@@ -367,6 +367,14 @@
if (Objects.nonNull(dictData)) {
projectVO.setProjectSubType(dictData.getDictLabel());
}
+ }
+ // 鑾峰彇鏈勾搴︾殑鎶曡祫閲戦
+ List<ProjectInfoYearPlan> yearPlans = new LambdaQueryChainWrapper<>(projectInfoYearPlanService.getBaseMapper())
+ .eq(ProjectInfoYearPlan::getProjectInfoId, projectVO.getId())
+ .eq(ProjectInfoYearPlan::getYear, year)
+ .list();
+ if (! CollectionUtils.isEmpty(yearPlans)) {
+ projectVO.setYearInvestAmount(yearPlans.get(0).getYearTotalMoney());
}
list.add(projectVO);
});
@@ -537,6 +545,12 @@
public Map<String, Integer> countExceptionProject(IndexDTO indexDTO) {
Map<String, Integer> map = new HashMap<>();
map.put("processExceptionProject", 0);
+ // 鏌ヨ鍙戠敓杩囧缂虹殑椤圭洰鏁�
+ List<String> projectIds = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .select(ProcessLog::getProjectId)
+ .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.WAIT)
+ .list().stream().map(ProcessLog::getProjectId).distinct().collect(Collectors.toList());
+ map.put("hasWaitProjectNum", projectIds.size());
return map;
}
--
Gitblit v1.8.0