From 451bcfe3e00e68a3ad32415d06bb4411d11bddfe Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期四, 28 十月 2021 08:53:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/ViolationController.java | 8 ++++++--
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IViolationServiceImpl.java | 8 ++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Violation.java | 14 ++++++++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/ViolationMapper.java | 9 +++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IViolationService.java | 4 ++++
5 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/ViolationController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/ViolationController.java
index 5f5e1ff..0a750f2 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/ViolationController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/ViolationController.java
@@ -49,9 +49,13 @@
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@ApiOperation(value = "鍒嗛〉鑾峰彇")
- public Result<IPage<Violation>> getByPage(PageVo page) {
+ public Result<IPage<Violation>> getByPage(PageVo page,String carNo) {
- IPage<Violation> data = iViolationService.page(PageUtil.initMpPage(page));
+ QueryWrapper<Violation> wrapper = new QueryWrapper<>();
+ if(!StrUtil.isEmpty(carNo)){
+ wrapper.like("b.car_no","%"+carNo+"%");
+ }
+ IPage<Violation> data = iViolationService.page2(PageUtil.initMpPage(page),wrapper);
return new ResultUtil<IPage<Violation>>().setData(data);
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Violation.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Violation.java
index a472525..7e71057 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Violation.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Violation.java
@@ -1,15 +1,20 @@
package cn.exrick.xboot.your.entity;
import cn.exrick.xboot.core.base.XbootBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Entity;
import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.Date;
/**
* @author Exrick
@@ -33,4 +38,13 @@
@ApiModelProperty(value = "杩濈珷绉戠洰")
private String type;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "杩濈珷鏃ユ湡")
+ private Date violationDate;
+
+ @Transient
+ @TableField(exist = false)
+ private String carNo;
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/ViolationMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/ViolationMapper.java
index a09fedf..f3e0f92 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/ViolationMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/ViolationMapper.java
@@ -1,7 +1,13 @@
package cn.exrick.xboot.your.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.exrick.xboot.your.entity.Violation;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.type.JdbcType;
import java.util.List;
@@ -11,4 +17,7 @@
*/
public interface ViolationMapper extends BaseMapper<Violation> {
+ @Select("SELECT a.*,b.car_no as temp FROM t_violation a LEFT JOIN t_car b ON a.car_id=b.id ${ew.customSqlSegment} ")
+ @Results({@Result(column="temp", property="carNo", jdbcType = JdbcType.VARCHAR)})
+ IPage<Violation> page2(Page initMpPage, @Param(Constants.WRAPPER) QueryWrapper<Violation> wrapper);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IViolationService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IViolationService.java
index a15e179..ac368db 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IViolationService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IViolationService.java
@@ -1,5 +1,8 @@
package cn.exrick.xboot.your.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.exrick.xboot.your.entity.Violation;
@@ -11,4 +14,5 @@
*/
public interface IViolationService extends IService<Violation> {
+ IPage<Violation> page2(Page initMpPage, QueryWrapper<Violation> wrapper);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IViolationServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IViolationServiceImpl.java
index d829107..e41a1fa 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IViolationServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IViolationServiceImpl.java
@@ -3,6 +3,9 @@
import cn.exrick.xboot.your.mapper.ViolationMapper;
import cn.exrick.xboot.your.entity.Violation;
import cn.exrick.xboot.your.service.IViolationService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,4 +26,9 @@
@Autowired
private ViolationMapper violationMapper;
+
+ @Override
+ public IPage<Violation> page2(Page initMpPage, QueryWrapper<Violation> wrapper) {
+ return violationMapper.page2(initMpPage,wrapper);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1