dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:7fbbd29d53d7d562b432763a37b1ac17a76c4add
Branches Tags
dianliang:master
dianliang:driver
dianliang:insp
dianliang:repair
dianliang:dev
..
compare: dianliang:960ef0b78c04d6767f28da9e0024dc22a2e1687f
Branches Tags
dianliang:driver
dianliang:insp
dianliang:master
dianliang:repair
dianliang:dev

No commits in common. "7fbbd29d53d7d562b432763a37b1ac17a76c4add" and "960ef0b78c04d6767f28da9e0024dc22a2e1687f" have entirely different histories.
7fbbd29d53 ... 960ef0b78c

9 changed files with 5 additions and 173 deletions
Show Stats Expand all files Collapse all files

14
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CarMainController.java
View File

@ -6,7 +6,6 @@ import cn.iocoder.yudao.module.custom.vo.CarMainReqVO;
import cn.iocoder.yudao.module.custom.vo.CarMainRespVO;
import cn.iocoder.yudao.module.custom.vo.CustomerMainSaveReqVO;
import cn.iocoder.yudao.module.label.service.BusiLabelService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -201,17 +200,4 @@ public class CarMainController {
return success(true);
}
/**
* 根据车牌查单条记录
*
* @author 小李
* @date 11:26 2024/10/8
* @param carMain 根据车牌查单条记录
**/
@PostMapping("/getByLicenseNumber")
@Operation(summary = "根据车牌查单条记录")
public CommonResult<?> getByLicenseNumber(@RequestBody CarMain carMain) {
CarMain one = carMainService.getOne(new LambdaQueryWrapper<CarMain>().eq(CarMain::getLicenseNumber, carMain.getLicenseNumber()));
return success(one);
}
}

17
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java
View File

@ -12,7 +12,6 @@ import cn.iocoder.yudao.module.custom.vo.CustomerMainPageReqVO;
import cn.iocoder.yudao.module.custom.vo.CustomerMainRespVO;
import cn.iocoder.yudao.module.custom.vo.CustomerMainSaveReqVO;
import cn.iocoder.yudao.module.label.service.BusiLabelService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
@ -180,21 +179,5 @@ public class CustomerMainController {
return success(true);
}
/**
* 根据姓名和电话查询单条记录
*
* @author 小李
* @date 11:19 2024/10/8
* @param customerMain 查询对象
**/
@PostMapping("/getByNameAndMobile")
@Operation(summary = "根据姓名和电话查询单条记录")
public CommonResult<?> getByNameAndMobile(@Valid @RequestBody CustomerMain customerMain) {
CustomerMain one = customerMainService.getOne(new LambdaQueryWrapper<CustomerMain>().and(item -> {
item.eq(CustomerMain::getCusName, customerMain.getCusName())
.eq(CustomerMain::getPhoneNumber, customerMain.getPhoneNumber());
}));
return success(one);
}
}

4
dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/controller/admin/CompanyStaffController.java
View File

