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

Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev

Browse Source 
# Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java
This commit is contained in:
PQZ 2024-10-26 11:12:31 +08:00
commit a40a6f8900
10 changed files with 425 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dl-module-base/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/BaseSupplierController.java
View File

@ -1,15 +1,13 @@
package cn.iocoder.yudao.module.supplier.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.label.vo.LabelPageReqVO;
import cn.iocoder.yudao.module.label.vo.LabelRespVO;
import cn.iocoder.yudao.module.supplier.entity.BaseSupplier;
import cn.iocoder.yudao.module.supplier.service.BaseSupplierService;
import cn.iocoder.yudao.module.supplier.vo.BaseSupplierPageReqVO;
import cn.iocoder.yudao.module.supplier.vo.BaseSupplierRespVO;
import cn.iocoder.yudao.module.supplier.vo.BaseSupplierSaveReqVO;
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;
@ -123,8 +121,20 @@ public class BaseSupplierController {
**/
@GetMapping("/list")
@Operation(summary = "获得所有供应商")
// @PreAuthorize("@ss.hasPermission('supplier:base-supplier:query')")
public CommonResult<?> getBaseSupplierList(){
return success(baseSupplierService.list());
}
/**
* 根据输入名称模糊查询供应商
* @author 小李
* @date 9:23 2024/9/13
**/
@GetMapping("/searchList")
@Operation(summary = "根据输入名称模糊查询供应商")
public CommonResult<?> searchList(String name){
LambdaQueryWrapper<BaseSupplier> queryWrapper = new LambdaQueryWrapper<BaseSupplier>()
.like(BaseSupplier::getName,name);
return success(baseSupplierService.list(queryWrapper));
}
}

13
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
View File

@ -9,6 +9,8 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.custom.entity.CustomerMain;
import cn.iocoder.yudao.module.custom.service.CustomerMainService;
import cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo;
import cn.iocoder.yudao.module.partner.service.IPartnerCustomerInfoService;
import cn.iocoder.yudao.module.partner.service.IPartnerWorkerService;
@ -38,6 +40,8 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
/**
* 【请填写功能名称】Service业务层处理
*
@ -68,7 +72,8 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
private IDelOrderInfoService delInspectionOrderService;
@Autowired
private IDelInspectionInfoService delInspectionInfoService;
@Resource
private CustomerMainService customerMainService;
/**
* 查询【请填写功能名称】
*
@ -195,6 +200,12 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
customerInfo.setCustomerName(user.getNickname());
customerInfo.setSex("0");
customerInfo.setUserAge(user.getUserAge());
// 设置客户来源
CustomerMain customerMain = new CustomerMain();
customerMain.setDataFrom("01");
customerMainService.saveOrUpdate(customerMain);
customerInfoService.insertPartnerCustomerInfo(customerInfo);
}
//追加订单明细记录

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/impl/PartnerCustomerInfoServiceImpl.java
View File

@ -248,7 +248,7 @@ public class PartnerCustomerInfoServiceImpl extends ServiceImpl<PartnerCustomerI
customerMain.setIsHangAccount("0");
customerMain.setTypeCode("01");
// 设置客户初始来源
customerMain.setDataFrom("01");
//customerMain.setDataFrom("01");
// 设置注册方式
customerMain.setInviterType("01");

2
dl-module-repair/src/main/java/cn/iocoder/yudao/common/RepairCons.java
View File

@ -16,4 +16,6 @@ public class RepairCons {
public static final String DICT_REPAIR_RECORDS_TYPE = "repair_records_type";
/**数据字典常量-repair_type-*/
public static final String DICT_REPAIR_TYPE = "repair_type";
/**数据字典常量-repair_unit-*/
public static final String DICT_REPAIR_UNIT = "repair_unit";
}

296
dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java
View File

