Merge branch 'dev' into pre-production

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

@@ -240,7 +240,7 @@ public class BasicdataVehicleEntity extends TenantEntity {
 	 * 关联承运商Id
 	 */
 	@ApiModelProperty(value = "关联承运商Id")
-	private String carrierId;
+	private Long carrierId;
 	/**
 	 * 车辆年审时间
 	 */

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

@@ -184,8 +184,6 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 						vehicleVO.setDriverArteryEntityList(basicdataDriverArteryEntities);
 					}
 				}
-
-
 				basicdataVehicleVOS.add(vehicleVO);
 			});
 		}
@@ -214,12 +212,6 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 				if (Func.isNotEmpty(entity)){
 					continue;
 				}
-//				if (Func.isNotBlank(datum.getDemonstrate())){
-//					//查询是否是模板示例
-//					if ("是".equals(datum.getDemonstrate())){
-//						continue;
-//					}
-//				}
 
 				//查询模板信息是否合法
 				//车牌号是否合法
@@ -275,7 +267,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 				}
 
 				BasicdataVehicleEntity vehicleEntity = Func.copy(datum, BasicdataVehicleEntity.class);
-				vehicleEntity.setCarrierId(datum.getCarrierId().toString());
+				vehicleEntity.setCarrierId(datum.getCarrierId());
 				vehicleEntity.setInsuranceStartTime(datum.getInsuranceStartTime());
 				vehicleEntity.setInsuranceEndTime(datum.getInsuranceEndTime());
 				this.save(vehicleEntity);
@@ -284,7 +276,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 					drivermiddleEntities.add(basicdataDrivermiddleEntity);
 				}
 			}
-			if (drivermiddleEntities.size() > 0){
+			if (!drivermiddleEntities.isEmpty()){
 				basicdataDrivermiddleService.saveBatch(drivermiddleEntities);
 			}
 		}catch (Exception e){

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

@@ -2647,7 +2647,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 	/**
 	 * @param distributionStockArticle
-	 * @param page
 	 * @return
 	 */
 	@Override