@ -199,8 +199,8 @@ public class CompanyStaffController {
@GetMapping("/list")
@Operation(summary = "获取当前登录用户部门下所有员工信息")
// @PreAuthorize("@ss.hasPermission('company:staff:query')")
public CommonResult<List<CompanyStaff>> getStaffList(@RequestParam(value = "query", defaultValue = "", required = false) String query) {
return success(staffService.getStaffList(query));
public CommonResult<List<CompanyStaff>> getStaffList() {
return success(staffService.getStaffList());
}
/**

2
dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java
View File

@ -79,7 +79,7 @@ public interface CompanyStaffService extends IService<CompanyStaff> {
* @author 小李
* @date 15:54 2024/8/8
**/
List<CompanyStaff> getStaffList(String query);
List<CompanyStaff> getStaffList();
/**
* 重置员工登录密码

11
dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
View File

@ -399,15 +399,8 @@ public class CompanyStaffServiceImpl extends ServiceImpl<CompanyStaffMapper, Com
* @date 15:54 2024/8/8
**/
@Override
public List<CompanyStaff> getStaffList(String query) {
if (ObjectUtil.isNotEmpty(query)){
return baseMapper.selectList(new LambdaQueryWrapper<CompanyStaff>()
.like(CompanyStaff::getName,query)
.or()
.like(CompanyStaff::getTel, query)
);
}
return baseMapper.selectList(new QueryWrapper<>()).stream().limit(20).collect(Collectors.toList());
public List<CompanyStaff> getStaffList() {
return baseMapper.selectList(new QueryWrapper<>());
}
/**

15
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java
View File

@ -4,7 +4,6 @@ package cn.iocoder.yudao.module.tickets.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService;
import cn.iocoder.yudao.module.tickets.vo.CustomerAndCarVO;
import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsReqVO;
import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -101,19 +100,5 @@ public class DlRepairTicketsController {
dlRepairTicketsService.setTicketsPaid(repairTicketsRespVO);
return CommonResult.ok();
}
/**
* 客户信息和车辆信息 新增、修改
*
* @author 小李
* @date 9:25 2024/10/8
* @param customerAndCarVO 用户信息和车辆信息
**/
@PostMapping("/updateUserAndCar")
@Operation(summary = "客户信息和车辆信息 新增、修改")
public CommonResult<?> updateCustomerAndCar(@RequestBody CustomerAndCarVO customerAndCarVO){
dlRepairTicketsService.updateCustomerAndCar(customerAndCarVO);
return CommonResult.ok();
}
}

10
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.tickets.service;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
import cn.iocoder.yudao.module.tickets.vo.CustomerAndCarVO;
import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsReqVO;
import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -60,13 +59,4 @@ public interface DlRepairTicketsService extends IService<DlRepairTickets> {
* @param repairTicketsRespVO 工单
**/
void setTicketsPaid(DlRepairTicketsRespVO repairTicketsRespVO);
/**
* 客户信息和车辆信息 新增、修改
*
* @author 小李
* @date 9:25 2024/10/8
* @param customerAndCarVO 用户信息和车辆信息
**/
void updateCustomerAndCar(CustomerAndCarVO customerAndCarVO);
}

82
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
View File

@ -7,9 +7,6 @@ import cn.iocoder.yudao.common.RepairErrorCodeConstants;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.booking.entity.DlRepairBooking;
import cn.iocoder.yudao.module.booking.service.DlRepairBookingService;
import cn.iocoder.yudao.module.custom.entity.CustomerCar;
import cn.iocoder.yudao.module.custom.service.CarMainService;
import cn.iocoder.yudao.module.custom.service.CustomerCarService;
import cn.iocoder.yudao.module.custom.service.CustomerMainService;
import cn.iocoder.yudao.module.custom.vo.CustomerMainRespVO;
import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
@ -24,15 +21,11 @@ import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import cn.iocoder.yudao.module.system.api.user.dto.UserDTO;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
import cn.iocoder.yudao.module.tickets.mapper.DlRepairTicketsMapper;
import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService;
import cn.iocoder.yudao.module.tickets.service.DlRepairTitemService;
import cn.iocoder.yudao.module.tickets.vo.CustomerAndCarVO;
import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsReqVO;
import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
import cn.iocoder.yudao.module.tickets.vo.DlRepairTitemReqVO;
@ -47,7 +40,6 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@ -93,22 +85,6 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
@Lazy
private DlRepairBookingService bookingService;
@Resource
@Lazy
private CustomerMainService customerService;
@Resource
@Lazy
private CarMainService carMainService;
@Resource
@Lazy
private CustomerCarService customerCarService;
@Resource
@Lazy
private AdminUserApi adminUserApi;
/**
* 维修工单表 新增
*
@ -267,64 +243,6 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
public void setTicketsPaid(DlRepairTicketsRespVO repairTicketsRespVO) {
baseMapper.updateById(repairTicketsRespVO);
}
/**
* 客户信息和车辆信息 新增、修改
*
* @author 小李
* @date 9:25 2024/10/8
* @param customerAndCarVO 用户信息和车辆信息
**/
@Override
@DSTransactional
public void updateCustomerAndCar(CustomerAndCarVO customerAndCarVO){
// 新增用户信息,如果不存在
if (ObjectUtil.isNotEmpty(customerAndCarVO.getUserInfo().getPhoneNumber()) && ObjectUtil.isNotEmpty(customerAndCarVO.getUserInfo().getCusName())){
AdminUserRespDTO userByMobile = adminUserApi.getUserByMobile(customerAndCarVO.getUserInfo().getPhoneNumber());
if (ObjectUtil.isEmpty(userByMobile)){
UserDTO userDTO = new UserDTO();
userDTO.setMobile(customerAndCarVO.getUserInfo().getPhoneNumber());
userDTO.setNickname(customerAndCarVO.getUserInfo().getCusName());
userDTO.setUsername(customerAndCarVO.getUserInfo().getPhoneNumber());
userDTO.setPassword("123456");
adminUserApi.createUser(userDTO);
customerAndCarVO.getUserInfo().setUserId(userDTO.getId());
}
}
// 客户信息
if (ObjectUtil.isNotEmpty(customerAndCarVO.getUserInfo())){
if (ObjectUtil.isEmpty(customerAndCarVO.getUserInfo().getId())){
customerService.save(customerAndCarVO.getUserInfo());
}else {
customerService.updateById(customerAndCarVO.getUserInfo());
}
}
// 新增车辆信息
if (ObjectUtil.isNotEmpty(customerAndCarVO.getCarInfo())){
if (ObjectUtil.isEmpty(customerAndCarVO.getCarInfo().getId())){
carMainService.createCarMain(customerAndCarVO.getCarInfo());
}else {
carMainService.updateCarMain(customerAndCarVO.getCarInfo());
}
}
// 新增客户车辆信息关联
String userId = customerAndCarVO.getUserInfo().getId();
String carId = customerAndCarVO.getCarInfo().getId();
if (ObjectUtil.isNotEmpty(userId) && ObjectUtil.isNotEmpty(carId)){
// 先查询有没有记录
CustomerCar one = customerCarService.getOne(new LambdaQueryWrapper<CustomerCar>().and(item -> {
item.eq(CustomerCar::getCusId, userId)
.eq(CustomerCar::getCarId, carId);
}));
// 没有就新增
if (ObjectUtil.isEmpty(one)){
CustomerCar customerCar = new CustomerCar();
customerCar.setCusId(userId);
customerCar.setCarId(carId);
customerCarService.saveOrUpdate(customerCar);
}
}
}
}

23
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/CustomerAndCarVO.java
View File

@ -1,23 +0,0 @@
package cn.iocoder.yudao.module.tickets.vo;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import cn.iocoder.yudao.module.custom.entity.CarMain;
import cn.iocoder.yudao.module.custom.entity.CustomerMain;
import cn.iocoder.yudao.module.custom.vo.CarMainReqVO;
import lombok.Data;
/**
* 用于新增、修改客户信息和车辆信息
*
* @author 小李
* @date 9:22 2024/10/8
**/
@Data
public class CustomerAndCarVO extends TenantBaseDO {
/** 用户信息 */
private CustomerMain userInfo;
/** 车辆信息 */
private CarMainReqVO carInfo;
}