xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
@@ -54,9 +54,9 @@ public Result<IPage<Car>> getByPage(String carNo,PageVo page) { QueryWrapper<Car> wrapper = new QueryWrapper<>(); if(!StrUtil.isEmpty(carNo)){ wrapper.like("car_no","%"+carNo+"%"); wrapper.like("a.car_no","%"+carNo+"%"); } IPage<Car> data = iCarService.page(PageUtil.initMpPage(page),wrapper); IPage<Car> data = iCarService.page2(PageUtil.initMpPage(page),wrapper); return new ResultUtil<IPage<Car>>().setData(data); }
@@ -49,9 +49,11 @@ @RequestMapping(value = "/getByPage", method = RequestMethod.GET) @ApiOperation(value = "分页获取") public Result<IPage<CustomerReceive>> getByPage(PageVo page) { IPage<CustomerReceive> data = iCustomerReceiveService.page(PageUtil.initMpPage(page)); public Result<IPage<CustomerReceive>> getByPage(String name,PageVo page) { QueryWrapper<CustomerReceive> wrapper = new QueryWrapper<>(); if (!StrUtil.isEmpty(name)) wrapper.like("b.name","%"+name+"%"); IPage<CustomerReceive> data = iCustomerReceiveService.page2(PageUtil.initMpPage(page),wrapper); return new ResultUtil<IPage<CustomerReceive>>().setData(data); }
New file @@ -0,0 +1,77 @@ package cn.exrick.xboot.your.controller; import cn.exrick.xboot.core.common.utils.PageUtil; import cn.exrick.xboot.core.common.utils.ResultUtil; import cn.exrick.xboot.core.common.vo.PageVo; import cn.exrick.xboot.core.common.vo.Result; import cn.exrick.xboot.your.entity.Suggest; import cn.exrick.xboot.your.service.ISuggestService; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.transaction.annotation.Transactional; import java.util.List; /** * @author zhangzeli */ @Slf4j @RestController @Api(tags = "意见建议管理接口") @RequestMapping("/xboot/suggest") @Transactional public class SuggestController { @Autowired private ISuggestService iSuggestService; @RequestMapping(value = "/get/{id}", method = RequestMethod.GET) @ApiOperation(value = "通过id获取") public Result<Suggest> get(@PathVariable String id) { Suggest suggest = iSuggestService.getById(id); return new ResultUtil<Suggest>().setData(suggest); } @RequestMapping(value = "/getAll", method = RequestMethod.GET) @ApiOperation(value = "获取全部数据") public Result<List<Suggest>> getAll() { List<Suggest> list = iSuggestService.list(); return new ResultUtil<List<Suggest>>().setData(list); } @RequestMapping(value = "/getByPage", method = RequestMethod.GET) @ApiOperation(value = "分页获取") public Result<IPage<Suggest>> getByPage(PageVo page) { IPage<Suggest> data = iSuggestService.page(PageUtil.initMpPage(page)); return new ResultUtil<IPage<Suggest>>().setData(data); } @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST) @ApiOperation(value = "编辑或更新数据") public Result<Suggest> saveOrUpdate(Suggest suggest) { if (iSuggestService.saveOrUpdate(suggest)) { return new ResultUtil<Suggest>().setData(suggest); } return new ResultUtil<Suggest>().setErrorMsg("操作失败"); } @RequestMapping(value = "/delByIds", method = RequestMethod.POST) @ApiOperation(value = "批量通过id删除") public Result<Object> delAllByIds(@RequestParam String[] ids) { for (String id : ids) { iSuggestService.removeById(id); } return ResultUtil.success("批量通过id删除数据成功"); } } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Car.java
@@ -1,6 +1,7 @@ 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; @@ -12,6 +13,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.util.Date; /** @@ -57,4 +59,12 @@ @ApiModelProperty(value = "当前跟车人id") private String followUserId; @Transient @TableField(exist = false) private String nickName; @Transient @TableField(exist = false) private String followNickName; } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java
@@ -1,6 +1,7 @@ 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; @@ -12,6 +13,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.util.Date; /** @@ -28,7 +30,7 @@ private static final long serialVersionUID = 1L; @ApiModelProperty(value = "区域id") @ApiModelProperty(value = "商户id") private String customerId; @ApiModelProperty(value = "名称") @@ -37,4 +39,13 @@ @ApiModelProperty(value = "联系方式") private String phone; @ApiModelProperty(value = "状态(0:待审核 1：审核通过 2：审核未通过)") private int status; @ApiModelProperty(value = "未通过原因") private String content; @Transient @TableField(exist = false) private String customerName; } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Suggest.java
New file @@ -0,0 +1,43 @@ package cn.exrick.xboot.your.entity; import cn.exrick.xboot.core.base.XbootBaseEntity; 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 java.util.Date; /** * @author Exrick */ @Data @Entity @DynamicInsert @DynamicUpdate @Table(name = "t_suggest") @TableName("t_suggest") @ApiModel(value = "维修记录") public class Suggest extends XbootBaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "意见分类字典表id") private String dictDataId; @ApiModelProperty(value = "内容") private String content; @ApiModelProperty(value = "商户ID") private String customerId; @ApiModelProperty(value = "司机或随车员id") private String userId; } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java
@@ -1,8 +1,17 @@ package cn.exrick.xboot.your.mapper; import cn.exrick.xboot.your.entity.Area; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.Param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.exrick.xboot.your.entity.Car; import org.apache.ibatis.annotations.Result; import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.type.JdbcType; import java.util.List; @@ -11,4 +20,8 @@ * @author zhangzeli */ public interface CarMapper extends BaseMapper<Car> { @Select("SELECT a.*,b1.nickname AS temp,b2.nickname AS followNickName FROM t_car a LEFT JOIN t_user AS b1 ON a.user_id = b1.id LEFT JOIN t_user AS b2 ON a.follow_user_id = b2.id ${ew.customSqlSegment} ") @Results({@Result(column="temp", property="nickName", jdbcType = JdbcType.VARCHAR)}) IPage<Car> page2(Page initMpPage, @Param(Constants.WRAPPER) QueryWrapper<Car> wrapper); } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerReceiveMapper.java
@@ -1,7 +1,16 @@ 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.CustomerReceive; 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.Param; import org.apache.ibatis.annotations.Result; import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.type.JdbcType; import java.util.List; @@ -11,4 +20,7 @@ */ public interface CustomerReceiveMapper extends BaseMapper<CustomerReceive> { @Select("SELECT a.*,b.name as temp FROM t_customer_receive a LEFT JOIN t_customer b ON a.customer_id=b.id ${ew.customSqlSegment} ORDER BY a.status ASC,a.create_time DESC") @Results({@Result(column="temp", property="customerName", jdbcType = JdbcType.VARCHAR)}) IPage<CustomerReceive> page2(Page initMpPage, @Param(Constants.WRAPPER) QueryWrapper<CustomerReceive> wrapper); } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/SuggestMapper.java
New file @@ -0,0 +1,26 @@ package cn.exrick.xboot.your.mapper; import cn.exrick.xboot.your.entity.CustomerReceive; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.exrick.xboot.your.entity.Suggest; 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.Param; import org.apache.ibatis.annotations.Result; import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.type.JdbcType; import java.util.List; /** * 意见建议数据处理层 * @author zhangzeli */ public interface SuggestMapper extends BaseMapper<Suggest> { @Select("SELECT a.*,b.name as temp FROM t_customer_receive a LEFT JOIN t_customer b ON a.customer_id=b.id ${ew.customSqlSegment} ORDER BY a.status ASC,a.create_time DESC") @Results({@Result(column="temp", property="customerName", jdbcType = JdbcType.VARCHAR)}) IPage<CustomerReceive> page2(Page initMpPage, @Param(Constants.WRAPPER) QueryWrapper<CustomerReceive> wrapper); } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICarService.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.Car; @@ -11,4 +14,5 @@ */ public interface ICarService extends IService<Car> { IPage<Car> page2(Page initMpPage, QueryWrapper<Car> wrapper); } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerReceiveService.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.CustomerReceive; @@ -11,4 +14,5 @@ */ public interface ICustomerReceiveService extends IService<CustomerReceive> { IPage<CustomerReceive> page2(Page initMpPage, QueryWrapper<CustomerReceive> wrapper); } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ISuggestService.java
New file @@ -0,0 +1,18 @@ 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.Suggest; import java.util.List; /** * 意见建议接口 * @author zhangzeli */ public interface ISuggestService extends IService<Suggest> { IPage<Suggest> page2(Page initMpPage, QueryWrapper<Suggest> wrapper); } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICarServiceImpl.java
@@ -3,6 +3,9 @@ import cn.exrick.xboot.your.mapper.CarMapper; import cn.exrick.xboot.your.entity.Car; import cn.exrick.xboot.your.service.ICarService; 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 CarMapper carMapper; @Override public IPage<Car> page2(Page initMpPage, QueryWrapper<Car> wrapper) { return carMapper.page2(initMpPage,wrapper); } } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerReceiveServiceImpl.java
@@ -3,6 +3,9 @@ import cn.exrick.xboot.your.mapper.CustomerReceiveMapper; import cn.exrick.xboot.your.entity.CustomerReceive; import cn.exrick.xboot.your.service.ICustomerReceiveService; 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 CustomerReceiveMapper customerReceiveMapper; @Override public IPage<CustomerReceive> page2(Page initMpPage, QueryWrapper<CustomerReceive> wrapper) { return customerReceiveMapper.page2(initMpPage,wrapper); } } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ISuggestServiceImpl.java
New file @@ -0,0 +1,34 @@ package cn.exrick.xboot.your.serviceimpl; import cn.exrick.xboot.your.mapper.SuggestMapper; import cn.exrick.xboot.your.entity.Suggest; import cn.exrick.xboot.your.service.ISuggestService; 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; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; /** * 意见建议接口实现 * @author zhangzeli */ @Slf4j @Service @Transactional public class ISuggestServiceImpl extends ServiceImpl<SuggestMapper, Suggest> implements ISuggestService { @Autowired private SuggestMapper suggestMapper; @Override public IPage<Suggest> page2(Page initMpPage, QueryWrapper<Suggest> wrapper) { return null; } } xboot-modules/xboot-your/src/main/resources/mapper/SuggestMapper.xml
New file @@ -0,0 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="cn.exrick.xboot.your.mapper.SuggestMapper"> </mapper>
