From 7347a9c4e4c6fe97e28ade283b6c43a9f3705168 Mon Sep 17 00:00:00 2001 From: luojian <1327479187@qq.com> Date: Tue, 17 Dec 2024 17:02:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=90=8E=E5=8F=B0=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/biz/BizCarController.java | 38 +++++++---- .../controller/biz/BizCarModelController.java | 38 +++++++---- cpxt-admin/src/main/resources/application.yml | 3 + cpxt-common/pom.xml | 6 ++ .../common/core/domain/entity/SysUser.java | 13 ++++ .../src/main/resources/vm/vue/index.vue.vm | 13 ++-- .../main/java/com/cpxt/biz/domain/BizCar.java | 1 - .../java/com/cpxt/biz/domain/BizDriver.java | 4 ++ .../cpxt/biz/service/IBizCarModelService.java | 11 +++ .../com/cpxt/biz/service/IBizCarService.java | 5 ++ .../service/impl/BizCarModelServiceImpl.java | 41 ++++++++++-- .../biz/service/impl/BizCarServiceImpl.java | 49 ++++++++++++-- .../impl/BizCustomerRouteServiceImpl.java | 12 +++- .../service/impl/BizCustomerServiceImpl.java | 12 +++- .../impl/BizCustomerShopServiceImpl.java | 12 +++- .../impl/BizCustomerUserServiceImpl.java | 12 +++- .../impl/BizCustomerWarehouseServiceImpl.java | 12 +++- .../service/impl/BizDriverServiceImpl.java | 67 +++++++++++++++++-- .../biz/service/impl/BizOrderServiceImpl.java | 12 +++- .../service/impl/BizOrderSubServiceImpl.java | 12 +++- .../resources/mapper/system/SysUserMapper.xml | 12 ++-- 21 files changed, 320 insertions(+), 65 deletions(-) diff --git a/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCarController.java b/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCarController.java index 0402c5b..6f038d9 100644 --- a/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCarController.java +++ b/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCarController.java @@ -2,16 +2,12 @@ package com.cpxt.web.controller.biz; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cpxt.common.constant.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.cpxt.common.annotation.Log; import com.cpxt.common.core.controller.BaseController; import com.cpxt.common.core.domain.AjaxResult; @@ -35,15 +31,31 @@ public class BizCarController extends BaseController private IBizCarService bizCarService; /** - * 查询车辆列表 + * 查询车辆列表（分页） */ @PreAuthorize("@ss.hasPermi('biz:car:list')") @GetMapping("/list") - public TableDataInfo list(BizCar bizCar) + public TableDataInfo list(BizCar bizCar, + @RequestParam(defaultValue = "1") int pageNum, + @RequestParam(defaultValue = "10") int pageSize) { - startPage(); - List list = bizCarService.selectBizCarList(bizCar); - return getDataTable(list); + Page recordPage = bizCarService.selectBizCarPage(bizCar,pageNum,pageSize); + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + rspData.setRows(recordPage.getRecords()); + rspData.setTotal(recordPage.getTotal()); + return rspData; + } + + /** + * 查询车辆列表（分页） + */ + @PreAuthorize("@ss.hasPermi('biz:car:list')") + @GetMapping("/list2") + public AjaxResult list2(BizCar bizCar) + { + return AjaxResult.success(bizCarService.selectBizCarList(bizCar)); } /** diff --git a/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCarModelController.java b/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCarModelController.java index d2e5180..167f444 100644 --- a/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCarModelController.java +++ b/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCarModelController.java @@ -2,16 +2,12 @@ package com.cpxt.web.controller.biz; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cpxt.common.constant.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.cpxt.common.annotation.Log; import com.cpxt.common.core.controller.BaseController; import com.cpxt.common.core.domain.AjaxResult; @@ -35,15 +31,31 @@ public class BizCarModelController extends BaseController private IBizCarModelService bizCarModelService; /** - * 查询车型列表 + * 查询车型列表（分页） */ @PreAuthorize("@ss.hasPermi('biz:model:list')") @GetMapping("/list") - public TableDataInfo list(BizCarModel bizCarModel) + public TableDataInfo list(BizCarModel bizCarModel, + @RequestParam(defaultValue = "1") int pageNum, + @RequestParam(defaultValue = "10") int pageSize) { - startPage(); - List list = bizCarModelService.selectBizCarModelList(bizCarModel); - return getDataTable(list); + Page recordPage = bizCarModelService.selectBizCarModelPage(bizCarModel,pageNum,pageSize); + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + rspData.setRows(recordPage.getRecords()); + rspData.setTotal(recordPage.getTotal()); + return rspData; + } + + /** + * 查询车型列表（不分页） + */ + @PreAuthorize("@ss.hasPermi('biz:model:list')") + @GetMapping("/list2") + public AjaxResult list2(BizCarModel bizCarModel) + { + return AjaxResult.success(bizCarModelService.selectBizCarModelList(bizCarModel)); } /** diff --git a/cpxt-admin/src/main/resources/application.yml b/cpxt-admin/src/main/resources/application.yml index 7f66464..c9433d1 100644 --- a/cpxt-admin/src/main/resources/application.yml +++ b/cpxt-admin/src/main/resources/application.yml @@ -105,6 +105,9 @@ mybatis-plus: mapperLocations: classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 configLocation: classpath:mybatis/mybatis-config.xml + global-config: + db-config: + id-type: auto # PageHelper分页插件 pagehelper: diff --git a/cpxt-common/pom.xml b/cpxt-common/pom.xml index 95090ca..96d9401 100644 --- a/cpxt-common/pom.xml +++ b/cpxt-common/pom.xml @@ -131,6 +131,12 @@ lombok + + cn.hutool + hutool-all + 5.5.7 + + \ No newline at end of file diff --git a/cpxt-common/src/main/java/com/cpxt/common/core/domain/entity/SysUser.java b/cpxt-common/src/main/java/com/cpxt/common/core/domain/entity/SysUser.java index 839243d..60a66da 100644 --- a/cpxt-common/src/main/java/com/cpxt/common/core/domain/entity/SysUser.java +++ b/cpxt-common/src/main/java/com/cpxt/common/core/domain/entity/SysUser.java @@ -37,6 +37,10 @@ public class SysUser extends BaseEntity @Excel(name = "用户名称") private String nickName; + /** 用户类型 */ + @Excel(name = "用户类型") + private String userType; + /** 用户邮箱 */ @Excel(name = "用户邮箱") private String email; @@ -154,6 +158,15 @@ public class SysUser extends BaseEntity this.userName = userName; } + public String getUserType() { + return userType; + } + + public void setUserType(String userType) { + this.userType = userType; + } + + @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") public String getEmail() diff --git a/cpxt-generator/src/main/resources/vm/vue/index.vue.vm b/cpxt-generator/src/main/resources/vm/vue/index.vue.vm index 6296014..8be0fcf 100644 --- a/cpxt-generator/src/main/resources/vm/vue/index.vue.vm +++ b/cpxt-generator/src/main/resources/vm/vue/index.vue.vm @@ -62,8 +62,8 @@ #end #end - 搜索 - 重置 + 搜索 + 重置 @@ -71,9 +71,8 @@ 新增 @@ -101,11 +100,9 @@ >删除 - 导出 diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCar.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCar.java index 2819b2b..1aa4d2a 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCar.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCar.java @@ -3,7 +3,6 @@ package com.cpxt.biz.domain; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import com.cpxt.common.annotation.Excel; -import com.cpxt.common.core.domain.BaseEntity; import java.util.Date; diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizDriver.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizDriver.java index 9f7568b..7f01eb2 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizDriver.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizDriver.java @@ -27,6 +27,10 @@ public class BizDriver @Excel(name = "部门ID") private Long deptId; + /** 部门名称 */ + @Excel(name = "部门名称") + private String deptName; + /** 用户ID */ @Excel(name = "用户ID") private Long userId; diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/IBizCarModelService.java b/cpxt-system/src/main/java/com/cpxt/biz/service/IBizCarModelService.java index f0006a3..e16b014 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/IBizCarModelService.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/IBizCarModelService.java @@ -1,6 +1,8 @@ package com.cpxt.biz.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cpxt.biz.domain.BizCarModel; /** @@ -19,6 +21,15 @@ public interface IBizCarModelService */ public BizCarModel selectBizCarModelById(Long id); + /** + * 查询车型列表 + * + * @param bizCarModel 车型 + * @return 车型集合 + */ + public Page selectBizCarModelPage(BizCarModel bizCarModel,int pageNum, int pageSize); + + /** * 查询车型列表 * diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/IBizCarService.java b/cpxt-system/src/main/java/com/cpxt/biz/service/IBizCarService.java index 99f163c..fba1cab 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/IBizCarService.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/IBizCarService.java @@ -1,6 +1,8 @@ package com.cpxt.biz.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cpxt.biz.domain.BizCar; /** @@ -58,4 +60,7 @@ public interface IBizCarService * @return 结果 */ public int deleteBizCarById(Long id); + + Page selectBizCarPage(BizCar bizCar,int pageNum,int pageSize); + } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarModelServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarModelServiceImpl.java index 742a0ec..08ee0e9 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarModelServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarModelServiceImpl.java @@ -3,7 +3,11 @@ package com.cpxt.biz.service.impl; import java.util.Arrays; import java.util.List; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cpxt.biz.domain.BizCar; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,6 +39,30 @@ public class BizCarModelServiceImpl implements IBizCarModelService return bizCarModelMapper.selectById(id); } + /** + * 查询车型列表 + * + * @param bizCarModel 车型 + * @return 车型 + */ + @Override + public Page selectBizCarModelPage(BizCarModel bizCarModel, int pageNum, int pageSize) + { + LambdaQueryWrapper queryWrapper = buildQueryWrapper(bizCarModel); + return bizCarModelMapper.selectPage(new Page(pageNum,pageSize),queryWrapper); + } + + private LambdaQueryWrapper buildQueryWrapper(BizCarModel bizCarModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (ObjectUtil.isNotEmpty(bizCarModel.getBrand())) { + queryWrapper.like(BizCarModel::getBrand, bizCarModel.getBrand()); + } + if (ObjectUtil.isNotEmpty(bizCarModel.getName())) { + queryWrapper.like(BizCarModel::getName, bizCarModel.getName()); + } + return queryWrapper; + } + /** * 查询车型列表 * @@ -44,8 +72,7 @@ public class BizCarModelServiceImpl implements IBizCarModelService @Override public List selectBizCarModelList(BizCarModel bizCarModel) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - + LambdaQueryWrapper queryWrapper = buildQueryWrapper(bizCarModel); return bizCarModelMapper.selectList(queryWrapper); } @@ -82,7 +109,10 @@ public class BizCarModelServiceImpl implements IBizCarModelService @Override public int deleteBizCarModelByIds(Long[] ids) { - return bizCarModelMapper.deleteBatchIds(Arrays.asList(ids)); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id", (Object) ids); + updateWrapper.set("status","2"); //状态改为删除 + return bizCarModelMapper.update(null,updateWrapper); } /** @@ -94,6 +124,9 @@ public class BizCarModelServiceImpl implements IBizCarModelService @Override public int deleteBizCarModelById(Long id) { - return bizCarModelMapper.deleteById(id); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id); + updateWrapper.set("status","2"); //状态改为删除 + return bizCarModelMapper.update(null,updateWrapper); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarServiceImpl.java index c84cc59..dd669f6 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarServiceImpl.java @@ -3,7 +3,10 @@ package com.cpxt.biz.service.impl; import java.util.Arrays; import java.util.List; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,6 +38,39 @@ public class BizCarServiceImpl implements IBizCarService return bizCarMapper.selectById(id); } + /** + * 查询车辆列表（分页） + * + * @param bizCar 车辆 + * @return 车辆 + */ + @Override + public Page selectBizCarPage(BizCar bizCar,int pageNum,int pageSize) + { + LambdaQueryWrapper queryWrapper = buildQueryWrapper(bizCar); + return bizCarMapper.selectPage(new Page(pageNum,pageSize),queryWrapper); + } + + private LambdaQueryWrapper buildQueryWrapper(BizCar bizCar) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (ObjectUtil.isNotEmpty(bizCar.getModelName())) { + queryWrapper.like(BizCar::getModelName, bizCar.getModelName()); + } + if (ObjectUtil.isNotEmpty(bizCar.getCarType())) { + queryWrapper.eq(BizCar::getCarType, bizCar.getCarType()); + } + if (ObjectUtil.isNotEmpty(bizCar.getCarNo())) { + queryWrapper.like(BizCar::getCarNo, bizCar.getCarNo()); + } + if (ObjectUtil.isNotEmpty(bizCar.getVin())) { + queryWrapper.like(BizCar::getVin, bizCar.getVin()); + } + if (ObjectUtil.isNotEmpty(bizCar.getSerialNo())) { + queryWrapper.like(BizCar::getSerialNo, bizCar.getSerialNo()); + } + return queryWrapper; + } + /** * 查询车辆列表 * @@ -44,8 +80,7 @@ public class BizCarServiceImpl implements IBizCarService @Override public List selectBizCarList(BizCar bizCar) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - + LambdaQueryWrapper queryWrapper = buildQueryWrapper(bizCar); return bizCarMapper.selectList(queryWrapper); } @@ -82,7 +117,10 @@ public class BizCarServiceImpl implements IBizCarService @Override public int deleteBizCarByIds(Long[] ids) { - return bizCarMapper.deleteBatchIds(Arrays.asList(ids)); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id", (Object) ids); + updateWrapper.set("status","2"); //状态改为删除 + return bizCarMapper.update(null,updateWrapper); } /** @@ -94,6 +132,9 @@ public class BizCarServiceImpl implements IBizCarService @Override public int deleteBizCarById(Long id) { - return bizCarMapper.deleteById(id); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",id); + updateWrapper.set("status","2"); //状态改为删除 + return bizCarMapper.update(null,updateWrapper); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerRouteServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerRouteServiceImpl.java index c46b484..aa8ad94 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerRouteServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerRouteServiceImpl.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.cpxt.biz.domain.BizCustomer; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -82,7 +84,10 @@ public class BizCustomerRouteServiceImpl implements IBizCustomerRouteService @Override public int deleteBizCustomerRouteByIds(Long[] ids) { - return bizCustomerRouteMapper.deleteBatchIds(Arrays.asList(ids)); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id", (Object) ids); + updateWrapper.set("status","2"); //状态改为删除 + return bizCustomerRouteMapper.update(null,updateWrapper); } /** @@ -94,6 +99,9 @@ public class BizCustomerRouteServiceImpl implements IBizCustomerRouteService @Override public int deleteBizCustomerRouteById(Long id) { - return bizCustomerRouteMapper.deleteById(id); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id); + updateWrapper.set("status","2"); //状态改为删除 + return bizCustomerRouteMapper.update(null,updateWrapper); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerServiceImpl.java index ef22d95..bf95432 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerServiceImpl.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.cpxt.biz.domain.BizCarModel; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -82,7 +84,10 @@ public class BizCustomerServiceImpl implements IBizCustomerService @Override public int deleteBizCustomerByIds(Long[] ids) { - return bizCustomerMapper.deleteBatchIds(Arrays.asList(ids)); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id", (Object) ids); + updateWrapper.set("status","2"); //状态改为删除 + return bizCustomerMapper.update(null,updateWrapper); } /** @@ -94,6 +99,9 @@ public class BizCustomerServiceImpl implements IBizCustomerService @Override public int deleteBizCustomerById(Long id) { - return bizCustomerMapper.deleteById(id); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",id); + updateWrapper.set("status","2"); //状态改为删除 + return bizCustomerMapper.update(null,updateWrapper); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerShopServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerShopServiceImpl.java index ff3e182..c2b90aa 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerShopServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerShopServiceImpl.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.cpxt.biz.domain.BizCustomerRoute; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -81,7 +83,10 @@ public class BizCustomerShopServiceImpl implements IBizCustomerShopService @Override public int deleteBizCustomerShopByIds(Long[] ids) { - return bizCustomerShopMapper.deleteBatchIds(Arrays.asList(ids)); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id", (Object) ids); + updateWrapper.set("status","2"); //状态改为删除 + return bizCustomerShopMapper.update(null,updateWrapper); } /** @@ -93,6 +98,9 @@ public class BizCustomerShopServiceImpl implements IBizCustomerShopService @Override public int deleteBizCustomerShopById(Long id) { - return bizCustomerShopMapper.deleteById(id); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id); + updateWrapper.set("status","2"); //状态改为删除 + return bizCustomerShopMapper.update(null,updateWrapper); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerUserServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerUserServiceImpl.java index 69037ef..c024b58 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerUserServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerUserServiceImpl.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.cpxt.biz.domain.BizCustomerShop; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.cpxt.biz.mapper.BizCustomerUserMapper; @@ -80,7 +82,10 @@ public class BizCustomerUserServiceImpl implements IBizCustomerUserService @Override public int deleteBizCustomerUserByIds(Long[] ids) { - return bizCustomerUserMapper.deleteBatchIds(Arrays.asList(ids)); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id", (Object) ids); + updateWrapper.set("status","2"); //状态改为删除 + return bizCustomerUserMapper.update(null,updateWrapper); } /** @@ -92,6 +97,9 @@ public class BizCustomerUserServiceImpl implements IBizCustomerUserService @Override public int deleteBizCustomerUserById(Long id) { - return bizCustomerUserMapper.deleteById(id); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id); + updateWrapper.set("status","2"); //状态改为删除 + return bizCustomerUserMapper.update(null,updateWrapper); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerWarehouseServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerWarehouseServiceImpl.java index db4f048..c182a22 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerWarehouseServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerWarehouseServiceImpl.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.cpxt.biz.domain.BizCustomerUser; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -82,7 +84,10 @@ public class BizCustomerWarehouseServiceImpl implements IBizCustomerWarehouseSer @Override public int deleteBizCustomerWarehouseByIds(Long[] ids) { - return bizCustomerWarehouseMapper.deleteBatchIds(Arrays.asList(ids)); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id", (Object) ids); + updateWrapper.set("status","2"); //状态改为删除 + return bizCustomerWarehouseMapper.update(null,updateWrapper); } /** @@ -94,6 +99,9 @@ public class BizCustomerWarehouseServiceImpl implements IBizCustomerWarehouseSer @Override public int deleteBizCustomerWarehouseById(Long id) { - return bizCustomerWarehouseMapper.deleteById(id); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id); + updateWrapper.set("status","2"); //状态改为删除 + return bizCustomerWarehouseMapper.update(null,updateWrapper); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizDriverServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizDriverServiceImpl.java index 2d17f62..d5739c9 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizDriverServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizDriverServiceImpl.java @@ -2,9 +2,17 @@ package com.cpxt.biz.service.impl; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.cpxt.biz.domain.BizCustomerWarehouse; +import com.cpxt.common.core.domain.entity.SysDept; +import com.cpxt.common.core.domain.entity.SysUser; import com.cpxt.common.utils.DateUtils; +import com.cpxt.system.mapper.SysDeptMapper; +import com.cpxt.system.mapper.SysUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.cpxt.biz.mapper.BizDriverMapper; @@ -23,6 +31,12 @@ public class BizDriverServiceImpl implements IBizDriverService @Autowired private BizDriverMapper bizDriverMapper; + @Autowired + private SysUserMapper sysUserMapper; + + @Autowired + private SysDeptMapper sysDeptMapper; + /** * 查询司机 * @@ -44,11 +58,33 @@ public class BizDriverServiceImpl implements IBizDriverService @Override public List selectBizDriverList(BizDriver bizDriver) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - + LambdaQueryWrapper queryWrapper = buildQueryWrapper(bizDriver); return bizDriverMapper.selectList(queryWrapper); } + private LambdaQueryWrapper buildQueryWrapper(BizDriver bizDriver) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (ObjectUtil.isNotEmpty(bizDriver.getDeptId())){ + queryWrapper.in(BizDriver::getDeptId,sysDeptMapper.selectChildrenDeptById(bizDriver.getDeptId()).stream().map(SysDept::getDeptId).collect(Collectors.toList())); + } + if (ObjectUtil.isNotEmpty(bizDriver.getName())){ + queryWrapper.like(BizDriver::getName, bizDriver.getName()); + } + if (ObjectUtil.isNotEmpty(bizDriver.getIdcard())){ + queryWrapper.like(BizDriver::getIdcard, bizDriver.getIdcard()); + } + if (ObjectUtil.isNotEmpty(bizDriver.getGender())){ + queryWrapper.eq(BizDriver::getGender, bizDriver.getGender()); + } + if (ObjectUtil.isNotEmpty(bizDriver.getPhone())){ + queryWrapper.like(BizDriver::getPhone, bizDriver.getPhone()); + } + if (ObjectUtil.isNotEmpty(bizDriver.getDefaultCarNo())){ + queryWrapper.like(BizDriver::getDefaultCarNo, bizDriver.getDefaultCarNo()); + } + return queryWrapper; + } + /** * 新增司机 * @@ -58,9 +94,26 @@ public class BizDriverServiceImpl implements IBizDriverService @Override public int insertBizDriver(BizDriver bizDriver) { + SysUser sysUser = new SysUser(); + setSysUser(bizDriver,sysUser); + sysUserMapper.insertUser(sysUser); + + bizDriver.setDeptName(sysDeptMapper.selectDeptById(bizDriver.getDeptId()).getDeptName()); + bizDriver.setUserId(sysUser.getUserId()); return bizDriverMapper.insert(bizDriver); } + private void setSysUser(BizDriver bizDriver, SysUser sysUser) { + sysUser.setDeptId(bizDriver.getDeptId()); + sysUser.setUserName(bizDriver.getPhone()); + sysUser.setNickName(bizDriver.getName()); + sysUser.setUserType("1"); // 司机 + sysUser.setPhonenumber(bizDriver.getPhone()); + sysUser.setSex(bizDriver.getGender()); + sysUser.setAvatar(bizDriver.getPhoto()); + sysUser.setPassword(bizDriver.getIdcard().substring(12,18)); // 340123199906222873 + } + /** * 修改司机 * @@ -82,7 +135,10 @@ public class BizDriverServiceImpl implements IBizDriverService @Override public int deleteBizDriverByIds(Long[] ids) { - return bizDriverMapper.deleteBatchIds(Arrays.asList(ids)); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id", (Object) ids); + updateWrapper.set("status","2"); //状态改为删除 + return bizDriverMapper.update(null,updateWrapper); } /** @@ -94,6 +150,9 @@ public class BizDriverServiceImpl implements IBizDriverService @Override public int deleteBizDriverById(Long id) { - return bizDriverMapper.deleteById(id); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id); + updateWrapper.set("status","2"); //状态改为删除 + return bizDriverMapper.update(null,updateWrapper); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java index bf19668..ff6ca1c 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.cpxt.biz.domain.BizDriver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.cpxt.biz.mapper.BizOrderMapper; @@ -81,7 +83,10 @@ public class BizOrderServiceImpl implements IBizOrderService @Override public int deleteBizOrderByIds(Long[] ids) { - return bizOrderMapper.deleteBatchIds(Arrays.asList(ids)); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id", (Object) ids); + updateWrapper.set("status","2"); //状态改为删除 + return bizOrderMapper.update(null,updateWrapper); } /** @@ -93,6 +98,9 @@ public class BizOrderServiceImpl implements IBizOrderService @Override public int deleteBizOrderById(Long id) { - return bizOrderMapper.deleteById(id); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id); + updateWrapper.set("status","2"); //状态改为删除 + return bizOrderMapper.update(null,updateWrapper); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderSubServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderSubServiceImpl.java index c7f72f2..53d3a7b 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderSubServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderSubServiceImpl.java @@ -5,6 +5,8 @@ import java.util.Arrays; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.cpxt.biz.domain.BizOrder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.cpxt.biz.mapper.BizOrderSubMapper; @@ -82,7 +84,10 @@ public class BizOrderSubServiceImpl implements IBizOrderSubService @Override public int deleteBizOrderSubByIds(Long[] ids) { - return bizOrderSubMapper.deleteBatchIds(Arrays.asList(ids)); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id", (Object) ids); + updateWrapper.set("status","2"); //状态改为删除 + return bizOrderSubMapper.update(null,updateWrapper); } /** @@ -94,6 +99,9 @@ public class BizOrderSubServiceImpl implements IBizOrderSubService @Override public int deleteBizOrderSubById(Long id) { - return bizOrderSubMapper.deleteById(id); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id); + updateWrapper.set("status","2"); //状态改为删除 + return bizOrderSubMapper.update(null,updateWrapper); } } diff --git a/cpxt-system/src/main/resources/mapper/system/SysUserMapper.xml b/cpxt-system/src/main/resources/mapper/system/SysUserMapper.xml index 5f7b3be..68b3f30 100644 --- a/cpxt-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/cpxt-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + select u.user_id, u.dept_id, u.user_name, u.nick_name,u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u @@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"