From 0c6ed4cdd4037b2417e8a66ee557e88c06673b61 Mon Sep 17 00:00:00 2001 From: tianxinlei Date: Wed, 27 May 2026 16:45:08 +0800 Subject: [PATCH] 5-27 fix --- .../web/tasklist/FeedbackController.java | 4 +-- .../query/tasklist/FeedbackQueryExe.java | 25 +++++++++---------- .../service/tasklist/TaskListServiceImpl.java | 4 +-- .../api/tasklist/TaskListServiceI.java | 8 +++--- .../dto/tasklist/FeedbackListQry.java | 9 ++++--- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/FeedbackController.java b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/FeedbackController.java index 729b7a6..1c1917c 100644 --- a/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/FeedbackController.java +++ b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/FeedbackController.java @@ -46,8 +46,8 @@ public class FeedbackController { @ApiOperation("获取反馈列表") @PostMapping("/list") - public MultiResponse feedbackList(@Validated @RequestBody FeedbackListQry qry) { - return taskListService.feedbackList(qry); + public PageResponse feedbackList(@Validated @RequestBody FeedbackListQry qry) { + return taskListService.feedbackPage(qry); } @ApiOperation("获取反馈详情") diff --git a/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/FeedbackQueryExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/FeedbackQueryExe.java index 19e3314..ee564da 100644 --- a/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/FeedbackQueryExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/FeedbackQueryExe.java @@ -1,8 +1,10 @@ package com.zcloud.safetyDutyList.command.query.tasklist; import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.exception.BizException; +import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.safetyDutyList.dto.clientobject.tasklist.*; import com.zcloud.safetyDutyList.dto.tasklist.FeedbackListQry; import com.zcloud.safetyDutyList.dto.tasklist.FeedbackPeriodGroupQry; @@ -10,7 +12,6 @@ import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.FeedbackDO; import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.TaskDetailDO; import com.zcloud.safetyDutyList.persistence.repository.tasklist.FeedbackRepository; import com.zcloud.safetyDutyList.persistence.repository.tasklist.TaskDetailRepository; -import jodd.util.StringUtil; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -53,21 +54,19 @@ public class FeedbackQueryExe { return MultiResponse.of(result); } - public MultiResponse feedbackList(FeedbackListQry qry) { - List feedbackList = feedbackRepository.listByTaskDetailId(qry.getTaskDetailId()); - if (feedbackList == null || feedbackList.isEmpty()) { - return MultiResponse.of(new ArrayList<>()); + public PageResponse feedbackPage(FeedbackListQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = feedbackRepository.feedbackPage(params); + List doList = pageResponse.getData(); + if (doList == null || doList.isEmpty()) { + return PageResponse.of(new ArrayList<>(), pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } - List coList = new ArrayList<>(); - for (FeedbackDO feedbackDO : feedbackList) { - if (!StringUtil.isEmpty(qry.getFeedbackPeriodFlag()) && !qry.getFeedbackPeriodFlag().equals(feedbackDO.getFeedbackPeriodFlag())) { - continue; - } + List coList = doList.stream().map(feedbackDO -> { FeedbackCO co = new FeedbackCO(); BeanUtils.copyProperties(feedbackDO, co); - coList.add(co); - } - return MultiResponse.of(coList); + return co; + }).collect(Collectors.toList()); + return PageResponse.of(coList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } public SingleResponse getByFeedbackId(String feedbackId) { diff --git a/web-app/src/main/java/com/zcloud/safetyDutyList/service/tasklist/TaskListServiceImpl.java b/web-app/src/main/java/com/zcloud/safetyDutyList/service/tasklist/TaskListServiceImpl.java index cea208f..36b9b27 100644 --- a/web-app/src/main/java/com/zcloud/safetyDutyList/service/tasklist/TaskListServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/service/tasklist/TaskListServiceImpl.java @@ -171,8 +171,8 @@ public class TaskListServiceImpl implements TaskListServiceI { } @Override - public MultiResponse feedbackList(FeedbackListQry qry) { - return feedbackQueryExe.feedbackList(qry); + public PageResponse feedbackPage(FeedbackListQry qry) { + return feedbackQueryExe.feedbackPage(qry); } @Override diff --git a/web-client/src/main/java/com/zcloud/safetyDutyList/api/tasklist/TaskListServiceI.java b/web-client/src/main/java/com/zcloud/safetyDutyList/api/tasklist/TaskListServiceI.java index d6052b3..a64a787 100644 --- a/web-client/src/main/java/com/zcloud/safetyDutyList/api/tasklist/TaskListServiceI.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/api/tasklist/TaskListServiceI.java @@ -164,12 +164,12 @@ public interface TaskListServiceI { MultiResponse feedbackPeriodGroupList(FeedbackPeriodGroupQry qry); /** - * 查询指定周期的反馈列表 + * 分页查询反馈列表 * - * @param qry 查询参数（含taskDetailId和feedbackPeriodFlag） - * @return 反馈列表 + * @param qry 分页查询参数（含taskDetailId、taskListId、feedbackPeriodFlag等） + * @return 反馈分页结果 */ - MultiResponse feedbackList(FeedbackListQry qry); + PageResponse feedbackPage(FeedbackListQry qry); /** * 根据反馈ID获取反馈详情（含关联任务信息） diff --git a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackListQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackListQry.java index 8eeaacb..3bd82ef 100644 --- a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackListQry.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackListQry.java @@ -13,9 +13,12 @@ import javax.validation.constraints.NotEmpty; */ @Data public class FeedbackListQry extends PageQuery { - @ApiModelProperty(value = "任务ID", required = true) - @NotEmpty(message = "任务ID不能为空") + @ApiModelProperty(value = "任务详情ID") private String taskDetailId; - @ApiModelProperty(value = "周期标识", required = true) + @ApiModelProperty(value = "任务清单ID") + private String taskListId; + @ApiModelProperty(value = "周期标识") private String feedbackPeriodFlag; + @ApiModelProperty(value = "反馈人公司ID") + private Long feedbackCorpId; }