陆运增加车辆归属

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/LandVehicle.java

@@ -240,6 +240,13 @@ public class LandVehicle implements Serializable {
 	@ApiModelProperty(value = "过户日期")
 	private Date transferDate;
 
+	/**
+	 * 是否自有
+	 * 0否
+	 * 1是
+	 */
+	private Integer owned;
+
 	@TableField(exist = false)
 	private List<CommonFile> fileList;
 

blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/OrderItem.java

@@ -513,4 +513,11 @@ public class OrderItem implements Serializable {
 	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Date reconciliationDateC;
 
+	/**
+	 * 是否自有
+	 * 0否
+	 * 1是
+	 */
+	private Integer owned;
+
 }

blade-service-api/blade-land-api/src/main/java/org/springblade/land/vo/OrderAcctVO.java

@@ -122,4 +122,9 @@ public class OrderAcctVO {
 	//揽货员
 	private String pickUpGoodsUserName;
 
+	/**
+	 * 车辆归属
+	 */
+	private Integer vehicleOwned;
+
 }

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

@@ -72,6 +72,7 @@ public class LandVehicleServiceImpl extends ServiceImpl<LandVehicleMapper, LandV
 		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())
+			.eq(ObjectUtil.isNotEmpty(vehicle.getOwned()), LandVehicle::getOwned, vehicle.getOwned())
 			.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())

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderMapper.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--suppress ALL -->
 <mapper namespace="org.springblade.land.mapper.OrderMapper">
 
     <!-- 通用查询映射结果 -->
@@ -83,6 +84,7 @@
             ELSE
             t1.plate_no
             END) as plate_no,
+            t2.owned as vehicleOwned,
             sum(t2.land_amount_c) as landAmountC,
             sum(t2.land_amount_d) as landAmountD,
             t2.confirm_status as confirmStatus,
@@ -139,6 +141,7 @@
             <if test="acct.salesman != null">and t1.salesman = #{acct.salesman}</if>
             <if test="acct.dispatcher != null">and t1.dispatcher = #{acct.dispatcher}</if>
             <if test="acct.dispatchDept != null">and t1.dispatchDept = #{acct.dispatchDept}</if>
+            <if test="acct.vehicleOwned != null">and t2.owned = #{acct.vehicleOwned}</if>
             <if test="acct.salesmanDeptList != null">and t1.salesman_dept in
                 <foreach item="dept" collection="acct.salesmanDeptList" open="(" separator="," close=")">
                     #{dept}

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

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.land.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -26,14 +10,8 @@ import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
 import org.springblade.client.constant.LandConstant;
-import org.springblade.client.entity.CommonFile;
-import org.springblade.client.entity.CorpsDesc;
-import org.springblade.client.entity.LandDriver;
-import org.springblade.client.entity.Message;
-import org.springblade.client.feign.ICommonFileClient;
-import org.springblade.client.feign.ICorpsDescClient;
-import org.springblade.client.feign.ILandDriverClient;
-import org.springblade.client.feign.IMessageClient;
+import org.springblade.client.entity.*;
+import org.springblade.client.feign.*;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -51,7 +29,6 @@ import org.springblade.land.mapper.OrderChangeMapper;
 import org.springblade.land.mapper.OrderItemMapper;
 import org.springblade.land.mapper.OrderMapper;
 import org.springblade.land.service.IOrderItemService;
-import org.springblade.land.service.IOrderService;
 import org.springblade.land.util.MessageUtil;
 import org.springblade.land.vo.OrderItemVO;
 import org.springblade.system.entity.Dept;
@@ -96,7 +73,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 
 	private final IUserSearchClient userSearchClient;
 
-	private final IOrderService orderService;
+	private final ILandVehicleClient landVehicleClient;
 
 	@Override
 	public IPage<OrderItemVO> selectOrderItemPage(IPage<OrderItemVO> page, OrderItemVO orderItem) {
@@ -357,6 +334,10 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		item.setSendTime(new Date());
 		item.setUpdateUser(AuthUtil.getUserId());
 		item.setUpdateTime(new Date());
+		if (StringUtils.isNotBlank(orderItem.getPlateNo())) {
+			LandVehicle vehicle = landVehicleClient.selectByPlateNo(orderItem.getPlateNo());
+			item.setOwned(Objects.nonNull(vehicle) ? vehicle.getOwned() : 0);
+		}
 		baseMapper.updateById(item);
 
 		addChange(orderItem.getId(), "派车", 1);