陆运修改

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

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

@@ -61,6 +61,11 @@ public class OrderFee implements Serializable {
 	@ApiModelProperty(value = "客户ID")
 	private Long corpId;
 	/**
+	 * 车队ID
+	 */
+	@ApiModelProperty(value = "车队ID")
+	private Long fleetId;
+	/**
 	 * 费用ID
 	 */
 	@ApiModelProperty(value = "费用ID")

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

@@ -0,0 +1,14 @@
+package org.springblade.land.vo;
+
+import lombok.Data;
+
+@Data
+public class FeeSelectVO {
+
+	private Long fleetId;
+
+	private String fleetName;
+
+	private String fleetShortName;
+
+}

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

@@ -169,4 +169,20 @@ public class OrderFeeController extends BladeController {
 		return R.status(orderFeeService.cancelConfirm(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 获取车队下拉
+	 */
+	@GetMapping("/fleet")
+	public R fleet(Long orderId) {
+		return R.data(orderFeeService.fleet(orderId));
+	}
+
+	/**
+	 * 获取车牌号下拉
+	 */
+	@GetMapping("/plate-no")
+	public R plateNo(Long orderId, Long fleetId) {
+		return R.data(orderFeeService.plateNo(orderId, fleetId));
+	}
+
 }

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

@@ -282,12 +282,4 @@ public class OrderItemController extends BladeController {
 		return R.status(orderItemService.changeVehicle(orderItem));
 	}
 
-	/**
-	 * 获取车牌号下拉
-	 */
-	@GetMapping("/plate-no")
-	public R plateNo(Long orderId) {
-		return R.data(orderItemService.plateNo(orderId));
-	}
-
 }

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

@@ -16,10 +16,13 @@
  */
 package org.springblade.land.mapper;
 
-import org.springblade.land.entity.OrderFee;
-import org.springblade.land.vo.OrderFeeVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.land.entity.OrderFee;
+import org.springblade.land.vo.FeeSelectVO;
+import org.springblade.land.vo.OrderFeeVO;
+
 import java.util.List;
 
 /**
@@ -39,4 +42,12 @@ public interface OrderFeeMapper extends BaseMapper<OrderFee> {
 	 */
 	List<OrderFeeVO> selectOrderFeePage(IPage page, OrderFeeVO orderFee);
 
+	/**
+	 * 获取车队下拉
+	 *
+	 * @param orderId
+	 * @return
+	 */
+	List<FeeSelectVO> fleet(@Param("orderId") Long orderId);
+
 }

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

@@ -30,4 +30,17 @@
         select * from land_order_fee where is_deleted = 0
     </select>
 
+    <select id="fleet" resultType="org.springblade.land.vo.FeeSelectVO">
+        select distinct t1.fleet_id   as fleetId,
+                        t2.cname      as fleetName,
+                        t2.short_name as fleetShortName
+        from land_order_item t1
+                 left join basic_corps_desc t2 on t1.fleet_id = t2.id
+        <where>
+            t1.kind = 2
+            and t1.is_deleted = 0
+            <if test="orderId != null">and t1.order_id = #{orderId}</if>
+        </where>
+    </select>
+
 </mapper>

blade-service/blade-land/src/main/java/org/springblade/land/service/IOrderFeeService.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.client.entity.CommonFile;
 import org.springblade.land.entity.OrderFee;
+import org.springblade.land.vo.FeeSelectVO;
 import org.springblade.land.vo.OrderFeeVO;
 
 import java.util.List;
@@ -97,4 +98,21 @@ public interface IOrderFeeService extends IService<OrderFee> {
 	 */
 	boolean cancelConfirm(List<Long> idList);
 
+	/**
+	 * 获取车队下拉
+	 *
+	 * @param orderId
+	 * @return
+	 */
+	List<FeeSelectVO> fleet(Long orderId);
+
+	/**
+	 * 获取车牌号下拉
+	 *
+	 * @param orderId
+	 * @param fleetId
+	 * @return
+	 */
+	List<String> plateNo(Long orderId, Long fleetId);
+
 }

blade-service/blade-land/src/main/java/org/springblade/land/service/IOrderItemService.java

@@ -188,12 +188,4 @@ public interface IOrderItemService extends IService<OrderItem> {
 	 */
 	boolean changeVehicle(OrderItem orderItem);
 
-	/**
-	 * 获取车牌号下拉
-	 *
-	 * @param orderId
-	 * @return
-	 */
-	List<String> plateNo(Long orderId);
-
 }

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.land.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -32,8 +33,11 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.land.constant.LandConst;
 import org.springblade.land.entity.OrderFee;
+import org.springblade.land.entity.OrderItem;
 import org.springblade.land.mapper.OrderFeeMapper;
+import org.springblade.land.mapper.OrderItemMapper;
 import org.springblade.land.service.IOrderFeeService;
+import org.springblade.land.vo.FeeSelectVO;
 import org.springblade.land.vo.OrderFeeVO;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -42,6 +46,7 @@ import org.springframework.stereotype.Service;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 陆运订单费用表 服务实现类
@@ -53,6 +58,8 @@ import java.util.List;
 @AllArgsConstructor
 public class OrderFeeServiceImpl extends ServiceImpl<OrderFeeMapper, OrderFee> implements IOrderFeeService {
 
+	private final OrderItemMapper orderItemMapper;
+
 	private final ICommonFileClient commonFileClient;
 
 	private final ICorpsDescClient corpsDescClient;
@@ -165,4 +172,21 @@ public class OrderFeeServiceImpl extends ServiceImpl<OrderFeeMapper, OrderFee> i
 		return true;
 	}
 
+	@Override
+	public List<FeeSelectVO> fleet(Long orderId) {
+		return baseMapper.fleet(orderId);
+	}
+
+	@Override
+	public List<String> plateNo(Long orderId, Long fleetId) {
+		return orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
+			.select(OrderItem::getPlateNo)
+			.eq(ObjectUtil.isNotEmpty(orderId), OrderItem::getOrderId, orderId)
+			.eq(ObjectUtil.isNotEmpty(fleetId), OrderItem::getFleetId, fleetId)
+			.isNotNull(OrderItem::getPlateNo)
+			.eq(OrderItem::getKind, 2)
+			.eq(OrderItem::getIsDeleted, 0)
+		).stream().map(OrderItem::getPlateNo).distinct().collect(Collectors.toList());
+	}
+
 }

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

