diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataVehicleVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataVehicleVO.java index cf8322758..468eb034c 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataVehicleVO.java +++ b/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; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCarrierController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCarrierController.java index 5f8c88f4c..f9a9a1bd5 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCarrierController.java +++ b/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> dictionary() { + List dictionary = basicdataCarrierService.selectBasicdataCarrierDictionary(); + return R.data(dictionary); + } + /** * 承运商信息 新增 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java index df48592f8..fdaa14850 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java +++ b/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> page(BasicdataVehicleVO basicdataVehicle, Query query) { + public R> page(BasicdataVehicleDTO basicdataVehicle, Query query) { + log.info("接收>>>>>>>>>>>>{}",query); IPage pages = basicdataVehicleService.selectBasicdataVehiclePage(Condition.getPage(query), basicdataVehicle); return R.data(pages); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCarrierMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCarrierMapper.java index d494fa0b5..dbbcddee6 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCarrierMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCarrierMapper.java @@ -51,4 +51,10 @@ public interface BasicdataCarrierMapper extends BaseMapper exportBasicdataCarrier(@Param("ew") Wrapper queryWrapper); + /** + * 获取字典 + * + * @return + */ + List selectBasicdataDictionary(); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCarrierMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCarrierMapper.xml index cef40c966..2cf0fa1d7 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCarrierMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCarrierMapper.xml @@ -56,5 +56,8 @@ + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java index c5f79488d..4236b6c74 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java +++ b/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 selectBasicdataVehiclePage(IPage page, BasicdataVehicleVO basicdataVehicle); + List selectBasicdataVehiclePage(IPage page, @Param("param") BasicdataVehicleDTO basicdataVehicle); /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml index ab17181bc..bf5f673ec 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml @@ -70,8 +70,89 @@ - + 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 <= DATE_SUB( CURDATE(), INTERVAL 1 YEAR ) + ORDER BY + lbvp.create_time + LIMIT 1 + ) historicPhotos + FROM + logpm_basicdata_vehicle lbv + + lbv.is_deleted = 0 + and lbv.vehicle_nub like concat('%',#{param.vehicleNub},'%') + and lbv.vehicle_source = #{param.vehicleSource} + and lbv.trailer_type = #{param.trailerType} + and lbv.vehicle_model = #{param.vehicleModel} + and lbv.payment_method = #{param.paymentMethod} + and lbv.carrier_id = #{param.carrierId} + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/pros/BasicDataProperties.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/pros/BasicDataProperties.java index 9324e5f22..ac7fbda65 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/pros/BasicDataProperties.java +++ b/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 { /** * 名称 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCarrierService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCarrierService.java index f22e2d322..3d95ff016 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCarrierService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCarrierService.java @@ -48,5 +48,10 @@ public interface IBasicdataCarrierService extends BaseService exportBasicdataCarrier(Wrapper queryWrapper); - + /** + * 查询承运商字典 + * + * @return + */ + List selectBasicdataCarrierDictionary(); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehicleService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehicleService.java index 99d86f3c4..de34c2e8c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehicleService.java +++ b/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 selectBasicdataVehiclePage(IPage page, BasicdataVehicleVO basicdataVehicle); + IPage selectBasicdataVehiclePage(IPage page, BasicdataVehicleDTO basicdataVehicle); /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCarrierServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCarrierServiceImpl.java index d51e7ac3d..0bf34b42a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCarrierServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCarrierServiceImpl.java @@ -51,4 +51,9 @@ public class BasicdataCarrierServiceImpl extends BaseServiceImpl selectBasicdataCarrierDictionary() { + return baseMapper.selectBasicdataDictionary(); + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java index 1edfaa0b7..f783a731e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java +++ b/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 implements IBasicdataVehicleService { @Override - public IPage selectBasicdataVehiclePage(IPage page, BasicdataVehicleVO basicdataVehicle) { + public IPage selectBasicdataVehiclePage(IPage page, BasicdataVehicleDTO basicdataVehicle) { return page.setRecords(baseMapper.selectBasicdataVehiclePage(page, basicdataVehicle)); }