|
|
@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiParam;
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
|
import org.springblade.business.entity.MessageWarning;
|
|
|
import org.springblade.business.vo.MessageWarningVO;
|
|
|
import org.springblade.core.mp.support.Condition;
|
|
|
@@ -72,10 +73,14 @@ public class MessageWarningController extends BladeController {
|
|
|
@GetMapping("/list")
|
|
|
@ApiOperationSupport(order = 1)
|
|
|
@ApiOperation(value = "分页", notes = "传入operationWarning")
|
|
|
- public R<IPage<MessageWarning>> list(MessageWarningVO operationWarning, Query query) {
|
|
|
- QueryWrapper<MessageWarning> wrapper = Condition.getQueryWrapper(operationWarning);
|
|
|
+ public R<IPage<MessageWarning>> list(MessageWarningVO vo, Query query) {
|
|
|
+ QueryWrapper<MessageWarning> wrapper = Condition.getQueryWrapper(vo);
|
|
|
//获取当前人的数据
|
|
|
wrapper.lambda().eq(MessageWarning::getPushUser, AuthUtil.getUserId().toString());
|
|
|
+ if(StringUtils.isNotEmpty(vo.getStartTime())){
|
|
|
+ wrapper.lambda().between(MessageWarning::getCreateTime, vo.getStartTime(), vo.getEndTime());
|
|
|
+ }
|
|
|
+
|
|
|
//时间倒序，状态正序(已读在后，未读在前)
|
|
|
wrapper.lambda().orderByDesc(MessageWarning::getCreateTime).orderByAsc(MessageWarning::getStatus);
|
|
|
|
huangjn