Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java

@@ -136,6 +136,12 @@ public class BasicdataCarrierEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "物流园")
 	private String logisticsPark;
+
+	/**
+	 * 承运商名称
+	 */
+	@ApiModelProperty(value = "承运商名称")
+	private String carrierName;
 	/**
 	 * 自由车辆数
 	 */

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java

@@ -68,6 +68,12 @@ public class BasicdataVehicleEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "车厢类型;1-高栏,2-平板,3-箱车")
 	private String carType;
+
+	/**
+	 * 承运商名称
+	 */
+	@ApiModelProperty(value = "承运商名称")
+	private String carrierName;
 	/**
 	 * 车长;单位（M）
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java

@@ -127,7 +127,7 @@ public class BasicdataVehicleController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入basicdataVehicle")
 	public R save(@Valid @RequestBody BasicdataVehicleDTO basicdataVehicle) {
-		boolean save = basicdataVehicleService.save(basicdataVehicle);
+		boolean save = basicdataVehicleService.saveVehicle(basicdataVehicle);
 		//加入关联表
 		if (null !=basicdataVehicle.getVehicleOwners() && save){
 			Integer b =	basicdataVehicleService.updateOwners(basicdataVehicle);

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

@@ -86,6 +86,7 @@
         lbv.trailer_type trailerType,
         lbv.vehicle_model vehicleModel,
         lbv.car_type carType,
+        lbv.carrier_name carrierName,
         lbv.vehicle_commander vehicleCommander,
         lbv.vehicle_height vehicleHeight,
         lbv.payment_method paymentMethod,

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

@@ -70,4 +70,11 @@ public interface IBasicdataVehicleService extends BaseService<BasicdataVehicleEn
 	 * 新增关联表
 	 */
 	Integer updateOwners(BasicdataVehicleDTO basicdataVehicle);
+
+	/**
+	 * 保存车辆信息
+	 * @param basicdataVehicle
+	 * @return
+	 */
+    boolean saveVehicle(BasicdataVehicleDTO basicdataVehicle);
 }

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

@@ -57,4 +57,6 @@ public class BasicdataCarrierServiceImpl extends BaseServiceImpl<BasicdataCarrie
 		return baseMapper.selectBasicdataDictionary();
 	}
 
+
+
 }

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

@@ -20,15 +20,18 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.dto.BasicdataVehicleDTO;
+import com.logpm.basicdata.entity.BasicdataCarrierEntity;
 import com.logpm.basicdata.entity.BasicdataDrivermiddleEntity;
 import com.logpm.basicdata.entity.BasicdataVehicleEntity;
 import com.logpm.basicdata.excel.BasicdataVehicleExcel;
 import com.logpm.basicdata.mapper.BasicdataDrivermiddleMapper;
 import com.logpm.basicdata.mapper.BasicdataVehicleMapper;
+import com.logpm.basicdata.service.IBasicdataCarrierService;
 import com.logpm.basicdata.service.IBasicdataVehicleService;
 import com.logpm.basicdata.vo.BasicdataVehicleVO;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -48,6 +51,8 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 	private final BasicdataDrivermiddleMapper basicdataDrivermiddleMapper;
 
 	private final BasicdataDrivermiddleServiceImpl basicdataDrivermiddleService;
+
+	private final IBasicdataCarrierService basicdataCarrierService;
 	@Override
 	public IPage<BasicdataVehicleVO> selectBasicdataVehiclePage(IPage<BasicdataVehicleVO> page, BasicdataVehicleDTO basicdataVehicle) {
 		return page.setRecords(baseMapper.selectBasicdataVehiclePage(page, basicdataVehicle));
@@ -93,9 +98,22 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 				basicdataDrivermiddleEntity.setDriverId(Long.valueOf(e));
 				basicdataDrivermiddleEntities.add(basicdataDrivermiddleEntity);
 			});
+
 			basicdataDrivermiddleService.saveBatch(basicdataDrivermiddleEntities);
 	//	}
 		return delete;
 	}
 
+	@Override
+	public boolean saveVehicle(BasicdataVehicleDTO basicdataVehicle) {
+		if (Func.isNotEmpty(basicdataVehicle.getCarrierId())){
+			BasicdataCarrierEntity carrierEntity = basicdataCarrierService.getById(basicdataVehicle.getCarrierId());
+			if (Func.isNotEmpty(carrierEntity)){
+				basicdataVehicle.setCarrierName(carrierEntity.getCarrierName());
+			}
+
+		}
+		return this.save(basicdataVehicle);
+	}
+
 }