意见建议

zhangzeli

2021-11-09 4e86342ca37a01571d9486807489325b5f034a51

意见建议

 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("a.car_no","%"+carNo+"%");
            wrapper.like("car_no","%"+carNo+"%");
        }
        IPage<Car> data = iCarService.page2(PageUtil.initMpPage(page),wrapper);
        IPage<Car> data = iCarService.page(PageUtil.initMpPage(page),wrapper);
        return new ResultUtil<IPage<Car>>().setData(data);
    }


 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java

@@ -49,11 +49,9 @@

    @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
    @ApiOperation(value = "分页获取")
    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);
    public Result<IPage<CustomerReceive>> getByPage(PageVo page) {

        IPage<CustomerReceive> data = iCustomerReceiveService.page(PageUtil.initMpPage(page));
        return new ResultUtil<IPage<CustomerReceive>>().setData(data);
    }


 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SuggestController.java

File was deleted

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Car.java

@@ -1,7 +1,6 @@
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;
@@ -13,7 +12,6 @@

import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;

/**
@@ -58,13 +56,5 @@

    @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,7 +1,6 @@
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;
@@ -13,7 +12,6 @@

import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;

/**
@@ -30,7 +28,7 @@

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "商户id")
    @ApiModelProperty(value = "区域id")
    private String customerId;

    @ApiModelProperty(value = "名称")
@@ -39,13 +37,4 @@
    @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

File was deleted

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java

@@ -1,17 +1,8 @@
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;

@@ -20,8 +11,4 @@
 * @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,16 +1,7 @@
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;

@@ -20,7 +11,4 @@
 */
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

File was deleted

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICarService.java

@@ -1,8 +1,5 @@
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;

@@ -14,5 +11,4 @@
 */
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,8 +1,5 @@
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;

@@ -14,5 +11,4 @@
 */
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

File was deleted

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICarServiceImpl.java

@@ -3,9 +3,6 @@
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;
@@ -26,9 +23,4 @@

    @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,9 +3,6 @@
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;
@@ -26,9 +23,4 @@

    @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

File was deleted

 xboot-modules/xboot-your/src/main/resources/mapper/SuggestMapper.xml

File was deleted