短信查询接口增加按照任务类型和审核时间筛选

src/main/java/org/springblade/sms/bean/dto/AdsMarketTaskInfo.java

@@ -117,5 +117,8 @@ public class AdsMarketTaskInfo implements Serializable {
 	
 	@ApiModelProperty(value = "手机号是否脱敏（0-不脱敏；1-脱敏；默认值为：0）", required = false)
 	private Integer desens;
+	
+	@ApiModelProperty("终审时间")
+	private Date checkTime;
 
 }

src/main/java/org/springblade/sms/bean/dto/AdsMarketTaskInfoChecker.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 短信推送任务审核人表
@@ -32,4 +33,7 @@ public class AdsMarketTaskInfoChecker implements Serializable {
 
 	@ApiModelProperty("任务ID")
 	private Long taskId;
+	
+	@ApiModelProperty("审核时间")
+	private Date checkTime;
 }

src/main/java/org/springblade/sms/bean/params/TaskPageParam.java

@@ -1,5 +1,9 @@
 package org.springblade.sms.bean.params;
 
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -34,6 +38,17 @@ public class TaskPageParam {
 
 	@ApiModelProperty("审核状态：-1：审核未通过（作废）；0-待审核；1-审核通过；")
 	private Integer checkStatus;
+	
+	@ApiModelProperty("任务属性(1-激活类,2-营销类,3-领取类)")
+	private Integer taskType;
+	
+	@ApiModelProperty("审核时间 - 开始")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date checkTimeStart;
+	
+	@ApiModelProperty("审核时间 - 截止")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date checkTimeEnd;
 
 	public Integer getCurrent() {
 		return current == null || current < 1 ? 1 : current;

src/main/java/org/springblade/sms/controller/AdsMarketTaskInfoController.java

@@ -1,5 +1,6 @@
 package org.springblade.sms.controller;
 
+import java.util.Date;
 import java.util.List;
 
 import org.springblade.core.boot.ctrl.BladeController;
@@ -30,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -63,9 +65,11 @@ public class AdsMarketTaskInfoController extends BladeController {
 
 	@GetMapping("/test/sms")
 	@ApiOperation(value = "测试发短信")
-	@ApiImplicitParams({ @ApiImplicitParam(name = "taskId", value = "任务ID", dataType = "string", required = true),
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "taskId", value = "任务ID", dataType = "string", required = true),
 			@ApiImplicitParam(name = "mobile", value = "测试手机号", dataType = "string", required = true),
-			@ApiImplicitParam(name = "isSendSms", value = "是否发送短信(true-发送；false-不发送)", dataType = "boolean", required = true), })
+			@ApiImplicitParam(name = "isSendSms", value = "是否发送短信(true-发送；false-不发送)", dataType = "boolean", required = true),
+	})
 	public R<Kv> test(String mobile, boolean isSendSms, Long taskId) {
 		AdsMarketTaskInfo task = adsMarketTaskInfoService.getById(taskId);
 		if (task == null) {
@@ -103,8 +107,10 @@ public class AdsMarketTaskInfoController extends BladeController {
 
 	@GetMapping("/check")
 	@ApiOperation(value = "任务审核")
-	@ApiImplicitParams({ @ApiImplicitParam(name = "taskId", value = "任务ID", dataType = "string", required = true),
-			@ApiImplicitParam(name = "status", value = "审核状态(1-通过；2-作废)", dataType = "integer", required = true), })
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "taskId", value = "任务ID", dataType = "string", required = true),
+			@ApiImplicitParam(name = "status", value = "审核状态(1-通过；2-作废)", dataType = "integer", required = true),
+	})
 	public R<String> check(Long taskId, Integer status) {
 		AdsMarketTaskInfo task = adsMarketTaskInfoService.getById(taskId);
 		String checkerId = String.valueOf(SecureUtil.getUserId());
@@ -128,8 +134,10 @@ public class AdsMarketTaskInfoController extends BladeController {
 		} else {
 			checker.setStatus(CheckStatus.no.getValue());
 			task.setCheckStatus(CheckStatus.no.getValue());
+			task.setCheckTime(new Date());
 			adsMarketTaskInfoService.updateById(task);
 		}
+		checker.setCheckTime(new Date());
 		checkerService.updateById(checker);
 
 		// 所有审核人员是否都审核完成
@@ -138,6 +146,7 @@ public class AdsMarketTaskInfoController extends BladeController {
 		boolean isCheckOk = checkerService.isCheckOk(taskId);
 		if (isAllChecked && isCheckOk) {
 			// 全票通过，更新任务审核状态
+			task.setCheckTime(new Date());
 			task.setCheckStatus(CheckStatus.ok.getValue());
 			adsMarketTaskInfoService.updateById(task);
 
@@ -182,6 +191,15 @@ public class AdsMarketTaskInfoController extends BladeController {
 		if (params.getCheckStatus() != null) {
 			where.append(" and t.check_status = " + params.getCheckStatus());
 		}
+		if (params.getTaskType() != null) {
+			where.append(" and t.task_type = " + params.getTaskType());
+		}
+		if (params.getCheckTimeStart() != null) {
+			where.append(" and t.check_time >= '" + DateUtil.formatDateTime(params.getCheckTimeStart()) + "'");
+		}
+		if (params.getCheckTimeEnd() != null) {
+			where.append(" and t.check_time <= '" + DateUtil.formatDateTime(params.getCheckTimeEnd()) + "'");
+		}
 
 		StringBuffer join = new StringBuffer();
 		if (StrUtil.isNotBlank(params.getCheckUserName())) {

src/main/java/org/springblade/sms/service/AdsMarketTaskInfoService.java

@@ -75,7 +75,7 @@ public class AdsMarketTaskInfoService extends ServiceImpl<AdsMarketTaskInfoMappe
 
 		sql.append(" order by t.add_time desc");
 		sql.append(" limit " + (current - 1) * size + "," + size + "");
-
+		
 		Kv data = Kv.create();
 		data.set("current", current);
 		data.set("size", size);