admin-server/src/main/java/com/estate/expert/admin/domain/common/request/ProjectStatRequest.java
@@ -17,7 +17,6 @@ @ApiModelProperty("计划类型") PlanType planType; @ApiModelProperty("项目ID列表") @NotEmpty(message = "项目ID列表不能为空") @ApiModelProperty("项目ID列表,为空时查询所有项目") List<Integer> projectIds; } admin-server/src/main/java/com/estate/expert/admin/domain/exam/task/check/CheckTaskDto.java
@@ -2,6 +2,7 @@ import com.estate.expert.admin.domain.common.EntityRef; import com.estate.expert.admin.domain.common.IDtoBase; import com.estate.expert.admin.domain.project.detail.AddressInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; @@ -75,4 +76,10 @@ @ApiModelProperty("经纬度") Double[] gps; @ApiModelProperty("项目ID(用于更新项目地址)") Integer projectId; @ApiModelProperty("项目地址信息(用于更新项目地址)") AddressInfo addressInfo; } admin-server/src/main/java/com/estate/expert/admin/service/impl/CheckTaskServiceImpl.java
@@ -213,6 +213,19 @@ } @Override public CheckTask edit(CheckTaskDto dto) { // 如果传了projectId和addressInfo,更新项目地址 if (dto.getProjectId() != null && dto.getAddressInfo() != null) { var project = projectService.get(dto.getProjectId()); if (project != null) { project.setAddressInfo(dto.getAddressInfo()); projectService.edit(project); } } return super.edit(dto); } @Override public void close(Integer id) { var checkTask = get(id); BizResultCode.TASK_NOT_FOUND.check(checkTask == null); admin-server/src/main/java/com/estate/expert/admin/service/impl/DigitalMapServiceImpl.java
@@ -27,10 +27,10 @@ private EvalScoreService evalScoreService; public PageResp<ProjectStat> projectStats(List<Integer> projectIds, PlanType planType) { if(projectIds == null || projectIds.isEmpty()) return PageResp.of(List.of()); var projects = projectService.toDto(projectService.findAllById(projectIds)); // 如果projectIds为空,查询所有项目 var projects = (projectIds == null || projectIds.isEmpty()) ? projectService.toDto(projectService.findAll()) : projectService.toDto(projectService.findAllById(projectIds)); var evalScores = evalScoreService.listMini(projectIds, planType); var res = projects.stream().map(project -> { var evalScoresForProject = evalScores.stream().filter(evalScore -> evalScore.getProject().getId().equals(project.getId())).toList(); admin-server/src/main/java/com/estate/expert/admin/service/impl/ProjectServiceImpl.java
@@ -66,6 +66,10 @@ @Override public List<Project> listByClient(Integer clientId) { // clientId为空时查询所有项目 if (clientId == null) { return projectRepository.findProjects(null, null, null); } return projectRepository.findAllByClientIdAndDeleted(clientId, false); } @Override