调整

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/api/MessageImportController.java

@@ -32,7 +32,7 @@ public class MessageImportController{
 
     @ApiOperation(value = "批量导入-分页查询")
     @PostMapping(value = "/page")
-    public ApiResponse<Pagination> page(@RequestBody @Valid MsgwSendApplyPageRequest request){
+    public ApiResponse<Pagination> page(@RequestBody @Valid MessageImportReviewPageRequestDto request){
         Pagination pagination = messageImportManager.page(request);
         return ApiResponse.of(pagination);
     }

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/dto/MessageImportReviewPageRequestDto.java

@@ -0,0 +1,34 @@
+package cn.com.taiji.msgw.dto;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import cn.com.taiji.core.dto.AbstractBizPageRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
+import cn.com.taiji.core.entity.dict.AuditStatus;
+import cn.com.taiji.core.entity.dict.msgw.MessageType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/***
+ * 分页查询
+ * @Author weicailin
+ * @Date 2023/5/17 14:18
+ * @Email 13079168756@163.com
+ */
+@Getter
+@Setter
+public class MessageImportReviewPageRequestDto extends AbstractBizPageRequestDTO {
+    @ApiModelProperty(value = "消息类型")
+    private MessageType messageType;
+    @ApiModelProperty(value = "状态")
+    private AuditStatus status;
+    @ApiModelProperty(value = "开始时间")
+    private LocalDateTime startTime;//申请时间
+    @ApiModelProperty(value = "结束时间")
+    private LocalDateTime endTime;//申请时间
+
+}

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/importReview/MessageImportManager.java

@@ -17,7 +17,7 @@ import java.io.IOException;
 public interface MessageImportManager {
 
     /**主表-分页查询*/
-    Pagination page(MsgwSendApplyPageRequest request);
+    Pagination page(MessageImportReviewPageRequestDto request);
 
     /**主表-审核*/
     MessageImportAuditResponseDto importAudit(MessageImportAuditRequestDto request) throws ManagerException;

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/importReview/MessageImportManagerImpl.java

@@ -63,8 +63,10 @@ public class MessageImportManagerImpl extends AbstractCommManager implements Mes
     private JPushImportSendHandler jPushImportSendHandler;
 
     @Override
-    public Pagination page(MsgwSendApplyPageRequest request) {
-        return sendApplyRepo.page(request);
+    public Pagination page(MessageImportReviewPageRequestDto request) {
+        MsgwSendApplyPageRequest pageRequest = new MsgwSendApplyPageRequest();
+        BeanUtils.copyProperties(request, pageRequest);
+        return sendApplyRepo.page(pageRequest);
     }
 
     @Override