Browse Source

工会

master
张彭杰 1 week ago
parent
commit
929be59a92
8 changed files with 172 additions and 4 deletions
  1. 12
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/tasktemplate/user/TaskTemplateUserQueryController.java
  2. 16
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/tasktemplate/user/request/UserPageTaskTemplateQueryParams.java
  3. 59
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/tasktemplate/user/response/UserPageTaskTemplateVo.java
  4. 25
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/tasktemplate/user/response/UserTaskTemplateDetailVo.java
  5. 8
      dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/tasktemplate/TaskTemplateDao.java
  6. 7
      dating-agency-mall-server/src/main/java/com/qniao/dam/query/tasktemplate/TaskTemplateQueryService.java
  7. 17
      dating-agency-mall-server/src/main/java/com/qniao/dam/query/tasktemplate/impl/TaskTemplateQueryServiceImpl.java
  8. 32
      dating-agency-mall-server/src/main/resources/mapper/tasktemplate/TaskTemplateDao.xml

12
dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/tasktemplate/user/TaskTemplateUserQueryController.java

@ -1,7 +1,12 @@
package com.qniao.dam.api.query.tasktemplate.user;
import com.qniao.dam.api.query.tasktemplate.user.request.UserPageTaskTemplateQueryParams;
import com.qniao.dam.api.query.tasktemplate.user.response.UserPageTaskTemplateVo;
import com.qniao.dam.api.query.tasktemplate.user.response.UserTaskTemplateDetailVo;
import com.qniao.dam.api.query.utc.user.response.PageUserTaskCompleteByOperatorVo;
import com.qniao.dam.query.tasktemplate.TaskTemplateQueryService;
import com.qniao.domain.QnPage;
import com.qniao.framework.utils.PageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
@ -25,4 +30,11 @@ public class TaskTemplateUserQueryController {
return taskTemplateQueryService.getDetail(id);
}
@GetMapping("page/task-template")
@ApiOperation("获取任务模板分页")
public QnPage<UserPageTaskTemplateVo> userPageTaskTemplate(PageUtil pageUtil,
UserPageTaskTemplateQueryParams queryParams) {
return PageUtil.convert(taskTemplateQueryService.pageTaskTemplate(pageUtil, queryParams), UserPageTaskTemplateVo.class);
}
}

16
dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/tasktemplate/user/request/UserPageTaskTemplateQueryParams.java

@ -0,0 +1,16 @@
package com.qniao.dam.api.query.tasktemplate.user.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class UserPageTaskTemplateQueryParams {
@ApiModelProperty("任务群体")
private Integer taskGroup;
@ApiModelProperty("任务类型(1-每日任务,2-每周任务,3-每月任务)")
private Integer taskType;
}

59
dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/tasktemplate/user/response/UserPageTaskTemplateVo.java

