:feat:消息任务列表增加任务状态筛选条件

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/MsgTaskDTO.java

@@ -17,6 +17,6 @@ public class MsgTaskDTO extends BasePage {
     private Long gameId;
 
     @ApiModelProperty(value = "任务状态")
-    private String taskType;
+    private String taskStatus;
 
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/MsgTaskResultDTO.java

@@ -1,6 +1,7 @@
 package com.zanxiang.game.data.serve.pojo.dto;
 
 import com.zanxiang.game.data.serve.pojo.base.BasePage;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -17,4 +18,7 @@ public class MsgTaskResultDTO extends BasePage implements Serializable {
 
     @NotNull(message = "任务id不能为空")
     private Long taskId;
+
+    @ApiModelProperty(value = "发送状态")
+    private String sendStatus;
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -765,7 +765,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         try {
             SendMsgTaskParam sendMsgTaskParam = new SendMsgTaskParam();
             sendMsgTaskParam.setGameId(dto.getGameId());
-            sendMsgTaskParam.setTaskType(dto.getTaskType());
+            sendMsgTaskParam.setTaskStatus(dto.getTaskStatus());
             sendMsgTaskParam.setPageNum(dto.getPageNum());
             sendMsgTaskParam.setPageSize(dto.getPageSize());
             PageUtil<SendMsgVO> sendMsgTaskList = sendMsgRpc.getSendMsgTaskList(sendMsgTaskParam);
@@ -846,6 +846,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         try {
             SendMsgTaskResultParam param = new SendMsgTaskResultParam();
             param.setTaskId(msgTaskResultDto.getTaskId());
+            param.setSendStatus(msgTaskResultDto.getSendStatus());
             param.setPageNum(msgTaskResultDto.getPageNum());
             param.setPageSize(msgTaskResultDto.getPageSize());
             PageUtil<SendMsgResultVO> sendMsgTaskResultList = sendMsgRpc.getSendMsgTaskResultList(param);

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/params/SendMsgTaskParam.java

@@ -21,6 +21,6 @@ public class SendMsgTaskParam extends BaseListDTO implements Serializable {
     /**
      * 任务状态
      */
-    private String taskType;
+    private String taskStatus;
 
 }

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/params/SendMsgTaskResultParam.java

@@ -14,4 +14,8 @@ public class SendMsgTaskResultParam extends BaseListDTO implements Serializable
      * 任务id
      */
     private Long taskId;
+    /**
+     * 发送状态
+     */
+    private String sendStatus;
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/CPSendMsgTaskServiceImpl.java

@@ -62,7 +62,7 @@ public class CPSendMsgTaskServiceImpl extends ServiceImpl<CpSendMsgTaskMapper, C
         Page<CpSendMsgTask> page = sendMsgTaskService.page(new Page<>(param.getPageNum(), param.getPageSize()),
                 new LambdaQueryWrapper<CpSendMsgTask>()
                         .eq(param.getGameId() != null, CpSendMsgTask::getGameId, param.getGameId())
-                        .eq(StringUtils.isNotEmpty(param.getTaskType()), CpSendMsgTask::getType, param.getTaskType())
+                        .eq(StringUtils.isNotEmpty(param.getTaskStatus()), CpSendMsgTask::getType, param.getTaskStatus())
                         .orderByDesc(CpSendMsgTask::getCreateTime));
         List<CpSendMsgTask> cpSendMsgTasks = page.getRecords();
         List<SendMsgVO> sendMsgVos = toVo(cpSendMsgTasks);

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/CpSendMsgResultServiceImpl.java

@@ -11,6 +11,7 @@ import com.zanxiang.game.module.mybatis.entity.CpSendMsgResult;
 import com.zanxiang.game.module.mybatis.mapper.CpSendMsgResultMapper;
 import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -32,11 +33,12 @@ public class CpSendMsgResultServiceImpl extends ServiceImpl<CpSendMsgResultMappe
         Page<CpSendMsgResult> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()),
                 new LambdaQueryWrapper<CpSendMsgResult>()
                         .eq(CpSendMsgResult::getTaskId, param.getTaskId())
+                        .eq(StringUtils.isNotEmpty(param.getSendStatus()), CpSendMsgResult::getSendStatus, param.getSendStatus())
                         .orderByDesc(CpSendMsgResult::getCreateTime)
         );
         List<CpSendMsgResult> cpSendMsgResults = page.getRecords();
         List<SendMsgResultVO> sendMsgVos = toVo(cpSendMsgResults);
-        return new PageUtil<>(sendMsgVos, page.getTotal(), param.getPageSize(), param.getPageNum(),0);
+        return new PageUtil<>(sendMsgVos, page.getTotal(), param.getPageSize(), param.getPageNum(), 0);
     }
 
     private List<SendMsgResultVO> toVo(List<CpSendMsgResult> cpSendMsgResults) {