From fb6531d9e24500e2a99df1d800f6477fc7e75bc9 Mon Sep 17 00:00:00 2001 From: Derran Date: Tue, 27 Jan 2026 11:02:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E7=BA=A2=E5=A8=98=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/UserGetUserTaskCompleteVo.java | 6 ++++ .../dao/utc/UserTaskCompleteDao.java | 6 +++- .../UserTaskCompleteQueryServiceImpl.java | 3 ++ .../mapper/utc/UserTaskCompleteDao.xml | 29 ++++++++++--------- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/response/UserGetUserTaskCompleteVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/response/UserGetUserTaskCompleteVo.java index 52972ea..df79331 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/response/UserGetUserTaskCompleteVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/utc/user/response/UserGetUserTaskCompleteVo.java @@ -1,6 +1,8 @@ package com.qniao.dam.api.query.utc.user.response; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.qniao.dam.domian.aggregate.tasktemplate.constant.TaskGroupEnum; import com.qniao.dam.domian.aggregate.tasktemplate.constant.TaskStageEnum; import com.qniao.dam.domian.aggregate.tasktemplate.constant.TaskTypeEnum; @@ -15,6 +17,10 @@ import java.util.List; @Data public class UserGetUserTaskCompleteVo { + @ApiModelProperty("用户任务进度标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long userTaskCompleteId; + @ApiModelProperty("任务群体") private TaskGroupEnum taskGroup; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/utc/UserTaskCompleteDao.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/utc/UserTaskCompleteDao.java index d3eef3c..e557631 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/utc/UserTaskCompleteDao.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/utc/UserTaskCompleteDao.java @@ -2,10 +2,13 @@ package com.qniao.dam.infrastructure.persistent.dao.utc; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qniao.dam.api.query.utc.user.request.UserGetUserTaskCompleteQueryParams; +import com.qniao.dam.api.query.utc.user.response.UserGetUserSubTaskCompleteVo; import com.qniao.dam.api.query.utc.user.response.UserGetUserTaskCompleteVo; import com.qniao.dam.domain.aggregate.utc.entity.UserTaskComplete; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 用户任务完成表 * @@ -13,6 +16,7 @@ import org.apache.ibatis.annotations.Param; */ public interface UserTaskCompleteDao extends BaseMapper { - UserGetUserTaskCompleteVo getUserTaskComplete(@Param("queryParams") UserGetUserTaskCompleteQueryParams queryParams); + List listSubVo(@Param("taskTemplateId") Long taskTemplateId, + @Param("userTaskCompleteId") Long userTaskCompleteId); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/utc/impl/UserTaskCompleteQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/utc/impl/UserTaskCompleteQueryServiceImpl.java index 0c7e60b..e9b0e43 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/utc/impl/UserTaskCompleteQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/utc/impl/UserTaskCompleteQueryServiceImpl.java @@ -48,10 +48,13 @@ public class UserTaskCompleteQueryServiceImpl implements UserTaskCompleteQuerySe vo.setTaskEndDate(tuple.get(1)); UserTaskComplete userTaskComplete = queryBy(queryParams.getQueryUserId(), taskTemplate.getId(), tuple.get(0), tuple.get(1)); if (Objects.nonNull(userTaskComplete)) { + vo.setUserTaskCompleteId(userTaskComplete.getId()); vo.setCompleteStatus(userTaskComplete.getCompleteStatus()); vo.setRewardReceiveStatus(userTaskComplete.getRewardReceiveStatus()); vo.setCompleteTime(userTaskComplete.getCompleteTime()); } + //补充子任务进度 + vo.setSubList(userTaskCompleteDao.listSubVo(taskTemplate.getId(), vo.getUserTaskCompleteId())); } } return vo; diff --git a/dating-agency-mall-server/src/main/resources/mapper/utc/UserTaskCompleteDao.xml b/dating-agency-mall-server/src/main/resources/mapper/utc/UserTaskCompleteDao.xml index 7ec3260..872b174 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/utc/UserTaskCompleteDao.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/utc/UserTaskCompleteDao.xml @@ -2,19 +2,22 @@ - + SELECT dastt.sub_task_name, + dastt.sub_task_type, + dastt.sub_task_desc, + dastt.required_count, + daustc.complete_count, + daustc.complete_status, + daustc.complete_time, + dastt.sort + from da_sub_task_template as dastt + LEFT JOIN da_user_sub_task_complete as daustc + on daustc.is_delete = 0 and dastt.id = daustc.sub_task_template_id and + daustc.user_task_complete_id = #{userTaskCompleteId} + where dastt.is_delete = 0 + and dastt.task_template_id = #{taskTemplateId} + ORDER BY dastt.sort ASC \ No newline at end of file