@ -23,8 +23,6 @@ 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.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
import cn.iocoder.yudao.module.tickets.entity.DlTicketWares;
import cn.iocoder.yudao.module.tickets.entity.DlTwItem;
import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService;
@ -96,6 +94,10 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
@Resource
private BaseSupplierService supplierService;
@Resource
@Lazy
private RepairWaresService repairWaresService;
/**
* 采购单/领料单 新增
*
@ -108,7 +110,7 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
public void createRepairSo(DlRepairSoRespVO repairSoRespVO) {
repairSoRespVO.setSoTime(new Date());
//保存供应商
if (repairSoRespVO.getSupplierId() == null) {
if (StringUtils.isEmpty(repairSoRespVO.getSupplierId())){
//采购单中录入供应商或无供应商情况
if (StringUtils.isNotEmpty(repairSoRespVO.getSupplierName())) {
//没有选择直接录入的情况
@ -185,6 +187,7 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
* @date 11:12 2024/9/18
**/
@Override
@DSTransactional
public void voidRepairSo(DlRepairSoReqVO repairSoReqVO) {
baseMapper.updateById(repairSoReqVO);
@ -197,6 +200,54 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
boolean flag = so.getUserId().equals(loginUserId);
if (flag) {
repairWorkerService.sentMessage(Long.valueOf(so.getCreator()), (so.getSoType().equals("02") ? "领料单:" : "退料单:") + so.getSoNo() + "已被" + so.getUserName() + "作废");
// 需要更新库存和申请表数据
// 查单据子表
List<DlRepairSoi> sois = repairSoiService.list(new LambdaQueryWrapper<DlRepairSoi>().in(DlRepairSoi::getSoId, so.getId()));
// 查要操作申请表子表
List<DlTwItem> oldTwItems = twItemService.list(new LambdaQueryWrapper<DlTwItem>().and(item -> {
item.eq(DlTwItem::getTwId, so.getTwId())
.in(DlTwItem::getWaresId, sois.stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList()));
}));
// 查要操作的配件
List<RepairWares> oldWares = repairWaresService.list(new LambdaQueryWrapper<RepairWares>().in(RepairWares::getId, sois.stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList())));
// 新的申请表子表数据和配件数据
List<DlTwItem> newTwItems = new ArrayList<>();
List<RepairWares> newWares = new ArrayList<>();
// 需要区分是领料还是退料
// 得到新申请表子表数据
oldTwItems.forEach(item -> {
DlTwItem dlTwItem = new DlTwItem();
dlTwItem.setId(item.getId());
sois.stream().filter(i -> i.getGoodsId().equals(item.getWaresId())).findFirst().ifPresent(repairSoiByTwItem -> {
if (so.getSoType().equals("02")){
dlTwItem.setWaresAlreadyCount(item.getWaresAlreadyCount() - repairSoiByTwItem.getGoodsCount());
dlTwItem.setWaresCouldCount(item.getWaresCouldCount() + repairSoiByTwItem.getGoodsCount());
dlTwItem.setWaresStatus("02");
}else {
dlTwItem.setWaresAlreadyCount(item.getWaresAlreadyCount() + repairSoiByTwItem.getGoodsCount());
dlTwItem.setWaresCouldCount(item.getWaresCouldCount() - repairSoiByTwItem.getGoodsCount());
}
});
newTwItems.add(dlTwItem);
});
// 得到新配件数据
oldWares.forEach(item -> {
RepairWares wares = new RepairWares();
wares.setId(item.getId());
sois.stream().filter(i -> i.getGoodsId().equals(wares.getId())).findFirst().ifPresent(repairSoiByWares -> {
if (so.getSoType().equals("02")){
wares.setStock(item.getStock().add(BigDecimal.valueOf(repairSoiByWares.getGoodsCount())));
}else {
wares.setStock(item.getStock().subtract(BigDecimal.valueOf(repairSoiByWares.getGoodsCount())));
}
});
newWares.add(wares);
});
// 更新申请表子表
twItemService.updateBatchById(newTwItems);
// 更新配件
repairWaresService.updateBatchById(newWares);
}
}
@ -249,53 +300,54 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
.list(new LambdaQueryWrapper<DlRepairSoi>()
.eq(DlRepairSoi::getSoId, id)
);
// 查库存
List<RepairWares> wares = waresService
.list(new LambdaQueryWrapper<RepairWares>()
.in(RepairWares::getId, sois.stream()
.map(DlRepairSoi::getGoodsId)
.collect(Collectors.toList())
));
// 更新库存
List<RepairWares> newWares = wares.stream().map(item -> {
RepairWares ware = new RepairWares();
ware.setId(item.getId());
sois.stream().filter(i -> i.getGoodsId().equals(item.getId())).findFirst().ifPresent(i -> {
ware.setStock(item.getStock().subtract(BigDecimal.valueOf(i.getGoodsCount())));
});
return ware;
}).collect(Collectors.toList());
waresService.updateBatchById(newWares);
// 查库存---生成领料单的时候更新了
// List<RepairWares> wares = waresService
// .list(new LambdaQueryWrapper<RepairWares>()
// .in(RepairWares::getId, sois.stream()
// .map(DlRepairSoi::getGoodsId)
// .collect(Collectors.toList())
// ));
// // 更新库存
// List<RepairWares> newWares = wares.stream().map(item -> {
// RepairWares ware = new RepairWares();
// ware.setId(item.getId());
// sois.stream().filter(i -> i.getGoodsId().equals(item.getId())).findFirst().ifPresent(i -> {
// ware.setStock(item.getStock().subtract(BigDecimal.valueOf(i.getGoodsCount())));
// });
// return ware;
// }).collect(Collectors.toList());
// waresService.updateBatchById(newWares);
// 更新主表状态 为已领料
DlRepairSo dlRepairSo = new DlRepairSo();
dlRepairSo.setId(id);
dlRepairSo.setSoStatus(SoStatusEnum.PICKED.getCode());
baseMapper.updateById(dlRepairSo);
// 更新申请表的数据
DlRepairSo so = baseMapper.selectOne(new LambdaQueryWrapper<DlRepairSo>().eq(DlRepairSo::getId, id));
// 查申请表的子表对应的配件信息
List<DlTwItem> twItems = twItemService.list(new LambdaQueryWrapper<DlTwItem>().and(item -> {
item.eq(DlTwItem::getTwId, so.getTwId())
.in(DlTwItem::getWaresId, sois.stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList()));
}));
// 更新子表
List<DlTwItem> newTwItems = twItems.stream().map(item -> {
DlTwItem dlTwItem = new DlTwItem();
dlTwItem.setId(item.getId());
dlTwItem.setWaresAlreadyCount(ObjectUtil.isNotEmpty(item.getWaresAlreadyCount()) ? item.getWaresAlreadyCount() + item.getWaresCouldCount() : item.getWaresCouldCount());
dlTwItem.setWaresStatus(dlTwItem.getWaresAlreadyCount().equals(item.getWaresCount()) ? "01" : item.getWaresStatus());
return dlTwItem;
}).collect(Collectors.toList());
twItemService.updateBatchById(newTwItems);
// 更新申请表的数据----生成领料单的时候更新了
// // 查申请表的子表对应的配件信息
// List<DlTwItem> twItems = twItemService.list(new LambdaQueryWrapper<DlTwItem>().and(item -> {
// item.eq(DlTwItem::getTwId, so.getTwId())
// .in(DlTwItem::getWaresId, sois.stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList()));
// }));
// // 更新子表
// List<DlTwItem> newTwItems = twItems.stream().map(item -> {
// DlTwItem dlTwItem = new DlTwItem();
// dlTwItem.setId(item.getId());
// dlTwItem.setWaresAlreadyCount(ObjectUtil.isNotEmpty(item.getWaresAlreadyCount()) ? item.getWaresAlreadyCount() + item.getWaresCouldCount() : item.getWaresCouldCount());
// dlTwItem.setWaresStatus(dlTwItem.getWaresAlreadyCount().equals(item.getWaresCount()) ? "01" : item.getWaresStatus());
// return dlTwItem;
// }).collect(Collectors.toList());
// twItemService.updateBatchById(newTwItems);
// 查最新的子表信息
DlRepairSo so = baseMapper.selectOne(new LambdaQueryWrapper<DlRepairSo>().eq(DlRepairSo::getId, id));
List<DlTwItem> list = twItemService.list(new LambdaQueryWrapper<DlTwItem>().eq(DlTwItem::getTwId, so.getTwId()));
// 判断是部分完成还是全部完成
DlTicketWares dlTicketWares = new DlTicketWares();
dlTicketWares.setId(so.getTwId());
List<DlTwItem> flag = list.stream().filter(item -> !item.getWaresStatus().equals("01")).collect(Collectors.toList());
dlTicketWares.setStatus(CollectionUtil.isEmpty(flag) ? "03" : "04");
// 更新主表的状态
ticketWaresService.updateById(dlTicketWares);
// 查主表记录
@ -319,92 +371,94 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
.set(DlRepairSo::getSoStatus, SoStatusEnum.RETURNED.getCode())
.eq(DlRepairSo::getId, id)
);
// 更新配件申请表
DlRepairSo so = baseMapper.selectOne(new LambdaQueryWrapper<DlRepairSo>().eq(DlRepairSo::getId, id));
// 查配件退料表子表
List<DlRepairSoi> sois = repairSoiService.list(new LambdaQueryWrapper<DlRepairSoi>().eq(DlRepairSoi::getSoId, so.getId()));
// 查申请表子表
List<DlTwItem> twItems = twItemService.list(new LambdaQueryWrapper<DlTwItem>().eq(DlTwItem::getTwId, so.getTwId()));
// 得到需要更新的数据
List<DlTwItem> newTwItems = twItems.stream().map(item -> {
DlTwItem dlTwItem = new DlTwItem();
dlTwItem.setId(item.getId());
sois.stream().filter(i -> i.getGoodsId().equals(item.getWaresId())).findFirst().ifPresent(i -> {
dlTwItem.setWaresBackCount(
ObjectUtil.isNotEmpty(item.getWaresBackCount())
? item.getWaresCount() + item.getWaresBackCount()
: i.getGoodsCount());
// 如果退料数就是领料申请数，那就是全退了
if (i.getGoodsCount().equals(dlTwItem.getWaresCount())) {
dlTwItem.setWaresStatus("03");
}
});
return dlTwItem;
}).collect(Collectors.toList());
twItemService.updateBatchById(newTwItems);
// 更新库存
// 查库存
List<RepairWares> wares = waresService.list(new LambdaQueryWrapper<RepairWares>().in(RepairWares::getId, sois.stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList())));
// 构建新数据
List<RepairWares> newWares = wares.stream().map(item -> {
RepairWares ware = new RepairWares();
ware.setId(item.getId());
sois.stream().filter(i -> i.getGoodsId().equals(item.getId())).findFirst().ifPresent(i -> {
ware.setStock(item.getStock().add(BigDecimal.valueOf(i.getGoodsCount())));
});
return ware;
}).collect(Collectors.toList());
waresService.updateBatchById(newWares);
// 更新配件申请表----生成退料单的时候更新了
// DlRepairSo so = baseMapper.selectOne(new LambdaQueryWrapper<DlRepairSo>().eq(DlRepairSo::getId, id));
// // 查配件退料表子表
// List<DlRepairSoi> sois = repairSoiService.list(new LambdaQueryWrapper<DlRepairSoi>().eq(DlRepairSoi::getSoId, so.getId()));
// // 查申请表子表
// List<DlTwItem> twItems = twItemService.list(new LambdaQueryWrapper<DlTwItem>().eq(DlTwItem::getTwId, so.getTwId()));
// // 得到需要更新的数据
// List<DlTwItem> newTwItems = twItems.stream().map(item -> {
// DlTwItem dlTwItem = new DlTwItem();
// dlTwItem.setId(item.getId());
// sois.stream().filter(i -> i.getGoodsId().equals(item.getWaresId())).findFirst().ifPresent(i -> {
// dlTwItem.setWaresBackCount(
// ObjectUtil.isNotEmpty(item.getWaresBackCount())
// ? item.getWaresCount() + item.getWaresBackCount()
// : i.getGoodsCount());
// // 如果退料数就是领料申请数，那就是全退了
// if (i.getGoodsCount().equals(dlTwItem.getWaresCount())) {
// dlTwItem.setWaresStatus("03");
// }
// });
// return dlTwItem;
// }).collect(Collectors.toList());
// twItemService.updateBatchById(newTwItems);
// // 更新库存
// // 查库存
// List<RepairWares> wares = waresService.list(new LambdaQueryWrapper<RepairWares>().in(RepairWares::getId, sois.stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList())));
// // 构建新数据
// List<RepairWares> newWares = wares.stream().map(item -> {
// RepairWares ware = new RepairWares();
// ware.setId(item.getId());
// sois.stream().filter(i -> i.getGoodsId().equals(item.getId())).findFirst().ifPresent(i -> {
// ware.setStock(item.getStock().add(BigDecimal.valueOf(i.getGoodsCount())));
// });
// return ware;
// }).collect(Collectors.toList());
// waresService.updateBatchById(newWares);
// 更新维修工单
// 查申请表主表
DlTicketWares ticketWares = ticketWaresService.getOne(new LambdaQueryWrapper<DlTicketWares>().eq(DlTicketWares::getId, so.getTwId()));
// 查维修工单子表为配件的数据
List<DlRepairTitem> titems = titemService.list(new LambdaQueryWrapper<DlRepairTitem>().and(item -> {
item.eq(DlRepairTitem::getTicketId, ticketWares.getTicketId())
.eq(DlRepairTitem::getItemType, "02")
.in(DlRepairTitem::getPartId, sois.stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList()));
}));
// 构建新数据，更新维修工单子表
List<DlRepairTitem> newTitems = titems.stream().map(item -> {
DlRepairTitem titem = new DlRepairTitem();
titem.setId(item.getId());
sois.stream().filter(i -> i.getGoodsId().equals(item.getPartId())).findFirst().ifPresent(i -> {
titem.setItemCount(item.getItemCount() - i.getGoodsCount());
BigDecimal itemDiscount = ObjectUtil.isNotEmpty(item.getItemDiscount()) ? item.getItemDiscount() : BigDecimal.ONE;
titem.setItemMoney(new BigDecimal(titem.getItemCount()).multiply(item.getItemPrice()).multiply(itemDiscount));
});
return titem;
}).collect(Collectors.toList());
// 分开全部退料了的和没有全部退料的数据
List<DlRepairTitem> delTitems = newTitems.stream().filter(item -> item.getItemCount() == 0).collect(Collectors.toList());
if (CollectionUtil.isEmpty(delTitems)) {
titemService.updateBatchById(newTitems);
} else {
titemService.removeBatchByIds(delTitems);
List<DlRepairTitem> updateTitems = newTitems.stream().filter(item -> !delTitems.contains(item)).collect(Collectors.toList());
if (CollectionUtil.isEmpty(updateTitems)) {
titemService.updateBatchById(updateTitems);
}
}
// 更新维修工单
DlRepairTickets tickets = ticketsService.getOne(new LambdaQueryWrapper<DlRepairTickets>().eq(DlRepairTickets::getId, ticketWares.getTicketId()));
// 查最新的子表信息
List<DlRepairTitem> list = titemService.list(new LambdaQueryWrapper<DlRepairTitem>().in(DlRepairTitem::getTicketId, tickets.getId()));
// 计算工单总子项、工单配件总价、工单总价
DlRepairTickets newTickets = new DlRepairTickets();
newTickets.setId(tickets.getId());
newTickets.setCount(list.stream().mapToInt(DlRepairTitem::getItemCount).sum());
newTickets.setPartPrice(list.stream()
.filter(item -> item.getItemType().equals("02"))
.map(DlRepairTitem::getItemMoney)
.reduce(BigDecimal.ZERO, BigDecimal::add));
BigDecimal projectPrice = tickets.getProjectPrice() == null ? BigDecimal.ZERO : tickets.getProjectPrice();
BigDecimal otherPrice = tickets.getOtherPrice() != null ? tickets.getOtherPrice() : BigDecimal.ZERO;
BigDecimal partPrice = newTickets.getPartPrice() == null ? BigDecimal.ZERO : newTickets.getPartPrice();
newTickets.setTotalPrice(projectPrice.add(partPrice).add(otherPrice));
ticketsService.updateById(newTickets);
// 更新维修工单----最后完成工单的时候来更新
// // 查配件退料表子表
// List<DlRepairSoi> sois = repairSoiService.list(new LambdaQueryWrapper<DlRepairSoi>().eq(DlRepairSoi::getSoId, so.getId()));
// // 查申请表主表
// DlTicketWares ticketWares = ticketWaresService.getOne(new LambdaQueryWrapper<DlTicketWares>().eq(DlTicketWares::getId, so.getTwId()));
// // 查维修工单子表为配件的数据
// List<DlRepairTitem> titems = titemService.list(new LambdaQueryWrapper<DlRepairTitem>().and(item -> {
// item.eq(DlRepairTitem::getTicketId, ticketWares.getTicketId())
// .eq(DlRepairTitem::getItemType, "02")
// .in(DlRepairTitem::getPartId, sois.stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList()));
// }));
// // 构建新数据，更新维修工单子表
// List<DlRepairTitem> newTitems = titems.stream().map(item -> {
// DlRepairTitem titem = new DlRepairTitem();
// titem.setId(item.getId());
// sois.stream().filter(i -> i.getGoodsId().equals(item.getPartId())).findFirst().ifPresent(i -> {
// titem.setItemCount(item.getItemCount() - i.getGoodsCount());
// BigDecimal itemDiscount = ObjectUtil.isNotEmpty(item.getItemDiscount()) ? item.getItemDiscount() : BigDecimal.ONE;
// titem.setItemMoney(new BigDecimal(titem.getItemCount()).multiply(item.getItemPrice()).multiply(itemDiscount));
// });
// return titem;
// }).collect(Collectors.toList());
// // 分开全部退料了的和没有全部退料的数据
// List<DlRepairTitem> delTitems = newTitems.stream().filter(item -> item.getItemCount() == 0).collect(Collectors.toList());
// if (CollectionUtil.isEmpty(delTitems)) {
// titemService.updateBatchById(newTitems);
// } else {
// titemService.removeBatchByIds(delTitems);
// List<DlRepairTitem> updateTitems = newTitems.stream().filter(item -> !delTitems.contains(item)).collect(Collectors.toList());
// if (CollectionUtil.isEmpty(updateTitems)) {
// titemService.updateBatchById(updateTitems);
// }
//
// }
// // 更新维修工单
// DlRepairTickets tickets = ticketsService.getOne(new LambdaQueryWrapper<DlRepairTickets>().eq(DlRepairTickets::getId, ticketWares.getTicketId()));
// // 查最新的子表信息
// List<DlRepairTitem> list = titemService.list(new LambdaQueryWrapper<DlRepairTitem>().in(DlRepairTitem::getTicketId, tickets.getId()));
// // 计算工单总子项、工单配件总价、工单总价
// DlRepairTickets newTickets = new DlRepairTickets();
// newTickets.setId(tickets.getId());
// newTickets.setCount(list.stream().mapToInt(DlRepairTitem::getItemCount).sum());
// newTickets.setPartPrice(list.stream()
// .filter(item -> item.getItemType().equals("02"))
// .map(DlRepairTitem::getItemMoney)
// .reduce(BigDecimal.ZERO, BigDecimal::add));
// BigDecimal projectPrice = tickets.getProjectPrice() == null ? BigDecimal.ZERO : tickets.getProjectPrice();
// BigDecimal otherPrice = tickets.getOtherPrice() != null ? tickets.getOtherPrice() : BigDecimal.ZERO;
// BigDecimal partPrice = newTickets.getPartPrice() == null ? BigDecimal.ZERO : newTickets.getPartPrice();
// newTickets.setTotalPrice(projectPrice.add(partPrice).add(otherPrice));
// ticketsService.updateById(newTickets);
// 查主表
DlRepairSo newSo = baseMapper.selectById(id);

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

