陆运、办公用品修改

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

@@ -245,4 +245,7 @@ public class Order implements Serializable {
 	@TableField(exist = false)
 	private String endCrateTime;
 
+	@TableField(exist = false)
+	private String source;
+
 }

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

@@ -287,6 +287,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					record.setItemStatusDetail(statusDetail.substring(0, statusDetail.lastIndexOf(";")));
 				}
 			}
+
+			if (StringUtil.isNotBlank(order.getSource())) {
+				List<OrderAddress> orderAddressList = orderAddressMapper.selectList(new LambdaQueryWrapper<OrderAddress>()
+					.eq(OrderAddress::getOrderId, record.getId())
+					.eq(OrderAddress::getIsDeleted, 0)
+				);
+				record.setOrderAddressList(orderAddressList);
+			}
 		});
 		return pages;
 	}

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/HandoverServiceImpl.java

@@ -87,7 +87,8 @@ public class HandoverServiceImpl extends ServiceImpl<HandoverMapper, Handover> i
 				Handover::getHandoverDate, handover.getBeginHandoverDate(), handover.getEndHandoverDate())
 			.eq(ObjectUtil.isNotEmpty(handover.getCorpId()), Handover::getCorpId, handover.getCorpId())
 			.eq(Handover::getTenantId, AuthUtil.getTenantId())
-			.eq(Handover::getIsDeleted, 0);
+			.eq(Handover::getIsDeleted, 0)
+			.orderByDesc(Handover::getCreateTime);
 		return baseMapper.selectPage(Condition.getPage(query), leadsQueryWrapper);
 	}
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/ClaimServiceImpl.java

@@ -88,7 +88,8 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
 				Claim::getClaimDate, claim.getBeginClaimDate(), claim.getEndClaimDate())
 			.eq(ObjectUtil.isNotEmpty(claim.getUserId()), Claim::getUserId, claim.getUserId())
 			.eq(Claim::getTenantId, AuthUtil.getTenantId())
-			.eq(Claim::getIsDeleted, 0);
+			.eq(Claim::getIsDeleted, 0)
+			.orderByDesc(Claim::getCreateTime);
 		return baseMapper.selectPage(Condition.getPage(query), leadsQueryWrapper);
 	}
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/LeadsServiceImpl.java

@@ -87,7 +87,8 @@ public class LeadsServiceImpl extends ServiceImpl<LeadsMapper, Leads> implements
 			.eq(ObjectUtil.isNotEmpty(leads.getFromUser()), Leads::getFromUser, leads.getFromUser())
 			.eq(ObjectUtil.isNotEmpty(leads.getToUser()), Leads::getToUser, leads.getToUser())
 			.eq(Leads::getTenantId, AuthUtil.getTenantId())
-			.eq(Leads::getIsDeleted, 0);
+			.eq(Leads::getIsDeleted, 0)
+			.orderByDesc(Leads::getCreateTime);
 		IPage<Leads> pages = baseMapper.selectPage(Condition.getPage(query), leadsQueryWrapper);
 		pages.getRecords().forEach(record -> {
 			if (ObjectUtil.isNotEmpty(record.getFromUser())) {

blade-service/trade-purchase/src/main/java/com/trade/purchase/office/service/impl/OfficeOrderServiceImpl.java

@@ -110,7 +110,8 @@ public class OfficeOrderServiceImpl extends ServiceImpl<OrderMapper, Order> impl
 				Order::getStockTime, orderVO.getBeginStockTime(), orderVO.getEndStockTime())
 			.like(StringUtil.isNotBlank(orderVO.getSysNo()), Order::getSysNo, orderVO.getSysNo())
 			.eq(Order::getTenantId, AuthUtil.getTenantId())
-			.eq(Order::getIsDeleted, 0);
+			.eq(Order::getIsDeleted, 0)
+			.orderByDesc(Order::getCreateTime);
 
 		IPage<Order> orderPages = baseMapper.selectPage(Condition.getPage(query), orderQueryWrapper);
 		List<OrderVO> records = BeanUtil.copy(orderPages.getRecords(), OrderVO.class);
@@ -334,6 +335,9 @@ public class OfficeOrderServiceImpl extends ServiceImpl<OrderMapper, Order> impl
 			order.setSrcId(id);
 			order.setBillType("ORK");
 			order.setTradeType("ORK");
+			order.setStockUser(order.getApplyUser());
+			order.setStockDept(order.getApplyDept());
+			order.setStockTime(order.getApplyTime());
 			baseMapper.insert(order);
 
 			itemList.forEach(item -> {