汽车改为saber

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

@@ -31,5 +31,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class BasicdataVehicleVO extends BasicdataVehicleEntity {
 	private static final long serialVersionUID = 1L;
-
+	//历史照片
+	private String historicPhotos;
 }

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

@@ -90,6 +90,17 @@ public class BasicdataCarrierController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 承运商信息 字典
+	 */
+	@GetMapping("/dictionary")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "承运商字典",notes = "传入code")
+	public R<List<BasicdataCarrierVO>> dictionary() {
+		List<BasicdataCarrierVO> dictionary = basicdataCarrierService.selectBasicdataCarrierDictionary();
+		return R.data(dictionary);
+	}
+
 	/**
 	 * 承运商信息 新增
 	 */

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.controller;
 
+import com.logpm.basicdata.dto.BasicdataVehicleDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -23,6 +24,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -54,6 +56,7 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/vehicle")
 @Api(value = "车辆信息表", tags = "车辆信息表接口")
+@Slf4j
 public class BasicdataVehicleController extends BladeController {
 
 	private final IBasicdataVehicleService basicdataVehicleService;
@@ -85,7 +88,8 @@ public class BasicdataVehicleController extends BladeController {
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入basicdataVehicle")
-	public R<IPage<BasicdataVehicleVO>> page(BasicdataVehicleVO basicdataVehicle, Query query) {
+	public R<IPage<BasicdataVehicleVO>> page(BasicdataVehicleDTO basicdataVehicle, Query query) {
+		log.info("接收>>>>>>>>>>>>{}",query);
 		IPage<BasicdataVehicleVO> pages = basicdataVehicleService.selectBasicdataVehiclePage(Condition.getPage(query), basicdataVehicle);
 		return R.data(pages);
 	}

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

@@ -51,4 +51,10 @@ public interface BasicdataCarrierMapper extends BaseMapper<BasicdataCarrierEntit
 	 */
 	List<BasicdataCarrierExcel> exportBasicdataCarrier(@Param("ew") Wrapper<BasicdataCarrierEntity> queryWrapper);
 
+	/**
+	 * 获取字典
+	 *
+	 * @return
+	 */
+	List<BasicdataCarrierVO> selectBasicdataDictionary();
 }

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

@@ -56,5 +56,8 @@
     <select id="exportBasicdataCarrier" resultType="com.logpm.basicdata.excel.BasicdataCarrierExcel">
         SELECT * FROM logpm_basicdata_carrier ${ew.customSqlSegment}
     </select>
+    <select id="selectBasicdataDictionary" resultType="com.logpm.basicdata.vo.BasicdataCarrierVO">
+        select id,number,group_id from logpm_basicdata_carrier where is_deleted = 0
+    </select>
 
 </mapper>

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.mapper;
 
+import com.logpm.basicdata.dto.BasicdataVehicleDTO;
 import com.logpm.basicdata.entity.BasicdataVehicleEntity;
 import com.logpm.basicdata.vo.BasicdataVehicleVO;
 import com.logpm.basicdata.excel.BasicdataVehicleExcel;
@@ -40,7 +41,7 @@ public interface BasicdataVehicleMapper extends BaseMapper<BasicdataVehicleEntit
 	 * @param basicdataVehicle
 	 * @return
 	 */
-	List<BasicdataVehicleVO> selectBasicdataVehiclePage(IPage page, BasicdataVehicleVO basicdataVehicle);
+	List<BasicdataVehicleVO> selectBasicdataVehiclePage(IPage page, @Param("param") BasicdataVehicleDTO basicdataVehicle);
 
 
 	/**

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

@@ -70,8 +70,89 @@
     </resultMap>
 
 
-    <select id="selectBasicdataVehiclePage" resultMap="basicdataVehicleResultMap">
-        select * from logpm_basicdata_vehicle where is_deleted = 0
+    <select id="selectBasicdataVehiclePage" resultType="com.logpm.basicdata.vo.BasicdataVehicleVO">
+        SELECT
+        lbv.id id,
+        lbv.tenant_id tenantId,
+        lbv.create_user createUser,
+        lbv.create_time createTime,
+        lbv.update_user updateUser,
+        lbv.update_time updateTime,
+        lbv.STATUS STATUS,
+        lbv.create_dept createDept,
+        lbv.vehicle_nub vehicleNub,
+        lbv.vehicle_source vehicleSource,
+        lbv.is_head isHead,
+        lbv.trailer_type trailerType,
+        lbv.vehicle_model vehicleModel,
+        lbv.car_type carType,
+        lbv.vehicle_commander vehicleCommander,
+        lbv.vehicle_height vehicleHeight,
+        lbv.payment_method paymentMethod,
+        lbv.approved_volume approvedVolume,
+        lbv.license_plate_color licensePlateColor,
+        lbv.vehicle_color vehicleColor,
+        lbv.energy_type energyType,
+        lbv.license_plate_type licensePlateType,
+        lbv.notes notes,
+        lbv.vehicle_owner vehicleOwner,
+        lbv.vehicle_brand vehicleBrand,
+        lbv.vehicle_code vehicleCode,
+        lbv.engine_code engineCode,
+        lbv.vehicle_quality vehicleQuality,
+        lbv.curb_weight curbWeight,
+        lbv.load_mass loadMass,
+        lbv.outer_width outerWidth,
+        lbv.expiration_time expirationTime,
+        lbv.road_transport roadTransport,
+        lbv.business_license businessLicense,
+        lbv.vehicle_unit vehicleUnit,
+        lbv.vehicle_unit_phone vehicleUnitPhone,
+        lbv.vehicle_owner_phone vehicleOwnerPhone,
+        lbv.vehicle_owner_card vehicleOwnerCard,
+        lbv.driving_license_photo drivingLicensePhoto,
+        lbv.driving_license_photo_back drivingLicensePhotoBack,
+        lbv.license_photo licensePhoto,
+        lbv.vehicle_photo vehiclePhoto,
+        lbv.vehicle_rear_photo vehicleRearPhoto,
+        lbv.road_transport_photo roadTransportPhoto,
+        lbv.vehicle_people_photo vehiclePeoplePhoto,
+        lbv.insurance_card_photo insuranceCardPhoto,
+        lbv.carrier_id carrierId,
+        lbv.review_time reviewTime,
+        lbv.review_validity reviewValidity,
+        lbv.insurance_start_time insuranceStartTime,
+        lbv.insurance_end_time insuranceEndTime,
+        lbv.body_advertising bodyAdvertising,
+        lbv.advertisements_new_times advertisementsNewTimes,
+        lbv.vehicle_parking_company vehicleParkingCompany,
+        lbv.with_gps withGps,
+        lbv.gps_service_provider gpsServiceProvider,
+        lbv.gps_model gpsModel,
+        (
+        SELECT
+        lbvp.photo_url
+        FROM
+        logpm_basicdata_vehicle_photo lbvp
+        where
+        lbvp.master_id = lbv.id
+        AND lbvp.create_time &lt;= DATE_SUB( CURDATE(), INTERVAL 1 YEAR )
+        ORDER BY
+        lbvp.create_time
+        LIMIT 1
+        ) historicPhotos
+        FROM
+        logpm_basicdata_vehicle lbv
+        <where>
+            lbv.is_deleted = 0
+            <if test="param.vehicleNub != null ">and lbv.vehicle_nub like concat('%',#{param.vehicleNub},'%')</if>
+            <if test="param.vehicleSource != null ">and lbv.vehicle_source = #{param.vehicleSource}</if>
+            <if test="param.trailerType != null ">and lbv.trailer_type = #{param.trailerType}</if>
+            <if test="param.vehicleModel != null ">and lbv.vehicle_model = #{param.vehicleModel}</if>
+            <if test="param.paymentMethod != null ">and lbv.payment_method = #{param.paymentMethod}</if>
+            <if test="param.carrierId != null ">and lbv.carrier_id = #{param.carrierId}</if>
+
+        </where>
     </select>
 
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/pros/BasicDataProperties.java

@@ -2,6 +2,7 @@ package com.logpm.basicdata.pros;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
 
 /**
  * FactoryProperties
@@ -10,6 +11,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  */
 @Data
 @ConfigurationProperties(prefix = "logpm")
+@Component
 public class BasicDataProperties {
 	/**
 	 * 名称

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

@@ -48,5 +48,10 @@ public interface IBasicdataCarrierService extends BaseService<BasicdataCarrierEn
 	 * @return
 	 */
 	List<BasicdataCarrierExcel> exportBasicdataCarrier(Wrapper<BasicdataCarrierEntity> queryWrapper);
-
+	/**
+	 * 查询承运商字典
+	 *
+	 * @return
+	 */
+	List<BasicdataCarrierVO> selectBasicdataCarrierDictionary();
 }

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

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.dto.BasicdataVehicleDTO;
 import com.logpm.basicdata.entity.BasicdataVehicleEntity;
 import com.logpm.basicdata.vo.BasicdataVehicleVO;
 import com.logpm.basicdata.excel.BasicdataVehicleExcel;
@@ -38,7 +39,7 @@ public interface IBasicdataVehicleService extends BaseService<BasicdataVehicleEn
 	 * @param basicdataVehicle
 	 * @return
 	 */
-	IPage<BasicdataVehicleVO> selectBasicdataVehiclePage(IPage<BasicdataVehicleVO> page, BasicdataVehicleVO basicdataVehicle);
+	IPage<BasicdataVehicleVO> selectBasicdataVehiclePage(IPage<BasicdataVehicleVO> page, BasicdataVehicleDTO basicdataVehicle);
 
 
 	/**

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

@@ -51,4 +51,9 @@ public class BasicdataCarrierServiceImpl extends BaseServiceImpl<BasicdataCarrie
 		return basicdataCarrierList;
 	}
 
+	@Override
+	public List<BasicdataCarrierVO> selectBasicdataCarrierDictionary() {
+		return baseMapper.selectBasicdataDictionary();
+	}
+
 }

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.service.impl;
 
+import com.logpm.basicdata.dto.BasicdataVehicleDTO;
 import com.logpm.basicdata.entity.BasicdataVehicleEntity;
 import com.logpm.basicdata.vo.BasicdataVehicleVO;
 import com.logpm.basicdata.excel.BasicdataVehicleExcel;
@@ -37,7 +38,7 @@ import java.util.List;
 public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicleMapper, BasicdataVehicleEntity> implements IBasicdataVehicleService {
 
 	@Override
-	public IPage<BasicdataVehicleVO> selectBasicdataVehiclePage(IPage<BasicdataVehicleVO> page, BasicdataVehicleVO basicdataVehicle) {
+	public IPage<BasicdataVehicleVO> selectBasicdataVehiclePage(IPage<BasicdataVehicleVO> page, BasicdataVehicleDTO basicdataVehicle) {
 		return page.setRecords(baseMapper.selectBasicdataVehiclePage(page, basicdataVehicle));
 	}