陆运修改

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ICommonFileClient.java

@@ -7,6 +7,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -19,7 +20,7 @@ public interface ICommonFileClient {
 	String SAVE_LIST = API_PREFIX + "/save-list";
 
 	@GetMapping(GET_LIST)
-	R<List<CommonFile>> getList(Long pid, String source);
+	R<List<CommonFile>> getList(@RequestParam("pid") Long pid, @RequestParam("source") String source);
 
 	@PostMapping(SAVE_LIST)
 	R saveList(@RequestBody List<CommonFile> fileList);

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ILandDriverClient.java

@@ -1,5 +1,6 @@
 package org.springblade.client.feign;
 
+import org.springblade.client.entity.LandDriver;
 import org.springblade.common.constant.LauncherConstant;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -11,8 +12,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface ILandDriverClient {
 	String API_PREFIX = "/client";
 	String GET_DRIVER_ID = API_PREFIX + "/getDriverId";
+	String GET_DRIVER = API_PREFIX + "/getDriverId";
 
 	@GetMapping(GET_DRIVER_ID)
 	Long getDriverId(@RequestParam("userId") Long userId);
 
+	@GetMapping(GET_DRIVER)
+	LandDriver getDriver(@RequestParam("id") Long id);
+
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ILandVehicleClient.java

@@ -1,19 +0,0 @@
-package org.springblade.client.feign;
-
-import org.springblade.client.entity.LandVehicle;
-import org.springblade.common.constant.LauncherConstant;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(
-	value = LauncherConstant.APPLICATION_CLIENT_NAME
-)
-public interface ILandVehicleClient {
-	String API_PREFIX = "/client";
-	String GET_VEHICLE = API_PREFIX + "/getVehicle";
-
-	@GetMapping(GET_VEHICLE)
-	LandVehicle getVehicle(@RequestParam("id") Long id);
-
-}

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

@@ -55,6 +55,16 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "订单号")
 	private String orderNo;
 	/**
+	 * 业务类型
+	 */
+	@ApiModelProperty(value = "业务类型")
+	private String businessType;
+	/**
+	 * 运输方式
+	 */
+	@ApiModelProperty(value = "运输方式")
+	private String shippingMode;
+	/**
 	 * 客户ID
 	 */
 	@ApiModelProperty(value = "客户ID")

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

@@ -28,7 +28,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 陆运订单明细表实体类
@@ -115,7 +114,7 @@ public class OrderItem implements Serializable {
 	@ApiModelProperty(value = "手机号")
 	private String tel;
 	/**
-	 * 货车ID
+	 * 车辆ID
 	 */
 	@ApiModelProperty(value = "车辆ID")
 	private Long vehicleId;
@@ -145,6 +144,115 @@ public class OrderItem implements Serializable {
 	@ApiModelProperty(value = "备注")
 	private String driverRemarks;
 	/**
+	 * 应收一
+	 */
+	@ApiModelProperty(value = "应收一")
+	private String oneFeeD;
+	/**
+	 * 应收二
+	 */
+	@ApiModelProperty(value = "应收二")
+	private String twoFeeD;
+	/**
+	 * 应收三
+	 */
+	@ApiModelProperty(value = "应收三")
+	private String threeFeeD;
+	/**
+	 * 应收四
+	 */
+	@ApiModelProperty(value = "应收四")
+	private String fourFeeD;
+	/**
+	 * 应收五
+	 */
+	@ApiModelProperty(value = "应收五")
+	private String fiveFeeD;
+	/**
+	 * 应收费用备注
+	 */
+	@ApiModelProperty(value = "应收费用备注")
+	private String feeRemarksD;
+	/**
+	 * 应付一
+	 */
+	@ApiModelProperty(value = "应付一")
+	private String oneFeeC;
+	/**
+	 * 应付二
+	 */
+	@ApiModelProperty(value = "应付二")
+	private String twoFeeC;
+	/**
+	 * 应付三
+	 */
+	@ApiModelProperty(value = "应付三")
+	private String threeFeeC;
+	/**
+	 * 应付四
+	 */
+	@ApiModelProperty(value = "应付四")
+	private String fourFeeC;
+	/**
+	 * 应付五
+	 */
+	@ApiModelProperty(value = "应付五")
+	private String fiveFeeC;
+	/**
+	 * 应付费用备注
+	 */
+	@ApiModelProperty(value = "应付费用备注")
+	private String feeRemarksC;
+	/**
+	 * 委托时间
+	 */
+	@ApiModelProperty(value = "委托时间")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date entrustTime;
+	/**
+	 * 调度时间
+	 */
+	@ApiModelProperty(value = "调度时间")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date dispatchTime;
+	/**
+	 * 派车时间
+	 */
+	@ApiModelProperty(value = "派车时间")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date sendTime;
+	/**
+	 * 受理时间
+	 */
+	@ApiModelProperty(value = "受理时间")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date acceptTime;
+	/**
+	 * 提箱时间
+	 */
+	@ApiModelProperty(value = "提箱时间")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date borrowTime;
+	/**
+	 * 还箱时间
+	 */
+	@ApiModelProperty(value = "还箱时间")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date returnTime;
+	/**
+	 * 完工时间
+	 */
+	@ApiModelProperty(value = "完工时间")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date finishedTime;
+	/**
 	 * 租户
 	 */
 	@ApiModelProperty(value = "租户")

blade-service/blade-client/src/main/java/org/springblade/client/common/controller/CommonFileController.java

@@ -79,7 +79,7 @@ public class CommonFileController extends BladeController {
 	@GetMapping("/get-list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入commonFile")
-	public R<List<CommonFile>> getList(Long pid, String source) {
+	public R<List<CommonFile>> getList(@RequestParam("pid") Long pid, @RequestParam("source") String source) {
 		return R.data(commonFileService.list(new LambdaQueryWrapper<CommonFile>()
 			.eq(CommonFile::getPid, pid)
 			.eq(CommonFile::getSource, source)

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

@@ -26,4 +26,9 @@ public class LandDriverClient implements ILandDriverClient {
 			.eq(LandDriver::getIsDeleted, 0)
 		).getId();
 	}
+
+	@Override
+	public LandDriver getDriver(Long id) {
+		return landDriverService.getById(id);
+	}
 }

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

@@ -1,45 +0,0 @@
-package org.springblade.client.land.feign;
-
-import lombok.AllArgsConstructor;
-import org.springblade.client.corps.service.ICorpsDescService;
-import org.springblade.client.entity.CorpsDesc;
-import org.springblade.client.entity.LandDriver;
-import org.springblade.client.entity.LandVehicle;
-import org.springblade.client.feign.ILandVehicleClient;
-import org.springblade.client.land.service.ILandDriverService;
-import org.springblade.client.land.service.ILandVehicleService;
-import org.springblade.core.tenant.annotation.NonDS;
-import org.springblade.core.tool.utils.ObjectUtil;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-@NonDS
-@ApiIgnore()
-@RestController
-@AllArgsConstructor
-public class LandVehicleClient implements ILandVehicleClient {
-
-	private final ILandVehicleService landVehicleService;
-
-	private final ICorpsDescService corpsDescService;
-
-	private final ILandDriverService landDriverService;
-
-	@Override
-	@GetMapping(GET_VEHICLE)
-	public LandVehicle getVehicle(Long id) {
-		LandVehicle vehicle = landVehicleService.getById(id);
-		if (ObjectUtil.isNotEmpty(vehicle.getFleetId())) {
-			CorpsDesc fleet = corpsDescService.getById(vehicle.getFleetId());
-			vehicle.setFleetName(fleet.getCname());
-		}
-
-		if (ObjectUtil.isNotEmpty(vehicle.getDriverId())) {
-			LandDriver driver = landDriverService.getById(vehicle.getDriverId());
-			vehicle.setDriverName(driver.getName());
-			vehicle.setTel(driver.getTel());
-		}
-		return vehicle;
-	}
-}

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

@@ -22,12 +22,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
-import org.springblade.client.constant.LandConstant;
 import org.springblade.client.entity.CorpsDesc;
-import org.springblade.client.entity.LandVehicle;
+import org.springblade.client.entity.LandDriver;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.ILandDriverClient;
-import org.springblade.client.feign.ILandVehicleClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -36,7 +34,6 @@ import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.land.entity.Order;
-import org.springblade.land.entity.OrderAddress;
 import org.springblade.land.entity.OrderChange;
 import org.springblade.land.entity.OrderItem;
 import org.springblade.land.mapper.OrderChangeMapper;
@@ -68,8 +65,6 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 
 	private final ILandDriverClient landDriverClient;
 
-	private final ILandVehicleClient landVehicleClient;
-
 	@Override
 	public IPage<OrderItemVO> selectOrderItemPage(IPage<OrderItemVO> page, OrderItemVO orderItem) {
 		return page.setRecords(baseMapper.selectOrderItemPage(page, orderItem));
@@ -77,8 +72,6 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 
 	@Override
 	public IPage<OrderItem> getList(OrderItem orderItem, Query query) {
-		String role = AuthUtil.getUserRole();
-
 		List<Long> orderIdList = Collections.emptyList();
 		if (StringUtil.isNotBlank(orderItem.getBillNo()) || StringUtil.isNotBlank(orderItem.getGoods()) || StringUtil.isNotBlank(orderItem.getBelongCompany()) || StringUtil.isNotBlank(orderItem.getStation()) || StringUtil.isNotBlank(orderItem.getFactory())) {
 			orderIdList = orderMapper.selectList(new LambdaQueryWrapper<Order>()
@@ -106,19 +99,6 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 			itemQueryWrapper.notIn(OrderItem::getStatus, 0);
 		}
 
-		if (role.contains(LandConstant.FLEET_ROLE)) {
-			if (role.contains(LandConstant.LAND_OPERATOR)) {
-				Long fleetId = corpsDescClient.getFleetId(AuthUtil.getUserId());
-				itemQueryWrapper.eq(OrderItem::getFleetId, fleetId);
-			}
-		}
-		if (role.contains(LandConstant.DRIVER_ROLE)) {
-			if (role.contains(LandConstant.LAND_OPERATOR)) {
-				Long driverId = landDriverClient.getDriverId(AuthUtil.getUserId());
-				itemQueryWrapper.eq(OrderItem::getDriverId, driverId);
-			}
-		}
-
 		itemQueryWrapper.in(CollectionUtil.isNotEmpty(orderIdList), OrderItem::getOrderId, orderIdList)
 			.like(StringUtil.isNotBlank(orderItem.getTel()), OrderItem::getTel, orderItem.getTel())
 			.like(StringUtil.isNotBlank(orderItem.getCtnNo()), OrderItem::getCtnNo, orderItem.getCtnNo())
@@ -149,10 +129,9 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 				}
 			}
 
-			if (ObjectUtil.isNotEmpty(record.getVehicleId())) {
-				LandVehicle vehicle = landVehicleClient.getVehicle(record.getVehicleId());
-				record.setPlateNo(vehicle.getPlateNo());
-				record.setDriverName(vehicle.getDriverName());
+			if (ObjectUtil.isNotEmpty(record.getDriverId())) {
+				LandDriver driver = landDriverClient.getDriver(record.getDriverId());
+				record.setDriverName(driver.getName());
 			}
 		});
 		return pages;
@@ -160,8 +139,6 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 
 	@Override
 	public Map<String, Object> getCount(OrderItem orderItem) {
-		String role = AuthUtil.getUserRole();
-
 		LambdaQueryWrapper<OrderItem> itemQueryWrapper = new LambdaQueryWrapper<>();
 		if (orderItem.getTag() == 4) {
 			itemQueryWrapper.notIn(OrderItem::getStatus, 0, 1);
@@ -169,18 +146,6 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 			itemQueryWrapper.notIn(OrderItem::getStatus, 0);
 		}
 
-		if (role.contains(LandConstant.FLEET_ROLE)) {
-			if (role.contains(LandConstant.LAND_OPERATOR)) {
-				Long fleetId = corpsDescClient.getFleetId(AuthUtil.getUserId());
-				itemQueryWrapper.eq(OrderItem::getFleetId, fleetId);
-			}
-		}
-		if (role.contains(LandConstant.DRIVER_ROLE)) {
-			if (role.contains(LandConstant.LAND_OPERATOR)) {
-				Long driverId = landDriverClient.getDriverId(AuthUtil.getUserId());
-				itemQueryWrapper.eq(OrderItem::getDriverId, driverId);
-			}
-		}
 		itemQueryWrapper.eq(OrderItem::getKind, 2)
 			.eq(OrderItem::getTenantId, AuthUtil.getTenantId())
 			.eq(OrderItem::getIsDeleted, 0);
@@ -218,6 +183,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		item.setId(orderItem.getId());
 		item.setFleetId(orderItem.getFleetId());
 		item.setStatus(1);
+		item.setDispatchTime(new Date());
 		item.setUpdateUser(AuthUtil.getUserId());
 		item.setUpdateTime(new Date());
 		baseMapper.updateById(item);
@@ -239,11 +205,12 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		baseMapper.update(null, new LambdaUpdateWrapper<OrderItem>()
 			.set(OrderItem::getFleetId, null)
 			.set(OrderItem::getStatus, 0)
+			.set(OrderItem::getDispatchTime, null)
 			.set(OrderItem::getUpdateUser, AuthUtil.getUserId())
 			.set(OrderItem::getUpdateTime, new Date())
 			.eq(OrderItem::getId, id));
 
-		removeChange(id, 1);
+		addChange(baseMapper.selectById(id), -1);
 
 		OrderItem data = baseMapper.selectById(id);
 
@@ -269,10 +236,12 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		OrderItem item = new OrderItem();
 		item.setId(orderItem.getId());
 		item.setVehicleId(orderItem.getVehicleId());
+		item.setPlateNo(orderItem.getPlateNo());
 		item.setDriverId(orderItem.getDriverId());
 		item.setTel(orderItem.getTel());
 		item.setFleetRemarks(orderItem.getFleetRemarks());
 		item.setStatus(2);
+		item.setSendTime(new Date());
 		item.setUpdateUser(AuthUtil.getUserId());
 		item.setUpdateTime(new Date());
 		baseMapper.updateById(item);
@@ -286,15 +255,17 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 	public boolean cancelSend(Long id) {
 		baseMapper.update(null, new LambdaUpdateWrapper<OrderItem>()
 			.set(OrderItem::getVehicleId, null)
+			.set(OrderItem::getPlateNo, null)
 			.set(OrderItem::getDriverId, null)
 			.set(OrderItem::getTel, null)
 			.set(OrderItem::getFleetRemarks, null)
 			.set(OrderItem::getStatus, 1)
+			.set(OrderItem::getSendTime, null)
 			.set(OrderItem::getUpdateUser, AuthUtil.getUserId())
 			.set(OrderItem::getUpdateTime, new Date())
 			.eq(OrderItem::getId, id));
 
-		removeChange(id, 2);
+		addChange(baseMapper.selectById(id), -2);
 		return true;
 	}
 
@@ -306,6 +277,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		item.setStatus(3);
 		item.setDriverRemarks(orderItem.getDriverRemarks());
 		item.setCtnNo(orderItem.getCtnNo());
+		item.setAcceptTime(new Date());
 		item.setUpdateUser(AuthUtil.getUserId());
 		item.setUpdateTime(new Date());
 		baseMapper.updateById(item);
@@ -321,11 +293,12 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 			.set(OrderItem::getCtnNo, null)
 			.set(OrderItem::getDriverRemarks, null)
 			.set(OrderItem::getStatus, 2)
+			.set(OrderItem::getAcceptTime, null)
 			.set(OrderItem::getUpdateUser, AuthUtil.getUserId())
 			.set(OrderItem::getUpdateTime, new Date())
 			.eq(OrderItem::getId, id));
 
-		removeChange(id, 3);
+		addChange(baseMapper.selectById(id), -3);
 		return true;
 	}
 
@@ -335,6 +308,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		OrderItem item = new OrderItem();
 		item.setId(id);
 		item.setStatus(4);
+		item.setFinishedTime(new Date());
 		item.setUpdateUser(AuthUtil.getUserId());
 		item.setUpdateTime(new Date());
 		baseMapper.updateById(item);
@@ -354,11 +328,4 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		orderChangeMapper.insert(change);
 	}
 
-	private void removeChange(Long id, Integer status) {
-		orderChangeMapper.delete(new LambdaQueryWrapper<OrderChange>()
-			.eq(OrderChange::getItemId, id)
-			.eq(OrderChange::getStatus, status)
-		);
-	}
-
 }

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

@@ -26,11 +26,11 @@ import org.springblade.client.constant.LandConstant;
 import org.springblade.client.entity.CommonFile;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.FeesDesc;
-import org.springblade.client.entity.LandVehicle;
+import org.springblade.client.entity.LandDriver;
 import org.springblade.client.feign.ICommonFileClient;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IFeesDescClient;
-import org.springblade.client.feign.ILandVehicleClient;
+import org.springblade.client.feign.ILandDriverClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -69,7 +69,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	private final ICorpsDescClient corpsDescClient;
 
-	private final ILandVehicleClient landVehicleClient;
+	private final ILandDriverClient landDriverClient;
 
 	private final IFeesDescClient feesDescClient;
 
@@ -107,11 +107,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			}
 
-			if (ObjectUtil.isNotEmpty(orderItem.getVehicleId())) {
-				LandVehicle vehicle = landVehicleClient.getVehicle(orderItem.getVehicleId());
-				orderItem.setPlateNo(vehicle.getPlateNo());
-				orderItem.setDriverName(vehicle.getDriverName());
-				orderItem.setTel(vehicle.getTel());
+			if (ObjectUtil.isNotEmpty(orderItem.getDriverId())) {
+				LandDriver driver = landDriverClient.getDriver(orderItem.getDriverId());
+				orderItem.setDriverName(driver.getName());
 			}
 		});
 		detail.setOrderItemList(orderItemList);
@@ -145,14 +143,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		R<List<CommonFile>> fileList = commonFileClient.getList(order.getId(), LandConstant.ORDER);
 		if (fileList.isSuccess() && fileList.getData() != null) {
 			detail.setFileList(fileList.getData());
+		} else {
+			detail.setFileList(Collections.emptyList());
 		}
 		return detail;
 	}
 
 	@Override
 	public IPage<Order> getList(Order order, Query query) {
-		String role = AuthUtil.getUserRole();
-
 		LambdaQueryWrapper<Order> orderQueryWrapper = new LambdaQueryWrapper<>();
 
 		Integer itemStatus = order.getItemStatus();
@@ -189,17 +187,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 		if (order.getKind() == 1) {
 			orderQueryWrapper.orderByDesc(Order::getCreateTime);
-			if (role.contains(LandConstant.CORP_ROLE)) {
-				if (role.contains(LandConstant.LAND_OPERATOR)) {
-					orderQueryWrapper.eq(Order::getCreateUser, AuthUtil.getUserId());
-				}
-			}
 		} else if (order.getKind() == 2) {
 			orderQueryWrapper.orderByDesc(Order::getUpdateTime);
-			orderQueryWrapper.eq(Order::getStatus, 1);
-			if (role.contains(LandConstant.LAND_OPERATOR)) {
-				orderQueryWrapper.like(Order::getAdminProfiles, AuthUtil.getUserId());
-			}
 		}
 
 		IPage<Order> pages = baseMapper.selectPage(Condition.getPage(query), orderQueryWrapper);
@@ -306,20 +295,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		long three = 0;
 		long four = 0;
 
-		String role = AuthUtil.getUserRole();
-
 		List<Long> orderIdList;
 		LambdaQueryWrapper<Order> orderQueryWrapper = new LambdaQueryWrapper<>();
 		orderQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId())
 			.eq(Order::getIsDeleted, 0);
 
 		if (order.getKind() == 1) {
-			if (role.contains(LandConstant.CORP_ROLE)) {
-				if (role.contains(LandConstant.LAND_OPERATOR)) {
-					orderQueryWrapper.eq(Order::getCreateUser, AuthUtil.getUserId());
-				}
-			}
-
 			orderIdList = baseMapper.selectList(orderQueryWrapper).stream().filter(orderTemp -> orderTemp.getStatus() == 0).map(Order::getId).collect(Collectors.toList());
 			if (CollectionUtil.isNotEmpty(orderIdList)) {
 				List<OrderItem> itemList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
@@ -329,10 +310,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 				last += itemList.stream().mapToInt(OrderItem::getCtnQuantity).sum();
 			}
-		} else if (order.getKind() == 2) {
-			if (role.contains(LandConstant.LAND_OPERATOR)) {
-				orderQueryWrapper.like(Order::getAdminProfiles, AuthUtil.getUserId());
-			}
 		}
 
 		orderIdList = baseMapper.selectList(orderQueryWrapper).stream().filter(orderTemp -> orderTemp.getStatus() == 1).map(Order::getId).collect(Collectors.toList());
@@ -470,6 +447,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				childItem.setCtnQuantity(1);
 				childItem.setLandWeight(landWeight);
 				childItem.setKind(2);
+				childItem.setEntrustTime(new Date());
 				childItem.setCreateUser(AuthUtil.getUserId());
 				childItem.setCreateTime(new Date());
 				orderItemMapper.insert(childItem);