From 0710d8e354435a72f2b3ebdd9aa9264cfd30b344 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 22 Oct 2024 17:40:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=AF=BC=E5=87=BA=E3=80=81?=
=?UTF-8?q?=E5=8F=B8=E6=9C=BA=E6=96=B0=E5=A2=9E=E7=94=B5=E8=AF=9D=E5=8F=B7?=
=?UTF-8?q?=E7=A0=81=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/AftersalesWorkOrderMapper.xml | 1 +
.../impl/AftersalesWorkOrderServiceImpl.java | 7 +++---
.../BasicdataDriverArteryController.java | 23 +++++++++++++++----
.../DistributionDeliveryListServiceImpl.java | 1 -
4 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index 2a94fd6c1..4b85796b0 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -308,6 +308,7 @@
and lawo.work_order_status in (21,30,40) and lap.processing_status = '4'
and lawo.work_order_status in (80,100) and lacr.warehouse_id=#{param.warehouseId}
and lawo.work_order_status in (20,30,10,40,60,100,21,70)
+ GROUP BY lawo.id
ORDER BY lawo.create_time DESC
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index 6c6309304..876f9b821 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -118,9 +118,10 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl exportAftersalesWorkOrder(Map aftersalesWorkOrder) {
- Object o = aftersalesWorkOrder.get("ids");
-
-
+ String o = (String) aftersalesWorkOrder.get("ids");
+ if (!Objects.isNull(o)){
+ aftersalesWorkOrder.put("ids",o);
+ }
//查询用户角色信息
BladeUser user = AuthUtil.getUser();
String roleName = user.getRoleName();
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
index b9a233e05..e89e521b1 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
@@ -17,6 +17,7 @@
package com.logpm.basicdata.controller;
import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -183,14 +184,28 @@ public class BasicdataDriverArteryController extends BladeController {
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入basicdataDriverArtery")
public R save(@Valid @RequestBody BasicdataDriverArteryDTO basicdataDriverArtery) {
- List list = basicdataDriverArteryService.list(Wrappers.query().lambda()
- .eq(BasicdataDriverArteryEntity::getUserId, basicdataDriverArtery.getUserId())
+ LambdaQueryWrapper eq = Wrappers.query().lambda();
+ String phone = basicdataDriverArtery.getPhone();
+ if (Objects.isNull(phone)){
+ return R.fail("请输入司机手机号码!!!");
+ }
+ LambdaQueryWrapper wrapper = eq.eq(BasicdataDriverArteryEntity::getPhone, phone);
+ List list1 = basicdataDriverArteryService.list(wrapper);
+ if (!list1.isEmpty()) {
+ return R.fail("此电话已绑定司机！不要重复绑定！！！");
+ }
+ String name = basicdataDriverArtery.getName();
+ if (Objects.isNull(name)){
+ return R.fail("请输入司机手机号码!!!");
+ }
+ List list2 = basicdataDriverArteryService.list(Wrappers.query().lambda()
+ .eq(BasicdataDriverArteryEntity::getUserId, AuthUtil.getUserId())
.eq(BasicdataDriverArteryEntity::getIsDeleted, 0)
);
- if (!list.isEmpty()) {
+ if (!list2.isEmpty()) {
return R.fail("绑定的用户已存在！不要重复绑定！！！");
}
- String phone = basicdataDriverArtery.getPhone();
+
R userR = userClient
.userInfoByPhone(AuthUtil.getUser().getTenantId(), phone);
if (Func.isNotEmpty(userR.getData())) {
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index e19d4ce2b..4ece47f3c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -824,7 +824,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl