陆运修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service/blade-client/src/main/java/org/springblade/client/land/controller/LandVehicleController.java

@@ -121,24 +121,7 @@ public class LandVehicleController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入landVehicle")
 	public R<IPage<LandVehicle>> list(LandVehicle landVehicle, Query query) {
-		landVehicle.setTenantId(AuthUtil.getTenantId());
-		landVehicle.setIsDeleted(0);
-		IPage<LandVehicle> pages = landVehicleService.page(Condition.getPage(query), Condition.getQueryWrapper(landVehicle));
-		pages.getRecords().forEach(record -> {
-			if (ObjectUtil.isNotEmpty(record.getFleetId())) {
-				CorpsDesc fleet = corpsDescService.getById(record.getFleetId());
-				if (ObjectUtil.isNotEmpty(fleet)) {
-					record.setFleetName(fleet.getCname());
-				}
-			}
-			if (ObjectUtil.isNotEmpty(record.getDriverId())) {
-				LandDriver driver = landDriverService.getById(record.getDriverId());
-				if (ObjectUtil.isNotEmpty(driver)) {
-					record.setDriverName(driver.getName());
-				}
-			}
-		});
-		return R.data(pages);
+		return R.data(landVehicleService.getList(landVehicle, query));
 	}
 
 	/**
@@ -248,4 +231,12 @@ public class LandVehicleController extends BladeController {
 		return landVehicleService.importData(excelList, false);
 	}
 
+	/**
+	 * 到期提醒
+	 */
+	@GetMapping("/remind")
+	public R remind() {
+		return R.data(landVehicleService.remind());
+	}
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/land/service/ILandVehicleService.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.client.entity.LandVehicle;
 import org.springblade.client.land.excel.VehicleExcel;
 import org.springblade.client.vo.LandVehicleVO;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
 import java.util.List;
@@ -43,6 +44,15 @@ public interface ILandVehicleService extends IService<LandVehicle> {
 	IPage<LandVehicleVO> selectLandVehiclePage(IPage<LandVehicleVO> page, LandVehicleVO landVehicle);
 
 	/**
+	 * 列表 分页
+	 *
+	 * @param vehicle
+	 * @param query
+	 * @return
+	 */
+	IPage<LandVehicle> getList(LandVehicle vehicle, Query query);
+
+	/**
 	 * 保存车辆
 	 *
 	 * @param vehicle
@@ -67,4 +77,11 @@ public interface ILandVehicleService extends IService<LandVehicle> {
 	 */
 	R importData(List<VehicleExcel> data, Boolean isCovered);
 
+	/**
+	 * 导入数据
+	 *
+	 * @return
+	 */
+	List<LandVehicle> remind();
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/land/service/impl/LandVehicleServiceImpl.java

@@ -30,6 +30,8 @@ import org.springblade.client.land.mapper.LandVehicleChangeMapper;
 import org.springblade.client.land.mapper.LandVehicleMapper;
 import org.springblade.client.land.service.ILandVehicleService;
 import org.springblade.client.vo.LandVehicleVO;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -65,6 +67,44 @@ public class LandVehicleServiceImpl extends ServiceImpl<LandVehicleMapper, LandV
 	}
 
 	@Override
