From 8fbe2f5f29b9658b6201b3daabe2d575c9da88fd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 26 六月 2026 14:54:46 +0800
Subject: [PATCH] update
---
admin-server/src/main/java/com/estate/expert/admin/domain/exam/task/check/CheckTaskDto.java | 7 +++++++
admin-server/src/main/java/com/estate/expert/admin/service/impl/CheckTaskServiceImpl.java | 13 +++++++++++++
admin-server/src/main/java/com/estate/expert/admin/service/impl/DigitalMapServiceImpl.java | 8 ++++----
admin-server/src/main/java/com/estate/expert/admin/service/impl/ProjectServiceImpl.java | 4 ++++
admin-server/src/main/java/com/estate/expert/admin/domain/common/request/ProjectStatRequest.java | 3 +--
5 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/domain/common/request/ProjectStatRequest.java b/admin-server/src/main/java/com/estate/expert/admin/domain/common/request/ProjectStatRequest.java
index 52bc879..ca200be 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/domain/common/request/ProjectStatRequest.java
+++ b/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;
}
diff --git a/admin-server/src/main/java/com/estate/expert/admin/domain/exam/task/check/CheckTaskDto.java b/admin-server/src/main/java/com/estate/expert/admin/domain/exam/task/check/CheckTaskDto.java
index 8807691..b573a60 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/domain/exam/task/check/CheckTaskDto.java
+++ b/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;
}
\ No newline at end of file
diff --git a/admin-server/src/main/java/com/estate/expert/admin/service/impl/CheckTaskServiceImpl.java b/admin-server/src/main/java/com/estate/expert/admin/service/impl/CheckTaskServiceImpl.java
index ba3f63f..f8786e1 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/service/impl/CheckTaskServiceImpl.java
+++ b/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);
diff --git a/admin-server/src/main/java/com/estate/expert/admin/service/impl/DigitalMapServiceImpl.java b/admin-server/src/main/java/com/estate/expert/admin/service/impl/DigitalMapServiceImpl.java
index 7390547..69e11a5 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/service/impl/DigitalMapServiceImpl.java
+++ b/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();
diff --git a/admin-server/src/main/java/com/estate/expert/admin/service/impl/ProjectServiceImpl.java b/admin-server/src/main/java/com/estate/expert/admin/service/impl/ProjectServiceImpl.java
index b10e248..c436d23 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/service/impl/ProjectServiceImpl.java
+++ b/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
--
Gitblit v1.7.1