售后导出、司机新增电话号码限制

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml

@@ -308,6 +308,7 @@
             <if test="param.handleStatus!= null and param.handleStatus == 30">and  lawo.work_order_status in (21,30,40) and lap.processing_status = '4'  </if>
             <if test="param.handleStatus!= null and param.handleStatus == 20 ">and lawo.work_order_status in (80,100)  and lacr.warehouse_id=#{param.warehouseId} </if>
             <if test="param.customerServiceState!= null and param.customerServiceState == 80 ">and lawo.work_order_status in (20,30,10,40,60,100,21,70)   </if>
+            GROUP BY lawo.id
             ORDER BY lawo.create_time DESC
         </where>
     </select>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -118,9 +118,10 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	@Override
 	public List<AftersalesWorkOrderExcel> exportAftersalesWorkOrder(Map<String, Object> 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();

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<BasicdataDriverArteryEntity> list = basicdataDriverArteryService.list(Wrappers.<BasicdataDriverArteryEntity>query().lambda()
-			.eq(BasicdataDriverArteryEntity::getUserId, basicdataDriverArtery.getUserId())
+		LambdaQueryWrapper<BasicdataDriverArteryEntity> eq = Wrappers.<BasicdataDriverArteryEntity>query().lambda();
+		String phone = basicdataDriverArtery.getPhone();
+		if (Objects.isNull(phone)){
+			return R.fail("请输入司机手机号码!!!");
+		}
+		LambdaQueryWrapper<BasicdataDriverArteryEntity> wrapper = eq.eq(BasicdataDriverArteryEntity::getPhone, phone);
+		List<BasicdataDriverArteryEntity> list1 = basicdataDriverArteryService.list(wrapper);
+		if (!list1.isEmpty()) {
+			return R.fail("此电话已绑定司机！不要重复绑定！！！");
+		}
+		String name = basicdataDriverArtery.getName();
+		if (Objects.isNull(name)){
+			return R.fail("请输入司机手机号码!!!");
+		}
+		List<BasicdataDriverArteryEntity> list2 = basicdataDriverArteryService.list(Wrappers.<BasicdataDriverArteryEntity>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<User> userR = userClient
 			.userInfoByPhone(AuthUtil.getUser().getTenantId(), phone);
 		if (Func.isNotEmpty(userR.getData())) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -824,7 +824,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //	synchronized
 	public R loadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
 
-
 		//查询该包件是否能够从库存品包件表中查到
 		String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());