+	public IPage<LandVehicle> getList(LandVehicle vehicle, Query query) {
+		LambdaQueryWrapper<LandVehicle> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(ObjectUtil.isNotEmpty(vehicle.getFleetId()), LandVehicle::getFleetId, vehicle.getFleetId())
+			.eq(ObjectUtil.isNotEmpty(vehicle.getDriverId()), LandVehicle::getDriverId, vehicle.getDriverId())
+			.eq(StringUtil.isNotBlank(vehicle.getType()), LandVehicle::getType, vehicle.getType())
+			.like(StringUtil.isNotBlank(vehicle.getPlateNo()), LandVehicle::getPlateNo, vehicle.getPlateNo())
+			.like(StringUtil.isNotBlank(vehicle.getTrailerNo()), LandVehicle::getTrailerNo, vehicle.getTrailerNo())
+			.like(StringUtil.isNotBlank(vehicle.getFuelType()), LandVehicle::getFuelType, vehicle.getFuelType())
+			.like(StringUtil.isNotBlank(vehicle.getBrand()), LandVehicle::getBrand, vehicle.getBrand())
+			.like(StringUtil.isNotBlank(vehicle.getManufacturer()), LandVehicle::getManufacturer, vehicle.getManufacturer())
+			.like(StringUtil.isNotBlank(vehicle.getIssuingAuthority()), LandVehicle::getIssuingAuthority, vehicle.getIssuingAuthority())
+			.like(StringUtil.isNotBlank(vehicle.getTowModel()), LandVehicle::getTowModel, vehicle.getTowModel())
+			.like(StringUtil.isNotBlank(vehicle.getTowVin()), LandVehicle::getTowVin, vehicle.getTowVin())
+			.like(StringUtil.isNotBlank(vehicle.getTrailerModel()), LandVehicle::getTrailerModel, vehicle.getTrailerModel())
+			.like(StringUtil.isNotBlank(vehicle.getTrailerVin()), LandVehicle::getTrailerVin, vehicle.getTrailerVin())
+			.like(StringUtil.isNotBlank(vehicle.getEngineModel()), LandVehicle::getEngineModel, vehicle.getEngineModel())
+			.eq(LandVehicle::getTenantId, AuthUtil.getTenantId())
+			.eq(LandVehicle::getIsDeleted, 0);
+
+		IPage<LandVehicle> pages = baseMapper.selectPage(Condition.getPage(query), wrapper);
+		pages.getRecords().forEach(record -> {
+			if (ObjectUtil.isNotEmpty(record.getFleetId())) {
+				CorpsDesc fleet = corpsDescMapper.selectById(record.getFleetId());
+				if (ObjectUtil.isNotEmpty(fleet)) {
+					record.setFleetName(fleet.getCname());
+				}
+			}
+			if (ObjectUtil.isNotEmpty(record.getDriverId())) {
+				LandDriver driver = landDriverMapper.selectById(record.getDriverId());
+				if (ObjectUtil.isNotEmpty(driver)) {
+					record.setDriverName(driver.getName());
+				}
+			}
+		});
+		return pages;
+	}
+
+	@Override
 	public boolean saveVehicle(LandVehicle vehicle) {
 		boolean temp = true;
 		if (ObjectUtil.isEmpty(vehicle.getId())) {
@@ -202,4 +242,26 @@ public class LandVehicleServiceImpl extends ServiceImpl<LandVehicleMapper, LandV
 		return R.success("ok");
 	}
 
+	@Override
+	public List<LandVehicle> remind() {
+		List<LandVehicle> vehicleList = baseMapper.selectList(new LambdaQueryWrapper<LandVehicle>()
+			.eq(LandVehicle::getTenantId, AuthUtil.getTenantId())
+			.eq(LandVehicle::getIsDeleted, 0)
+			.last("and (timestampdiff(DAY, now(), inspect_expired) < 60 or timestampdiff(DAY, now(), insurance_expired) < 60)")
+		);
+		vehicleList.forEach(vehicle -> {
+			if (ObjectUtil.isNotEmpty(vehicle.getFleetId())) {
+				CorpsDesc fleet = corpsDescMapper.selectById(vehicle.getFleetId());
+				vehicle.setFleetName(fleet.getCname());
+			}
+
+			if (ObjectUtil.isNotEmpty(vehicle.getDriverId())) {
+				LandDriver driver = landDriverMapper.selectById(vehicle.getDriverId());
+				vehicle.setDriverName(driver.getName());
+				vehicle.setTel(driver.getTel());
+			}
+		});
+		return vehicleList;
+	}
+
 }