@@ -583,18 +583,6 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		return true;
 	}
 
-	@Override
-	public List<String> plateNo(Long orderId) {
-		return baseMapper.selectList(new LambdaQueryWrapper<OrderItem>()
-			.select(OrderItem::getPlateNo)
-			.eq(OrderItem::getOrderId, orderId)
-			.isNotNull(OrderItem::getPlateNo)
-			.eq(OrderItem::getTenantId, AuthUtil.getTenantId())
-			.eq(OrderItem::getKind, 2)
-			.eq(OrderItem::getIsDeleted, 0)
-		).stream().map(OrderItem::getPlateNo).distinct().collect(Collectors.toList());
-	}
-
 	/**
 	 * 添加变更记录
 	 *

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

@@ -414,7 +414,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			zero = itemList.stream().filter(item -> item.getStatus() == 0).count();
 			one = itemList.stream().filter(item -> item.getStatus() == 1).count();
 			two = itemList.stream().filter(item -> item.getStatus() == 2).count();
-			three = itemList.stream().filter(item -> item.getStatus() != 0 && item.getStatus() != 1 && item.getStatus() != 2 && item.getStatus() != 3).count();
+			three = itemList.stream().filter(item -> item.getStatus() != 0 && item.getStatus() != 1 && item.getStatus() != 2 && item.getStatus() != 4).count();
 			four = itemList.stream().filter(item -> item.getStatus() == 4).count();
 		}