@ -0,0 +1,59 @@
package com.qniao.dam.api.query.tasktemplate.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.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Data
public class UserPageTaskTemplateVo {
@ApiModelProperty("唯一标识")
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("任务群体")
private TaskGroupEnum taskGroup;
@ApiModelProperty("任务种类")
private TaskCategoryEnum taskCategory;
@ApiModelProperty("任务类型(1-每日任务,2-每周任务,2-每月任务)")
private TaskTypeEnum taskType;
@ApiModelProperty("关联阶段编码(1-首月,2-次月,3-第三月+)")
private TaskStageEnum stageCode;
@ApiModelProperty("任务名称")
private String taskName;
@ApiModelProperty("任务描述")
private String taskDesc;
@ApiModelProperty("奖励")
private String rewardValue;
@ApiModelProperty("状态")
private TaskTemplateStatus status;
@ApiModelProperty("开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
@ApiModelProperty("结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty("子任务模板列表")
private List<SubTaskTemplateVo> subList;
}

25
dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/tasktemplate/user/response/UserTaskTemplateDetailVo.java

@ -1,14 +1,13 @@
package com.qniao.dam.api.query.tasktemplate.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.domain.aggregate.tasktemplate.entity.SubTaskTemplate;
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;
import com.qniao.dam.domian.aggregate.tasktemplate.constant.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Data
@ -21,6 +20,9 @@ public class UserTaskTemplateDetailVo {
@ApiModelProperty("任务群体")
private TaskGroupEnum taskGroup;
@ApiModelProperty("任务种类")
private TaskCategoryEnum taskCategory;
@ApiModelProperty("任务类型(1-每日任务,2-每周任务,2-每月任务)")
private TaskTypeEnum taskType;
@ -36,6 +38,21 @@ public class UserTaskTemplateDetailVo {
@ApiModelProperty("奖励")
private String rewardValue;
@ApiModelProperty("状态")
private TaskTemplateStatus status;
@ApiModelProperty("开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
@ApiModelProperty("结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty("子任务模板列表")
private List<SubTaskTemplateVo> subList;

8
dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/tasktemplate/TaskTemplateDao.java

@ -1,7 +1,12 @@
package com.qniao.dam.infrastructure.persistent.dao.tasktemplate;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.qniao.dam.api.query.tasktemplate.user.request.UserPageTaskTemplateQueryParams;
import com.qniao.dam.api.query.tasktemplate.user.response.UserPageTaskTemplateVo;
import com.qniao.dam.domain.aggregate.tasktemplate.entity.TaskTemplate;
import org.apache.ibatis.annotations.Param;
/**
* 任务模板表
@ -9,4 +14,7 @@ import com.qniao.dam.domain.aggregate.tasktemplate.entity.TaskTemplate;
* @date 2026/01/26
*/
public interface TaskTemplateDao extends BaseMapper<TaskTemplate> {
IPage<UserPageTaskTemplateVo> pageTaskTemplate(Page<Object> pageWithoutOrders,
@Param("queryParams") UserPageTaskTemplateQueryParams queryParams);
}

7
dating-agency-mall-server/src/main/java/com/qniao/dam/query/tasktemplate/TaskTemplateQueryService.java

@ -1,12 +1,17 @@
package com.qniao.dam.query.tasktemplate;
import cn.hutool.core.lang.Tuple;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.qniao.dam.api.query.tasktemplate.user.request.UserPageTaskTemplateQueryParams;
import com.qniao.dam.api.query.tasktemplate.user.response.UserPageTaskTemplateVo;
import com.qniao.dam.api.query.tasktemplate.user.response.UserTaskTemplateDetailVo;
import com.qniao.dam.domain.aggregate.tasktemplate.entity.SubTaskTemplate;
import com.qniao.dam.domain.aggregate.tasktemplate.entity.TaskTemplate;
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;
import com.qniao.domain.QnPage;
import com.qniao.framework.utils.PageUtil;
import java.time.LocalDateTime;
import java.util.List;
@ -22,4 +27,6 @@ public interface TaskTemplateQueryService {
List<SubTaskTemplate> getSubList(Long taskTemplateId);
UserTaskTemplateDetailVo getDetail(Long id);
IPage<UserPageTaskTemplateVo> pageTaskTemplate(PageUtil pageUtil, UserPageTaskTemplateQueryParams queryParams);
}

17
dating-agency-mall-server/src/main/java/com/qniao/dam/query/tasktemplate/impl/TaskTemplateQueryServiceImpl.java

@ -2,7 +2,10 @@ package com.qniao.dam.query.tasktemplate.impl;
import cn.hutool.core.lang.Tuple;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.qniao.dam.api.query.tasktemplate.user.request.UserPageTaskTemplateQueryParams;
import com.qniao.dam.api.query.tasktemplate.user.response.SubTaskTemplateVo;
import com.qniao.dam.api.query.tasktemplate.user.response.UserPageTaskTemplateVo;
import com.qniao.dam.api.query.tasktemplate.user.response.UserTaskTemplateDetailVo;
import com.qniao.dam.domain.aggregate.tasktemplate.entity.SubTaskTemplate;
import com.qniao.dam.domain.aggregate.tasktemplate.entity.TaskTemplate;
@ -13,6 +16,7 @@ import com.qniao.dam.domian.aggregate.tasktemplate.constant.TaskTypeEnum;
import com.qniao.dam.infrastructure.persistent.dao.tasktemplate.SubTaskTemplateDao;
import com.qniao.dam.infrastructure.persistent.dao.tasktemplate.TaskTemplateDao;
import com.qniao.dam.query.tasktemplate.TaskTemplateQueryService;
import com.qniao.framework.utils.PageUtil;
import com.qniao.framework.utils.TypeConvertUtils;
import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import org.springframework.stereotype.Service;
@ -135,4 +139,17 @@ public class TaskTemplateQueryServiceImpl implements TaskTemplateQueryService {
}
return detailVo;
}
@Override
public IPage<UserPageTaskTemplateVo> pageTaskTemplate(PageUtil pageUtil,
UserPageTaskTemplateQueryParams queryParams) {
IPage<UserPageTaskTemplateVo> page = taskTemplateDao.pageTaskTemplate(pageUtil.toPageWithoutOrders(), queryParams);
if (page.getRecords().size() > 0) {
page.getRecords().forEach(record -> {
List<SubTaskTemplate> subList = getSubList(record.getId());
record.setSubList(TypeConvertUtils.convert(subList, SubTaskTemplateVo.class));
});
}
return page;
}
}

32
dating-agency-mall-server/src/main/resources/mapper/tasktemplate/TaskTemplateDao.xml

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.qniao.dam.infrastructure.persistent.dao.tasktemplate.TaskTemplateDao">
<select id="pageTaskTemplate"
resultType="com.qniao.dam.api.query.tasktemplate.user.response.UserPageTaskTemplateVo">
SELECT
datt.id,
datt.task_group,
datt.task_type,
datt.task_category,
datt.stage_code,
datt.task_name,
datt.task_desc,
datt.reward_value,
datt.`status`,
datt.start_time,
datt.end_time,
datt.create_time
from da_task_template datt
where datt.is_delete=0
<if test="queryParams.taskGroup != null">
and datt.task_group = #{queryParams.taskGroup}
</if>
<if test="queryParams.taskType != null">
and datt.task_type = #{queryParams.taskType}
</if>
ORDER BY datt.start_time desc
</select>
</mapper>
Loading…
Cancel
Save