@ -200,4 +200,13 @@ public interface DlRepairTicketsService extends IService<DlRepairTickets> {
* @param respVO 主要有两个参数，主表ID,itemList(这个需要前端处理成子表的对象能接收的数据)
**/
void addItems(DlRepairTicketsRespVO respVO);
/**
* 用于同步一个工单的所有配件申请表的数据到维修工单，主要针对已领取数量小于申请数量的情况
*
* @author 小李
* @date 9:52 2024/10/26
* @param id 维修工单ID
**/
boolean syncTicketWaresToTicket(String id);
}

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

@ -70,8 +70,7 @@ import java.util.*;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.common.BaseConstants.ORDER_TENANT_NAME;
import static cn.iocoder.yudao.common.RepairCons.DICT_REPAIR_RECORDS_TYPE;
import static cn.iocoder.yudao.common.RepairCons.DICT_REPAIR_TYPE;
import static cn.iocoder.yudao.common.RepairCons.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
@ -165,6 +164,30 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
@Override
@DSTransactional
public DlRepairTicketsRespVO createTickets(DlRepairTicketsRespVO ticketsRespVO) {
// 验证
if (ObjectUtil.isEmpty(ticketsRespVO.getCarId())){
throw exception0(500, "车辆信息为空");
}
if (ObjectUtil.isEmpty(ticketsRespVO.getAdviserId())){
throw exception0(500, "服务顾问为空");
}
ticketsRespVO.getItemList().forEach(item -> {
if (ObjectUtil.isEmpty(item.getRepairIds()) || ObjectUtil.isEmpty(item.getSaleId())){
String message = "";
switch (item.getItemType()){
case "01":
message += "项目：";
break;
case "02":
message += "配件：";
break;
case "03":
message += "其他：";
}
message += (item.getItemName() + (ObjectUtil.isEmpty(item.getRepairIds()) ? "施工人员" : "销售人员") + "为空");
throw exception0(500, message);
}
});
// 门店信息
Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
@ -299,9 +322,16 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
// 取配件
List<DlRepairTitemReqVO> wares = items.stream().filter(item -> item.getItemType().equals("02")).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(wares)) {
// 单位字典
List<DictDataRespDTO> recordTypeList = dictDataApi.getDictDataList(DICT_REPAIR_UNIT);
Map<String,String> unitMap = recordTypeList.stream().collect(Collectors.toMap(DictDataRespDTO::getValue,DictDataRespDTO::getLabel));
Set<String> ids = wares.stream().map(DlRepairTitemReqVO::getPartId).collect(Collectors.toSet());
List<RepairWares> repairWares = waresService.listByIds(ids);
items.forEach(item -> repairWares.stream().filter(i -> i.getId().equals(item.getPartId())).findFirst().ifPresent(item::setWare));
items.forEach(item -> {
repairWares.stream().filter(i -> i.getId().equals(item.getPartId())).findFirst().ifPresent(item::setWare);
item.setItemUnit(unitMap.get(item.getItemUnit()));
});
}
result.setWares(wares);
// 取附加
@ -649,6 +679,12 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
.setSql("now_repair_id = adviser_id")
.setSql("now_repair_name = adviser_name")
.eq(DlRepairTickets::getId, respVO.getId()));
// 因为目前的配件申请表在申请的时候就把配件加到工单中了，但后续的领取并没有同步到工单，所以如果这里是员工直接完成移交给服务顾问，就需要同步一下
boolean flag = syncTicketWaresToTicket(respVO.getId());
if (!flag){
throw exception0(500, "系统异常");
}
} else {
repairWorkerService.sentMessage(Long.valueOf(tickets.getAdviserId()), message);
}
@ -775,13 +811,33 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
.setSql("now_repair_name = adviser_name")
.eq(DlRepairTickets::getId, respVO.getId())
);
boolean flag = syncTicketWaresToTicket(respVO.getId());
if (!flag){
throw exception0(500, "系统异常");
}
// 通知服务顾问
DlRepairTickets tickets = baseMapper.selectById(respVO.getId());
repairWorkerService.sentMessage(Long.valueOf(tickets.getAdviserId()), "您有新的工单可以出厂检验");
}
/**
* 用于同步一个工单的所有配件申请表的数据到维修工单，主要针对已领取数量小于申请数量的情况
*
* @author 小李
* @date 9:52 2024/10/26
* @param id 维修工单ID
**/
@Override
public boolean syncTicketWaresToTicket(String id){
// 先查满足条件的申请表
ArrayList<String> status = new ArrayList<>();
status.add("01"); // 待审核
status.add("05"); // 已驳回
// 查工单所有已通过的配件申请单
List<DlTicketWares> list = ticketWaresService.list(new LambdaQueryWrapper<DlTicketWares>().and(item -> {
item.eq(DlTicketWares::getTicketId, respVO.getId())
item.eq(DlTicketWares::getTicketId, id)
.notIn(DlTicketWares::getStatus, status);
}));
// 查配件申请表的所有已领取数量小于申请数量的子表信息
@ -795,12 +851,12 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
// 查询工单子表（三个查询条件，属于那个工单，属于配件类型，属于需要改变的（即申请表的已领取数量小于申请数量的））
Set<String> waresId = twItems.stream().map(DlTwItem::getWaresId).collect(Collectors.toSet());
List<DlRepairTitem> items = titemService.list(new LambdaQueryWrapper<DlRepairTitem>().and(item -> {
item.eq(DlRepairTitem::getTicketId, respVO.getId())
item.eq(DlRepairTitem::getTicketId, id)
.eq(DlRepairTitem::getItemType, "02")
.in(DlRepairTitem::getPartId, waresId);
}));
// 同一个配件可能申请过多次，属于是一个工单配件可能是对应多个申请表配件
List<DlRepairTitem> updateItems = items.stream().map(item -> {
List<DlRepairTitem> AllItems = items.stream().map(item -> {
DlRepairTitem titem = new DlRepairTitem();
titem.setId(item.getId());
List<DlTwItem> wares = twItems.stream().filter(i -> i.getWaresId().equals(item.getPartId())).collect(Collectors.toList());
@ -811,19 +867,27 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
return titem;
}).collect(Collectors.toList());
// 更新维修工单子表
titemService.updateBatchById(updateItems);
// 可能出现配件申请单审核通过了没有任何领取或全部退了的情况，所以如果itemCount等于0，直接把这个数据删掉
// 过滤出需要删除的数据
List<DlRepairTitem> delItems = AllItems.stream().filter(item -> item.getItemCount() == 0).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(delItems)){
// 删除需要删的
titemService.removeBatchByIds(delItems);
Set<String> delIds = delItems.stream().map(DlRepairTitem::getId).collect(Collectors.toSet());
// 得到需要改的
List<DlRepairTitem> updateItems = AllItems.stream().filter(item -> delIds.contains(item.getId())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(updateItems)){
titemService.updateBatchById(updateItems);
}
}else {
// 没有需要删的就是全部都需要改
titemService.updateBatchById(AllItems);
}
// 重新计算维修工单
boolean flag = computeTicket(respVO.getId());
if (!flag){
throw exception0(500, "系统异常");
}
return computeTicket(id);
}
// 通知服务顾问
DlRepairTickets tickets = baseMapper.selectById(respVO.getId());
repairWorkerService.sentMessage(Long.valueOf(tickets.getAdviserId()), "您有新的工单可以出厂检验");
return true;
}
/**

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

@ -340,7 +340,7 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
}
}
// 如果是驳回，通知维修工
if (status.equals("05")){
if (status.equals("05")) {
// 发送没有通过的消息给员工
DlTicketWares ticketWares = baseMapper.selectById(respVO.getId());
repairWorkerService.sentMessage(ticketWares.getRepairId(), "您的配件申请单被驳回了");
@ -450,12 +450,15 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
});
repairSoiService.saveBatch(respVO.getRepairSois());
// 更新配件申请子表
/*
同理，通知领料的数量可能与实际需要的数量不一致，需要重新计算状态
*/
// 先查老数据，领料才需要更新
if (type.equals("02")) {
List<DlTwItem> oldData = twItemService.list(new LambdaQueryWrapper<DlTwItem>().in(DlTwItem::getId, respVO.getItems().stream().map(DlTwItem::getId).collect(Collectors.toList())));
// 分领料和退料
// 先取出要操作的子表数据
List<DlTwItem> oldData = twItemService.list(new LambdaQueryWrapper<DlTwItem>().and(item -> {
item.eq(DlTwItem::getTwId, respVO.getRepairSo().getTwId())
.in(DlTwItem::getWaresId, respVO.getRepairSois().stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList()));
}));
// 要操作的库存数据
List<RepairWares> wares = repairWaresService.list(new LambdaQueryWrapper<RepairWares>().in(RepairWares::getId, respVO.getRepairSois().stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList())));
if (type.equals("02")) { // 领料
// 构造新数据
List<DlTwItem> newData = oldData.stream().map(item -> {
DlTwItem dlTwItem = new DlTwItem();
@ -464,13 +467,85 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
.filter(i -> i.getGoodsId().equals(item.getWaresId()))
.findFirst()
.ifPresent(repairSoi -> {
dlTwItem.setWaresCouldCount(repairSoi.getGoodsCount());
dlTwItem.setWaresStatus(repairSoi.getGoodsCount().equals(item.getWaresCount()) ? "04" : item.getWaresStatus());
// 先取该申请配件的已领料数量，如过是第一次就是0
Integer waresAlreadyCount = item.getWaresAlreadyCount() == null ? 0 : item.getWaresAlreadyCount();
// 取本来的已领取数量+本次要领取的数量
dlTwItem.setWaresAlreadyCount(repairSoi.getGoodsCount() + waresAlreadyCount);
// 可领取数量就是申请数量-已领料数量
// item是操作的申请配件的数量，dlTwItem取最新的已领取数量
dlTwItem.setWaresCouldCount(item.getWaresCount() - dlTwItem.getWaresAlreadyCount());
// dlTwItem.setWaresStatus(repairSoi.getGoodsCount().equals(item.getWaresCount()) ? "04" : item.getWaresStatus());
// 如果已领取数量等于申请数量，那这个配件就是领料完了，为01已领料，反之不变
dlTwItem.setWaresStatus(item.getWaresCount().equals(dlTwItem.getWaresAlreadyCount()) ? "01" : item.getWaresStatus());
});
return dlTwItem;
}).collect(Collectors.toList());
twItemService.updateBatchById(newData);
// 同时操作库存扣减
// 构造新数据
List<RepairWares> newWares = wares.stream().map(item -> {
RepairWares ware = new RepairWares();
ware.setId(item.getId());
respVO.getRepairSois().stream().filter(i -> i.getGoodsId().equals(item.getId())).findFirst().ifPresent(repairSoi -> ware.setStock(item.getStock().subtract(BigDecimal.valueOf(repairSoi.getGoodsCount()))));
return ware;
}).collect(Collectors.toList());
// 更新库存
repairWaresService.updateBatchById(newWares);
} else { // 退料
// 构造新数据
List<DlTwItem> newData = oldData.stream().map(item -> {
DlTwItem dlTwItem = new DlTwItem();
dlTwItem.setId(item.getId());
respVO.getRepairSois().stream()
.filter(i -> i.getGoodsId().equals(item.getWaresId()))
.findFirst()
.ifPresent(repairSoi -> {
// 取本来的已领取数量-本次要退料的数量
dlTwItem.setWaresAlreadyCount(item.getWaresAlreadyCount() - repairSoi.getGoodsCount());
// 可领取数量就是上次的可领取+退料数量
// item是操作的可领取数量，repairSoi是取本次退料的数量
dlTwItem.setWaresCouldCount(item.getWaresCouldCount() + repairSoi.getGoodsCount());
// dlTwItem.setWaresStatus(repairSoi.getGoodsCount().equals(item.getWaresCount()) ? "04" : item.getWaresStatus());
// 如果可领料数量等于申请数量，那这个配件就是退料完了，为03已退料，反之不变
dlTwItem.setWaresStatus(item.getWaresCount().equals(dlTwItem.getWaresCouldCount()) ? "03" : "02");
});
return dlTwItem;
}).collect(Collectors.toList());
twItemService.updateBatchById(newData);
// 同时操作库存新增
// 构造新数据
List<RepairWares> newWares = wares.stream().map(item -> {
RepairWares ware = new RepairWares();
ware.setId(item.getId());
respVO.getRepairSois().stream().filter(i -> i.getGoodsId().equals(item.getId())).findFirst().ifPresent(repairSoi -> ware.setStock(item.getStock().add(BigDecimal.valueOf(repairSoi.getGoodsCount()))));
return ware;
}).collect(Collectors.toList());
// 更新库存
repairWaresService.updateBatchById(newWares);
}
// /*
// 同理，通知领料的数量可能与实际需要的数量不一致，需要重新计算状态
// */
// // 先查老数据，领料才需要更新
// if (type.equals("02")) {
// List<DlTwItem> oldData = twItemService.list(new LambdaQueryWrapper<DlTwItem>().in(DlTwItem::getId, respVO.getItems().stream().map(DlTwItem::getId).collect(Collectors.toList())));
// // 构造新数据
// List<DlTwItem> newData = oldData.stream().map(item -> {
// DlTwItem dlTwItem = new DlTwItem();
// dlTwItem.setId(item.getId());
// respVO.getRepairSois().stream()
// .filter(i -> i.getGoodsId().equals(item.getWaresId()))
// .findFirst()
// .ifPresent(repairSoi -> {
// dlTwItem.setWaresCouldCount(repairSoi.getGoodsCount());
// dlTwItem.setWaresStatus(repairSoi.getGoodsCount().equals(item.getWaresCount()) ? "04" : item.getWaresStatus());
// });
// return dlTwItem;
// }).collect(Collectors.toList());
// twItemService.updateBatchById(newData);
// }
// 通知维修工
// 查维修工的userId
@ -482,7 +557,7 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
*
* @param respVO 请求对象
* @author 小李
* @date 22:07 2024/10/16
* @date 22:07 2024/10/16 应该是弃用了，但不确定，先不删
**/
@Override
@DSTransactional
@ -509,7 +584,7 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
*
* @param respVO 请求对象
* @author 小李
* @date 22:03 2024/10/17
* @date 22:03 2024/10/17 应该是弃用了，但不确定，先不删
**/
@Override
public void passBackTicketWares(DlTicketWaresRespVO respVO) {

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

@ -4,9 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.iocoder.yudao.module.project.entity.RepairWares;
import cn.iocoder.yudao.module.project.service.RepairWaresService;
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
import cn.iocoder.yudao.module.tickets.entity.DlTwItem;
import cn.iocoder.yudao.module.tickets.mapper.DlTwItemMapper;
import cn.iocoder.yudao.module.tickets.service.DlTicketWaresService;
import cn.iocoder.yudao.module.tickets.service.DlTwItemService;
import cn.iocoder.yudao.module.tickets.vo.DlTwItemReqVO;
import cn.iocoder.yudao.module.tickets.vo.DlTwItemRespVO;
@ -20,6 +21,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.common.RepairCons.DICT_REPAIR_UNIT;
/**
* 针对表【dl_tw_item(工单配件申请/退回子表)】的数据库操作Service实现
*
@ -32,10 +35,8 @@ public class DlTwItemServiceImpl extends ServiceImpl<DlTwItemMapper, DlTwItem>
@Resource
private RepairWaresService repairWaresService;
@Resource
@Lazy
private DlTicketWaresService ticketWaresService;
private DictDataApi dictDataApi;
@Resource
@Lazy
private RepairWaresService waresService;
@ -57,6 +58,9 @@ public class DlTwItemServiceImpl extends ServiceImpl<DlTwItemMapper, DlTwItem>
for(Map<String,String> map:typeMapList){
typeMap.put(map.get("id"),map.get("name"));
}
// 单位字典
List<DictDataRespDTO> recordTypeList = dictDataApi.getDictDataList(DICT_REPAIR_UNIT);
Map<String,String> unitMap = recordTypeList.stream().collect(Collectors.toMap(DictDataRespDTO::getValue,DictDataRespDTO::getLabel));
// 查配件详情
List<String> ids = dlTwItems.stream().map(DlTwItem::getWaresId).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(ids)){
@ -68,6 +72,7 @@ public class DlTwItemServiceImpl extends ServiceImpl<DlTwItemMapper, DlTwItem>
.findFirst()
.ifPresent(bean::setWares);
bean.setTypeName(typeMap.get(bean.getWares().getType()));
bean.getWares().setUnit(unitMap.get(bean.getWares().getUnit()));
return bean;
}).collect(Collectors.toList());
}

38
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java
View File

@ -3,9 +3,14 @@ package cn.iocoder.yudao.module.rescue.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.CoordinateUtil;
import cn.hutool.http.HttpUtil;
import cn.iocoder.yudao.module.custom.entity.CustomerMain;
import cn.iocoder.yudao.module.custom.service.CustomerMainService;
import cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo;
import cn.iocoder.yudao.module.partner.service.IPartnerCustomerInfoService;
import cn.iocoder.yudao.module.rescue.domain.*;
import cn.iocoder.yudao.module.rescue.mapper.RescueDriverInfoMapper;
import cn.iocoder.yudao.module.rescue.utils.RedissonDelayQueue;
import cn.iocoder.yudao.module.shop.entity.ShopUserCar;
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@ -72,6 +77,10 @@ public class RescueDriverInfoServiceImpl extends ServiceImpl<RescueDriverInfoMap
private WechatPayConfig wechatPayConfig;
@Resource
private RedissonDelayQueue redissonDelayQueue;
@Autowired
private IPartnerCustomerInfoService customerInfoService;
@Resource
private CustomerMainService customerMainService;
public static String Redis_Driver_Key = "Rescue:Driver:";
public static String Redis_Driver_Position_Key = "DriverPosition:";
@ -581,6 +590,33 @@ public class RescueDriverInfoServiceImpl extends ServiceImpl<RescueDriverInfoMap
//处理redis
DriverInfo driverInfo = driverInfoService.getById(rescueInfo.getDriverId());
AdminUserRespDTO user = userService.getUser(driverInfo.getUserId());
// 收集客户信息
PartnerCustomerInfo customerInfo = new PartnerCustomerInfo();
customerInfo.setCustomerName(rescueInfo.getConnectionName());
customerInfo.setCustomerPhone(rescueInfo.getConnectionPhone());
customerInfo.setUserId(rescueInfo.getUserId());
// 收集客户车辆信息
List<ShopUserCar> userCarList = new ArrayList<>();
ShopUserCar userCar = new ShopUserCar();
userCar.setCarNo(rescueInfo.getLicenseNum());
userCar.setCarModel(rescueInfo.getCarType());
userCar.setCarBrand(rescueInfo.getCarBrand());
userCar.setUserId(user.getId());
userCarList.add(userCar);
customerInfo.setUserCarList(userCarList);
// 设置客户来源
CustomerMain customerMain = new CustomerMain();
customerMain.setDataFrom("02");
customerMainService.saveOrUpdate(customerMain);
// 调用插入客户信息的方法
customerInfoService.insertPartnerCustomerInfo(customerInfo);
//所在顶级机构
String redisKey = Redis_Driver_Key + driverInfo.getTenantId() + ":" + rescueInfo.getDriverId();
Object temp = redisCache.getCacheMapValue(redisKey, "rescueIds");
@ -588,7 +624,7 @@ public class RescueDriverInfoServiceImpl extends ServiceImpl<RescueDriverInfoMap
String s = temp.toString();
if (StringUtils.isNotEmpty(s)) {
String resStr = "";
String[] rescueIds = temp.toString().split(",");
String[] rescueIds = temp.toString().split(",");
for (String tmp : rescueIds) {
if (!tmp.equals(rescueId.toString())) {
resStr = resStr + "," + tmp;