From b6b8a98676caeae5ab9b85127ed5d4e8014e12f3 Mon Sep 17 00:00:00 2001 From: tianxinlei Date: Wed, 27 May 2026 16:28:38 +0800 Subject: [PATCH] 5-27 fix --- .../query/tasklist/FeedbackQueryExe.java | 53 ++++++++----------- .../tasklist/TaskDetailUpdateScoreExe.java | 13 ++++- .../dto/tasklist/FeedbackListQry.java | 3 +- .../tasklist/TaskDetailUpdateScoreCmd.java | 8 --- .../mapper/tasklist/FeedbackMapper.xml | 17 ++++-- 5 files changed, 49 insertions(+), 45 deletions(-) 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 d68d51e..19e3314 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 @@ -3,14 +3,13 @@ package com.zcloud.safetyDutyList.command.query.tasklist; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.exception.BizException; -import com.zcloud.safetyDutyList.domain.enums.FeedbackCycleEnum; -import com.zcloud.safetyDutyList.domain.gateway.tasklist.FeedbackGateway; -import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; -import com.zcloud.safetyDutyList.domain.model.tasklist.FeedbackE; -import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; import com.zcloud.safetyDutyList.dto.clientobject.tasklist.*; import com.zcloud.safetyDutyList.dto.tasklist.FeedbackListQry; import com.zcloud.safetyDutyList.dto.tasklist.FeedbackPeriodGroupQry; +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; @@ -21,29 +20,21 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -/** - * 反馈查询执行器 - *

- * 处理执行反馈相关的查询业务： - * - 反馈周期分组列表（按周期标识分组统计反馈数量） - * - 指定周期的反馈列表查询 - * - 反馈详情查询（含关联任务信息） - */ @Component @AllArgsConstructor public class FeedbackQueryExe { - private final FeedbackGateway feedbackGateway; - private final TaskDetailGateway taskDetailGateway; + private final FeedbackRepository feedbackRepository; + private final TaskDetailRepository taskDetailRepository; public MultiResponse periodGroupList(FeedbackPeriodGroupQry qry) { - List feedbackList = feedbackGateway.listByTaskDetailId(qry.getTaskDetailId()); + List feedbackList = feedbackRepository.listByTaskDetailId(qry.getTaskDetailId()); if (feedbackList == null || feedbackList.isEmpty()) { return MultiResponse.of(new ArrayList<>()); } - Map> groupedByPeriod = feedbackList.stream() + Map> groupedByPeriod = feedbackList.stream() .filter(f -> f.getFeedbackPeriodFlag() != null) - .collect(Collectors.groupingBy(FeedbackE::getFeedbackPeriodFlag)); + .collect(Collectors.groupingBy(FeedbackDO::getFeedbackPeriodFlag)); List result = new ArrayList<>(); groupedByPeriod.forEach((periodFlag, feedbacks) -> { @@ -52,10 +43,10 @@ public class FeedbackQueryExe { co.setFeedbackPeriodFlag(periodFlag); co.setFeedbackCount(feedbacks.size()); if (!feedbacks.isEmpty()) { - FeedbackE first = feedbacks.get(0); + FeedbackDO first = feedbacks.get(0); co.setFeedbackPeriodStartTime(first.getFeedbackPeriodStartTime()); co.setFeedbackPeriodEndTime(first.getFeedbackPeriodEndTime()); - co.setFeedbackUserName(first.getCreateName()); + co.setFeedbackUserName(first.getFeedbackUserName()); } result.add(co); }); @@ -63,34 +54,34 @@ public class FeedbackQueryExe { } public MultiResponse feedbackList(FeedbackListQry qry) { - List feedbackList = feedbackGateway.listByTaskDetailId(qry.getTaskDetailId()); + List feedbackList = feedbackRepository.listByTaskDetailId(qry.getTaskDetailId()); if (feedbackList == null || feedbackList.isEmpty()) { return MultiResponse.of(new ArrayList<>()); } List coList = new ArrayList<>(); - for (FeedbackE feedbackE : feedbackList) { - if (!StringUtil.isEmpty(qry.getFeedbackPeriodFlag()) && !qry.getFeedbackPeriodFlag().equals(feedbackE.getFeedbackPeriodFlag())) { + for (FeedbackDO feedbackDO : feedbackList) { + if (!StringUtil.isEmpty(qry.getFeedbackPeriodFlag()) && !qry.getFeedbackPeriodFlag().equals(feedbackDO.getFeedbackPeriodFlag())) { continue; } FeedbackCO co = new FeedbackCO(); - BeanUtils.copyProperties(feedbackE, co); + BeanUtils.copyProperties(feedbackDO, co); coList.add(co); } return MultiResponse.of(coList); } public SingleResponse getByFeedbackId(String feedbackId) { - FeedbackE feedbackE = feedbackGateway.getByFeedbackId(feedbackId); - if (feedbackE == null) { + FeedbackDO feedbackDO = feedbackRepository.getByFeedbackId(feedbackId); + if (feedbackDO == null) { throw new BizException("反馈记录不存在"); } FeedbackInfoCO co = new FeedbackInfoCO(); - BeanUtils.copyProperties(feedbackE, co); + BeanUtils.copyProperties(feedbackDO, co); - TaskDetailE detailE = taskDetailGateway.getByTaskDetailId(feedbackE.getTaskDetailId()); - if (detailE != null) { - co.setExecuteContent(detailE.getExecuteContent()); - co.setFeedbackCycleType(detailE.getFeedbackCycleType()); + TaskDetailDO detailDO = taskDetailRepository.getByTaskDetailId(feedbackDO.getTaskDetailId()); + if (detailDO != null) { + co.setExecuteContent(detailDO.getExecuteContent()); + co.setFeedbackCycleType(detailDO.getFeedbackCycleType()); } return SingleResponse.of(co); } diff --git a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailUpdateScoreExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailUpdateScoreExe.java index 77fb3e9..ddfafbf 100644 --- a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailUpdateScoreExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailUpdateScoreExe.java @@ -1,6 +1,8 @@ package com.zcloud.safetyDutyList.command.tasklist; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.jjb.saas.framework.auth.model.SSOUser; import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; import com.zcloud.safetyDutyList.dto.tasklist.TaskDetailUpdateScoreCmd; @@ -23,6 +25,11 @@ public class TaskDetailUpdateScoreExe { private final TaskDetailGateway taskDetailGateway; public void execute(TaskDetailUpdateScoreCmd cmd) { + + SSOUser ssoUser = AuthContext.getCurrentUser(); + if (ssoUser == null) { + throw new BizException("用户未登录"); + } TaskDetailE detailE = taskDetailGateway.getByTaskDetailId(cmd.getTaskDetailId()); if (detailE == null) { throw new BizException("任务不存在"); @@ -38,8 +45,10 @@ public class TaskDetailUpdateScoreExe { } detailE.setTaskRating(cmd.getTaskRating()); detailE.setRatingTime(LocalDateTime.now()); - detailE.setRatingDepartmentId(cmd.getRatingDeptId()); - detailE.setRatingUserId(cmd.getRatingUserId()); + + detailE.setRatingDepartmentId(ssoUser.getOrgId()); + detailE.setRatingUserId(ssoUser.getUserId()); + boolean res = taskDetailGateway.update(detailE); if (!res) { throw new BizException("评分失败"); 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 f1da474..8eeaacb 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 @@ -1,5 +1,6 @@ package com.zcloud.safetyDutyList.dto.tasklist; +import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,7 +12,7 @@ import javax.validation.constraints.NotEmpty; * 用于查询指定任务在指定周期标识下的反馈列表 */ @Data -public class FeedbackListQry { +public class FeedbackListQry extends PageQuery { @ApiModelProperty(value = "任务ID", required = true) @NotEmpty(message = "任务ID不能为空") private String taskDetailId; diff --git a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailUpdateScoreCmd.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailUpdateScoreCmd.java index c92b93e..8ebfbb0 100644 --- a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailUpdateScoreCmd.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailUpdateScoreCmd.java @@ -26,12 +26,4 @@ public class TaskDetailUpdateScoreCmd implements Serializable { @ApiModelProperty(value = "分数（不能超过任务分值）", required = true) @NotNull(message = "分数不能为空") private BigDecimal taskRating; - - @ApiModelProperty(value = "评分部门ID", required = true) - @NotNull(message = "评分部门ID不能为空") - private Long ratingDeptId; - - @ApiModelProperty(value = "评分人员ID", required = true) - @NotNull(message = "评分人员ID不能为空") - private Long ratingUserId; } diff --git a/web-infrastructure/src/main/resources/mapper/tasklist/FeedbackMapper.xml b/web-infrastructure/src/main/resources/mapper/tasklist/FeedbackMapper.xml index 1e691af..c35a717 100644 --- a/web-infrastructure/src/main/resources/mapper/tasklist/FeedbackMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/tasklist/FeedbackMapper.xml @@ -42,9 +42,20 @@