1.bug修复

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java

@@ -42,6 +42,8 @@ public class BasicdataDriverArteryVO extends BasicdataDriverArteryEntity {
 	@ApiModelProperty(value = "车辆信息")
 	private String  bindVehicles;
 
+	private String  carNumbers;
+
 	/**
 	 * 司机关联车辆列表
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataDriverArteryClient.java

@@ -22,15 +22,18 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
 import com.logpm.basicdata.mapper.BasicdataDriverArteryMapper;
 import com.logpm.basicdata.service.IBasicdataDriverArteryService;
+import com.logpm.basicdata.vo.BasicdataDriverArteryVO;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -69,14 +72,21 @@ public class BasicdataDriverArteryClient implements IBasicdataDriverArteryClient
 
 	@Override
 	public List<JSONObject> findDriverListByName(String driverName) {
-		List<BasicdataDriverArteryEntity> ls = basicdataDriverArteryService.findDriverListByName(driverName);
+		List<BasicdataDriverArteryVO> ls = basicdataDriverArteryService.findDriverListByName(driverName);
 		List<JSONObject> list = new ArrayList<>();
-		for (BasicdataDriverArteryEntity driverArteryEntity:ls){
+		for (BasicdataDriverArteryVO driverArteryEntity:ls){
 			JSONObject jsonObject = new JSONObject();
 			jsonObject.put("driverId",driverArteryEntity.getId());
 			jsonObject.put("driverName",driverArteryEntity.getName());
 			jsonObject.put("driverPhone",driverArteryEntity.getPhone());
 			jsonObject.put("driverType",driverArteryEntity.getType());
+			String carNumbers = driverArteryEntity.getCarNumbers();
+			List<String> carNumberList = new ArrayList<>();
+			if(StringUtil.isNotBlank(carNumbers)){
+				String[] split = carNumbers.split(",");
+				carNumberList.addAll(Arrays.asList(split));
+			}
+			jsonObject.put("carNumberList",carNumberList);
 			list.add(jsonObject);
 		}
 		return list;

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java

@@ -57,7 +57,7 @@ public interface BasicdataDriverArteryMapper extends BaseMapper<BasicdataDriverA
 	 */
 	List<BasicdataDriverArteryVO> selectBasicdataDictionary();
 
-    List<BasicdataDriverArteryEntity> findDriverListByName(@Param("driverName") String driverName);
+    List<BasicdataDriverArteryVO> findDriverListByName(@Param("driverName") String driverName);
 
 	void updateIsdeletedByPhone(@Param("phone") String phone);
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml

@@ -157,10 +157,20 @@
         SELECT id,name,bind_vehicle FROM logpm_basicdata_driver_artery
     </select>
 
-    <select id="findDriverListByName" resultType="com.logpm.basicdata.entity.BasicdataDriverArteryEntity">
-        select *
-        from logpm_basicdata_driver_artery
+    <select id="findDriverListByName" resultType="com.logpm.basicdata.vo.BasicdataDriverArteryVO">
+        select lbda.id id,
+               lbda.name name,
+               lbda.phone phone,
+               lbda.type type,
+               group_concat(lbv.vehicle_nub) carNumbers
+        from logpm_basicdata_driver_artery lbda
+        left join logpm_basicdata_drivermiddle lbdm on lbdm.driver_id = lbda.id
+        left join logpm_basicdata_vehicle lbv on lbv.id = lbdm.brand_id
         where `name` like concat('%',#{driverName},'%')
+        group by lbda.id,
+               lbda.name,
+               lbda.phone,
+               lbda.type
         limit 10
     </select>
     <select id="findDriverListByPhone" resultType="com.logpm.basicdata.entity.BasicdataDriverArteryEntity">

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataDriverArteryService.java

@@ -70,5 +70,5 @@ public interface IBasicdataDriverArteryService extends BaseService<BasicdataDriv
 
 	void importDriverArtery(List<BasicdataDriverArteryImproterExcel> data);
 
-    List<BasicdataDriverArteryEntity> findDriverListByName(String driverName);
+    List<BasicdataDriverArteryVO> findDriverListByName(String driverName);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java

@@ -327,7 +327,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 
 
 	@Override
-	public List<BasicdataDriverArteryEntity> findDriverListByName(String driverName) {
+	public List<BasicdataDriverArteryVO> findDriverListByName(String driverName) {
 		return baseMapper.findDriverListByName(driverName);
 	}
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java

@@ -441,7 +441,7 @@ public class InComingServiceImpl implements IInComingService {
 					String dealerName = advanceEntity.getDealerName();
 					String dealerCode = advanceEntity.getDealerCode();
 					String brand = advanceEntity.getBrand();
-					if(Objects.isNull(waybillId)){
+					if(!Objects.isNull(waybillId)){
 						WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
 						if(!Objects.isNull(waybillEntity)){
 							String destinationWarehouseName = waybillEntity.getDestinationWarehouseName();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -4719,7 +4719,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		//重新计算签收单的数量
 		updateSignOrderNumBySignOrderId(signOrderId);
 
-		return Resp.scanSuccess("签收成功",enterNum+"件");
+//		return Resp.scanSuccess("签收成功",enterNum+"件");
+		return R.success("签收成功");
+
 	}
 
 	@Override