From 651f8e426aa57ec5ebcdfddf840a21449dff4269 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 20 二月 2023 18:06:43 +0800 Subject: [PATCH] 代理商管理,司机管理部分 --- management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 70 +++++++++++++---------------------- 1 files changed, 26 insertions(+), 44 deletions(-) diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java index a47b5e0..2a7b2a3 100644 --- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java +++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java @@ -1,64 +1,46 @@ package com.stylefeng.guns.modular.system.service.impl; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.stylefeng.guns.core.util.DateUtil; import com.stylefeng.guns.modular.system.model.TDriver; import com.stylefeng.guns.modular.system.dao.TDriverMapper; import com.stylefeng.guns.modular.system.service.ITDriverService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; -import java.util.List; -import java.util.Map; +import java.util.Date; +import java.util.Objects; /** * <p> - * 司机表 服务实现类 + * 司机基础信息 服务实现类 * </p> * - * @author 吕雪 - * @since 2020-06-04 + * @author stylefeng + * @since 2023-02-20 */ @Service public class TDriverServiceImpl extends ServiceImpl<TDriverMapper, TDriver> implements ITDriverService { @Override - public List<Map<String, Object>> getAuthDriverList(Page<Map<String, Object>> page, String beginTime, String endTime, String companyName, String phone, String account, Integer addType, Integer authState) { - return this.baseMapper.getAuthDriverList(page, beginTime, endTime, companyName, phone, account, addType, authState); + public EntityWrapper<TDriver> getPageList(String createTime, String phone, Integer status) { + EntityWrapper<TDriver> wrapper = new EntityWrapper<>(); + // 手机号 + if(StringUtils.hasLength(phone)){ + wrapper.like("phone",phone); + } + // 状态 + if(Objects.nonNull(status)){ + wrapper.eq("status",status); + } + // 开始,结束时间 + if(StringUtils.hasLength(createTime)){ + String[] split = createTime.split(" - "); + Date startTime = DateUtil.getDate_str4(split[0]); + Date endTime = DateUtil.getDate_str4(split[1]); + wrapper.between("createTime",startTime,endTime); + } + return wrapper; } - - @Override - public Map<String, Object> getDriverById(Integer driverId) { - return this.baseMapper.getDriverById(driverId); - } - - @Override - public List<Map<String, Object>> getDriverList(Page<Map<String, Object>> page, Integer roleType,Integer nowUserId,String beginTime, String endTime, String companyName, String phone, String name, Integer addType, Integer authState) { - return this.baseMapper.getDriverList(page,roleType,nowUserId, beginTime, endTime, companyName, phone, name, addType, authState); - } - - @Override - public String getUseCarIdStr(Integer carId) { - return this.baseMapper.getUseCarIdStr(carId); - } - - @Override - public List<Map<String, Object>> getCanSelectCarList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String carIdStr, String carLicensePlate, String brandName, String modelName, String color, String serverStr) { - return this.baseMapper.getCanSelectCarList(page, roleType, nowUserId, carIdStr, carLicensePlate, brandName, modelName, color, serverStr); - } - - @Override - public void updateCompanyDriverState(Integer authState, Integer companyId) { - this.baseMapper.updateCompanyDriverState(authState, companyId); - } - - @Override - public void updateFranchiseeDriverState(Integer authState, Integer franchiseeId) { - this.baseMapper.updateFranchiseeDriverState(authState, franchiseeId); - } - - @Override - public List<Map<String, Object>> getDriverListNoPage(Integer roleType, Integer nowUserId) { - return this.baseMapper.getDriverListNoPage(roleType, nowUserId); - } - } -- Gitblit v1.7.1