2022年9月29日 18:06

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

@@ -223,6 +223,11 @@ public class LandVehicle implements Serializable {
 	 */
 	@ApiModelProperty(value = "是否已删除（0-否、1-是）")
 	private Integer isDeleted;
+	/**
+	 * 位置获取来源
+	 */
+	@ApiModelProperty(value = "位置获取来源")
+	private String locationSource;
 
 	@TableField(exist = false)
 	private List<CommonFile> fileList;

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/extra/entity/Claim.java

@@ -33,12 +33,12 @@ import java.util.List;
 
 /**
  * 费用报销表实体类
- *
+ * expense_claim
  * @author BladeX
  * @since 2022-04-08
  */
 @Data
-@TableName("expense_claim")
+@TableName("/claim/list")
 @ApiModel(value = "Claim对象", description = "费用报销表")
 public class Claim implements Serializable {
 

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/BasicCorpsProfitChangeController.java

@@ -77,6 +77,8 @@ public class BasicCorpsProfitChangeController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicCorpsProfitChange")
 	public R<IPage<BasicCorpsProfitChange>> list(BasicCorpsProfitChange basicCorpsProfitChange, Query query) {
+		//basicCorpsProfitChange.setTenantId(AuthUtil.getTenantId());
+		basicCorpsProfitChange.setIsDeleted(0);
 		IPage<BasicCorpsProfitChange> pages = basicCorpsProfitChangeService.page(Condition.getPage(query), Condition.getQueryWrapper(basicCorpsProfitChange));
 		return R.data(pages);
 	}

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -85,7 +85,6 @@ public class CorpsDescController extends BladeController {
 		IPage<CorpsDescVO> pages = corpsDescService.selectCorpsDescPage(Condition.getPage(query), corpsDesc);
 
 		String belongtocompany = "";//所属公司ids
-
 		for (CorpsDescVO descVO: pages.getRecords()){
 			if (ObjectUtil.isNotEmpty(descVO.getBelongtocompany())){
 				belongtocompany = belongtocompany + descVO.getBelongtocompany() + ",";

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsDescMapper.xml

@@ -69,7 +69,7 @@
             and code like CONCAT(CONCAT('%', #{CorpsDesc.code}), '%')
         </if>
         <if test="CorpsDesc.corpType!=null and CorpsDesc.corpType != '' and CorpsDesc.corpType != 'KG'">
-            and corp_type like CONCAT('%', #{CorpsDesc.corpType}, '%')
+            and corp_type like CONCAT(CONCAT('%', #{CorpsDesc.corpType}), '%')
         </if>
         <if test="CorpsDesc.corpType!=null and CorpsDesc.corpType != '' and CorpsDesc.corpType == 'KG'">
             and (corp_type like '%KH%' or corp_type like '%GYS%')
@@ -190,6 +190,7 @@
             </foreach>
             )
         </if>
+        ORDER BY cname ASC
     </select>
     <select id="selectShippingCompany" resultMap="corpsDescResultMap">
         SELECT * FROM basic_corps_desc

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsDescServiceImpl.java

@@ -90,6 +90,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 				corpsDesc.setTypeList(corpsTypeIdList);
 			}
 		}
+		corpsDesc.setTenantId(AuthUtil.getTenantId());
 		return page.setRecords(baseMapper.selectCorpsDescPage(page, corpsDesc));
 	}
 

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

@@ -166,18 +166,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					detail.setDispatchDeptName(dept.getData());
 				}
 			}
-			/*if (!ObjectUtil.isEmpty(detail.getAgentId())) {
-				R<CorpsDesc> agent = corpsDescClient.getCorpMessage(detail.getAgentId());
-				if (agent.isSuccess() && agent.getData() != null) {
-					detail.setAgentName(agent.getData().getCname());
-				}
-			}
-			if (!ObjectUtil.isEmpty(detail.getPodId())) {
-				BasicPortDesc pod = portClient.getPort(detail.getPodId());
-				if (pod != null) {
-					detail.setPodName(pod.getName());
-				}
-			}*/
 		} else {
 			List<OrderFee> orderFeeList = orderFeeMapper.selectList(new LambdaQueryWrapper<OrderFee>()
 				.eq(OrderFee::getOrderId, order.getId())
@@ -258,37 +246,59 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 
 		IPage<Order> pages = baseMapper.selectPage(Condition.getPage(query), orderQueryWrapper);
+		String corpIds = "";//客户
+		String createUserIds = "";//创建人
+		String salesmanIds = "";//业务员
+		String dispatcherIds = "";//调度员
+		String dispatchDeptIds = "";//调度部门
+		for (Order orderOne : pages.getRecords()){
+			if (ObjectUtil.isNotEmpty(orderOne.getCorpId())){
+				corpIds = corpIds + orderOne.getCorpId() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orderOne.getCreateUser())){
+				createUserIds = createUserIds + orderOne.getCreateUser() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orderOne.getSalesman())){
+				salesmanIds = salesmanIds + orderOne.getSalesman() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orderOne.getDispatcher())){
+				dispatcherIds = dispatcherIds + orderOne.getDispatcher() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orderOne.getDispatchDept())){
+				dispatchDeptIds = dispatchDeptIds + orderOne.getDispatchDept() + ",";
+			}
+		}
+		List<CorpsDesc> corpsList = corpsDescClient.selectByCorpIds(corpIds);
+		List<User> createUserList = userClient.selectUserIds(createUserIds);
+		List<User> salesmanList = userClient.selectUserIds(salesmanIds);
+		List<User> dispatcherList = userClient.selectUserIds(dispatcherIds);
+		R<List<Dept>> dispatchDeptList = sysClient.selectByDeptIds(dispatchDeptIds);
 		pages.getRecords().forEach(record -> {
 			if (!ObjectUtil.isEmpty(record.getCorpId())) {
-				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(record.getCorpId());
-				if (corpMessage.isSuccess() && corpMessage.getData() != null) {
-					record.setCorpName(corpMessage.getData().getCname());
-					record.setCorpShortName(corpMessage.getData().getShortName());
+				if (ObjectUtil.isNotEmpty(corpsList)){
+					record.setCorpName(corpsList.stream().filter(e -> e.getId().equals(record.getCorpId())).findFirst().get().getCname());
+					record.setCorpShortName(corpsList.stream().filter(e -> e.getId().equals(record.getCorpId())).findFirst().get().getShortName());
 				}
 			}
 
 			if (!ObjectUtil.isEmpty(record.getCreateUser())) {
-				R<User> user = userClient.userInfoById(record.getCreateUser());
-				if (user.isSuccess() && user.getData() != null) {
-					record.setCreateUserName(user.getData().getRealName());
+				if (ObjectUtil.isNotEmpty(createUserList)){
+					record.setCreateUserName(createUserList.stream().filter(e -> e.getId().equals(record.getCreateUser())).findFirst().get().getRealName());
 				}
 			}
 			if (!ObjectUtil.isEmpty(record.getSalesman())) {
-				R<User> user = userClient.userInfoById(record.getSalesman());
-				if (user.isSuccess() && user.getData() != null) {
-					record.setSalesmanName(user.getData().getRealName());
+				if (ObjectUtil.isNotEmpty(salesmanList)){
+					record.setSalesmanName(salesmanList.stream().filter(e -> e.getId().equals(record.getSalesman())).findFirst().get().getRealName());
 				}
 			}
 			if (!ObjectUtil.isEmpty(record.getDispatcher())) {
-				R<User> user = userClient.userInfoById(record.getDispatcher());
-				if (user.isSuccess() && user.getData() != null) {
-					record.setDispatcherName(user.getData().getRealName());
+				if (ObjectUtil.isNotEmpty(dispatcherList)){
+					record.setDispatcherName(dispatcherList.stream().filter(e -> e.getId().equals(record.getDispatcher())).findFirst().get().getRealName());
 				}
 			}
 			if (!ObjectUtil.isEmpty(record.getDispatchDept())) {
-				R<String> dept = sysClient.getDeptName(record.getDispatchDept());
-				if (dept.isSuccess() && dept.getData() != null) {
-					record.setDispatchDeptName(dept.getData());
+				if (ObjectUtil.isNotEmpty(dispatchDeptList)) {
+					record.setDispatchDeptName(dispatchDeptList.getData().stream().filter(e -> e.getId().equals(record.getDispatchDept())).findFirst().get().getDeptName());
 				}
 			}
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -514,7 +514,32 @@ public class OrderController extends BladeController {
 		Page<OrderStatisticAnalysisVO> iPage = new Page(query.getCurrent(), query.getSize());
 		IPage<OrderStatisticAnalysisVO> orderStatisticAnalysisVOIPage = orderService.listOrderStatisticAnalysis(iPage, AuthUtil.getTenantId(), order.getOrderNo(), order.getStartTime(), order.getEndTime());
 		List<OrderStatisticAnalysisVO> records = orderStatisticAnalysisVOIPage.getRecords();
+		//调用-费用微服务-获取关税设置详情
+		R<FeesDesc> customDuty = feesDescClient.getFeesByName("关税");
+		//调用-费用微服务-获取物流费设置详情
+		R<FeesDesc> deliver = feesDescClient.getFeesByName("物流费");
+		//调用-费用微服务-获取配额设置详情
+		R<FeesDesc> quota = feesDescClient.getFeesByName("配额");
+		//调用-费用微服务-获取增值税设置详情
+		R<FeesDesc> GST = feesDescClient.getFeesByName("增值税");
 		if (CollectionUtils.isNotEmpty(records)) {
+			String corpIds = "";//供应商
+			String saleCorpIds = "";//客户
+			String createUserIds = "";//业务员
+			for (OrderStatisticAnalysisVO vo : records){
+				if (ObjectUtil.isNotEmpty(vo.getCorpId())){
+					corpIds = corpIds + vo.getCorpId() + ",";
+				}
+				if (ObjectUtil.isNotEmpty(vo.getSaleCorpId())){
+					saleCorpIds = saleCorpIds + vo.getSaleCorpId() + ",";
+				}
+				if (ObjectUtil.isNotEmpty(vo.getCreateUser())){
+					createUserIds = createUserIds + vo.getCreateUser() + ",";
+				}
+			}
+			List<CorpsDesc> corpsList = corpsDescClient.selectByCorpIds(corpIds);
+			List<CorpsDesc> saleCorpList = corpsDescClient.selectByCorpIds(saleCorpIds);
+			List<User> createUserList = userClient.selectUserIds(createUserIds);
 			records.forEach(e -> {
 				Long orderId = e.getOrderId();
 				//采购主表信息
@@ -526,13 +551,12 @@ public class OrderController extends BladeController {
 				Order service = orderService.getOne(orderLambdaQueryWrapper);
 				//供应商名称
 				if (e.getCorpId() != null) {
-					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(e.getCorpId());
-					if (corpMessage.isSuccess()) {
-						e.setCorpName(corpMessage.getData().getCname());
+					if (ObjectUtil.isNotEmpty(corpsList)){
+						e.setCorpName(corpsList.stream().filter(d -> d.getId().equals(e.getCorpId())).findFirst().get().getCname());
 					}
 				}
-				//调用-费用微服务-获取关税设置详情
-				R<FeesDesc> customDuty = feesDescClient.getFeesByName("关税");
+				/*//调用-费用微服务-获取关税设置详情
+				R<FeesDesc> customDuty = feesDescClient.getFeesByName("关税");*/
 				Long customDutyId = null;
 				if (customDuty.isSuccess() && customDuty.getData() != null) {
 					customDutyId = customDuty.getData().getId();
@@ -559,7 +583,6 @@ public class OrderController extends BladeController {
 						if (accListByCondition.isSuccess()) {
 							List<Acc> customDutyList = accListByCondition.getData();
 							//关税
-
 							if (CollectionUtils.isNotEmpty(customDutyList)) {
 								customDutyMoney = customDutyList.stream().reduce(BigDecimal.ZERO, (x, y) -> {
 									return x.add(y.getAmount().multiply(y.getExchangeRate()));
@@ -574,9 +597,9 @@ public class OrderController extends BladeController {
 				e.setCustomDutyMoney(customDutyMoney);
 
 
-				//调用-费用微服务-获取物流费设置详情
+				/*//调用-费用微服务-获取物流费设置详情
+				R<FeesDesc> deliver = feesDescClient.getFeesByName("物流费");*/
 				Long deliverId = null;
-				R<FeesDesc> deliver = feesDescClient.getFeesByName("物流费");
 				if (deliver.isSuccess() && deliver.getData() != null) {
 					deliverId = deliver.getData().getId();
 				}
@@ -615,9 +638,9 @@ public class OrderController extends BladeController {
 				e.setDeliverMoney(deliverMoney);
 
 
-				//调用-费用微服务-获取配额设置详情
+				/*//调用-费用微服务-获取配额设置详情
+				R<FeesDesc> quota = feesDescClient.getFeesByName("配额");*/
 				Long quotaId = null;
-				R<FeesDesc> quota = feesDescClient.getFeesByName("配额");
 				if (quota.isSuccess() && quota.getData() != null) {
 					quotaId = quota.getData().getId();
 				}
@@ -658,9 +681,9 @@ public class OrderController extends BladeController {
 				e.setQuotaMoney(quotaMoney);
 
 
-				//调用-费用微服务-获取增值税设置详情
+				/*//调用-费用微服务-获取增值税设置详情
+				R<FeesDesc> GST = feesDescClient.getFeesByName("增值税");*/
 				Long gstId = null;
-				R<FeesDesc> GST = feesDescClient.getFeesByName("增值税");
 				if (GST.isSuccess() && GST.getData() != null) {
 					gstId = GST.getData().getId();
 				}
@@ -747,16 +770,14 @@ public class OrderController extends BladeController {
 
 				//客户名称
 				if (e.getSaleCorpId() != null) {
-					R<CorpsDesc> corpsDescClientCorpMessage = corpsDescClient.getCorpMessage(e.getSaleCorpId());
-					if (corpsDescClientCorpMessage.isSuccess()) {
-						e.setSaleCorpName(corpsDescClientCorpMessage.getData().getCname());
+					if (ObjectUtil.isNotEmpty(saleCorpList)){
+						e.setSaleCorpName(saleCorpList.stream().filter(d -> d.getId().equals(e.getSaleCorpId())).findFirst().get().getCname());
 					}
 				}
 				//业务员名称
 				if (e.getCreateUser() != null) {
-					R<User> info = userClient.userInfoById(e.getCreateUser());
-					if (info.isSuccess()) {
-						e.setCreateUserName(info.getData().getRealName());
+					if (ObjectUtil.isNotEmpty(createUserList)){
+						e.setCreateUserName(createUserList.stream().filter(d -> d.getId().equals(e.getCreateUser())).findFirst().get().getRealName());
 					}
 				}
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/entrance/EntranceOrderController.java

@@ -24,6 +24,7 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.deliver.goods.entity.Delivery;
 import org.springblade.deliver.goods.feign.IDeliveryClient;
 import org.springblade.finance.feign.IFinanceClient;
@@ -142,22 +143,40 @@ public class EntranceOrderController extends BladeController {
 		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())){
+			String corpIds = "";//客户
+			String belongToCorpIds = "";//销售公司
+			String createUserIds = "";//制单人
+			for (Order orders : page.getRecords()){
+				if (ObjectUtil.isNotEmpty(orders.getCorpId())){
+					belongToCorpIds = belongToCorpIds + orders.getBelongToCorpId() + ",";
+				}
+				if (ObjectUtil.isNotEmpty(orders.getCorpId())){
+					corpIds = corpIds + orders.getCorpId() + ",";
+				}
+				if (ObjectUtil.isNotEmpty(orders.getCreateUser())){
+					createUserIds = createUserIds + orders.getCreateUser() + ",";
+				}
+			}
+			List<CorpsDesc> corpList = corpsDescClient.selectByCorpIds(corpIds);
+			List<CorpsDesc> belongToCorpList = corpsDescClient.selectByCorpIds(belongToCorpIds);
+			List<User> createUserList = userClient.selectUserIds(createUserIds);
 			page.getRecords().stream().forEach(item ->{
 				if (item.getCorpId() != null){
-					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());//客户
-					if (corpMessage.isSuccess() && corpMessage.getData() != null){
-						item.setCorpsName(corpMessage.getData().getCname());
+					if (ObjectUtil.isNotEmpty(corpList)) {
+						item.setCorpsName(corpList.stream().filter(e -> e.getId().equals(item.getCorpId())).findFirst().get().getCname());
 					}
 				}
 				if (item.getBelongToCorpId() != null){
-					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getBelongToCorpId());//销售公司
-					if (corpMessage.isSuccess() && corpMessage.getData() != null){
-						item.setBelongToCorpName(corpMessage.getData().getCname());
+					if (ObjectUtil.isNotEmpty(belongToCorpList)){
+						item.setBelongToCorpName(belongToCorpList.stream().filter(e -> e.getId().equals(item.getBelongToCorpId())).findFirst().get().getCname());
 					}
 				}
-				R<User> user = userClient.userInfoById(item.getCreateUser());//制单人
-				if (user.isSuccess() && user.getData() != null){
-					item.setCreateUserName(user.getData().getName());
+				//制单人名字
+				if(item.getCreateUser()!=null)
+				{
+					if (ObjectUtil.isNotEmpty(createUserList)) {
+						item.setCreateUserName(createUserList.stream().filter(e -> e.getId().equals(item.getCreateUser())).findFirst().get().getName());
+					}
 				}
 				//获取订单明细
 				List<OrderItems> list = orderItemsService.list(new QueryWrapper<OrderItems>().eq("pid", item.getId()).eq("is_deleted", 0));

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -346,12 +346,19 @@ public class ExportOrderController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderRemark()),Order::getOrderRemark,order.getOrderRemark());//备注
 		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
+		String corpIds = "";
+		for (Order orderOne : page.getRecords()){
+			if (ObjectUtil.isNotEmpty(orderOne.getCorpId())){
+				corpIds = corpIds + orderOne.getCorpId() + ",";
+			}
+		}
+		List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(corpIds);
 		if (CollectionUtils.isNotEmpty(page.getRecords())){
 			page.getRecords().stream().forEach(item ->{
+				//客户
 				if (item.getCorpId() != null){
-					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());//客户
-					if (corpMessage.isSuccess() && corpMessage.getData() != null){
-						item.setCorpsName(corpMessage.getData().getCname());
+					if (ObjectUtil.isNotEmpty(corpsDescList)){
+						item.setCorpsName(corpsDescList.stream().filter(e -> e.getId().equals(item.getCorpId())).findFirst().get().getCname());
 					}
 				}
 				//获取订单明细

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

@@ -39,6 +39,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.finance.excel.FeeStatisticsExcel;
 import org.springblade.finance.service.IAccService;
 import org.springblade.finance.vo.AccVO;
@@ -152,6 +153,13 @@ public class AccController extends BladeController {
 		accLambdaQueryWrapper.eq(Acc::getStatus, 0);
 		accLambdaQueryWrapper.orderByDesc(Acc::getCreateTime);
 		IPage<Acc> pages = accService.page(Condition.getPage(query), accLambdaQueryWrapper);
+		String corpIds = "";
+		for (Acc accOne : pages.getRecords()){
+			if (ObjectUtil.isNotEmpty(accOne.getCorpId())){
+				corpIds = corpIds + accOne.getCorpId() + ",";
+			}
+		}
+		List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(corpIds);
 		pages.getRecords().forEach(e -> {
 			//录入人
 			e.setCreateUserName(iUserClient.userInfoById(e.getCreateUser()).getData().getRealName());
@@ -164,9 +172,8 @@ public class AccController extends BladeController {
 			}
 			//客户名称
 			if (e.getCorpId() != null) {
-				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(e.getCorpId());
-				if (corpMessage.isSuccess() && corpMessage.getData() != null) {
-					e.setCorpName(corpMessage.getData().getCname());
+				if (ObjectUtil.isNotEmpty(corpsDescList)){
+					e.setCorpName(corpsDescList.stream().filter(d -> d.getId().equals(e.getCorpId())).findFirst().get().getCname());
 				}
 			}
 			e.setOutstandingAmount(e.getAmount().subtract(e.getSettlementAmount()));

blade-service/trade-purchase/src/main/java/com/trade/purchase/dealer/PurchaseDealerOrderController.java

@@ -226,7 +226,7 @@ public class PurchaseDealerOrderController extends BladeController {
 		String storageIds = "";//仓库
 
 		for (Order orders : records){
-			if (ObjectUtil.isNotEmpty(orders.getCorpId())){
+			if (ObjectUtil.isNotEmpty(orders.getBelongToCorpId())){
 				belongToCorpIds = belongToCorpIds + orders.getBelongToCorpId() + ",";
 			}
 			if (ObjectUtil.isNotEmpty(orders.getCreateUser())){

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/PurchaseEnquiry.java

@@ -30,6 +30,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
@@ -129,32 +130,45 @@ public class PurchaseEnquiry  extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryEnd()),Order::getPlannedDeliveryDate,order.getPlannedDeliveryEnd());//计划交货结束
 		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
+		String corpIds = "";//客户
+		String belongToCorpIds = "";//销售公司
+		String createUserIds = "";//制单人
+		for (Order orderOne : page.getRecords()){
+			if (ObjectUtil.isNotEmpty(orderOne.getCorpId())){
+				corpIds = corpIds + orderOne.getCorpId() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orderOne.getBelongToCorpId())){
+				belongToCorpIds = belongToCorpIds + orderOne.getBelongToCorpId() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orderOne.getCreateUser())){
+				createUserIds = createUserIds + orderOne.getCreateUser() + ",";
+			}
+		}
+		List<CorpsDesc> belongToCorpList = corpsDescClient.selectByCorpIds(belongToCorpIds);
+		List<User> createUserList = userClient.selectUserIds(createUserIds);
+		List<CorpsDesc> corpList = corpsDescClient.selectByCorpIds(corpIds);
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {
 			page.getRecords().stream().forEach(item -> {
-				if (item.getCorpId() != null) {
-					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());//客户
-					if (corpMessage.isSuccess() && corpMessage.getData() != null) {
-						item.setCorpName(corpMessage.getData().getCname());
+				if (item.getCorpId() != null) {//客户
+					if (ObjectUtil.isNotEmpty(corpList)){
+						item.setCorpName(corpList.stream().filter(e -> e.getId().equals(item.getCorpId())).findFirst().get().getCname());
 					}
 				}
-				if (item.getBelongToCorpId() != null) {
-					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getBelongToCorpId());//销售公司
-					if (corpMessage.isSuccess() && corpMessage.getData() != null) {
-						item.setBelongToCorpName(corpMessage.getData().getCname());
+				if (item.getBelongToCorpId() != null) {//销售公司
+					if (ObjectUtil.isNotEmpty(item.getBelongToCorpId())){
+						item.setBelongToCorpName(belongToCorpList.stream().filter(e -> e.getId().equals(item.getBelongToCorpId())).findFirst().get().getCname());
 					}
 				}
-				R<User> user = userClient.userInfoById(item.getCreateUser());//制单人
-				if (user.isSuccess() && user.getData() != null) {
-					item.setCreateUserName(user.getData().getName());
+				if (item.getCreateUser() != null){//制单人
+					if (ObjectUtil.isNotEmpty(createUserList)){
+						item.setCreateUserName(createUserList.stream().filter(e -> e.getId().equals(item.getCreateUser())).findFirst().get().getName());
+					}
 				}
 				//获取订单明细
 				List<OrderItems> list = orderItemsService.list(new QueryWrapper<OrderItems>().eq("pid", item.getId()).eq("is_deleted", 0));
 				if (CollectionUtils.isNotEmpty(list)){
 					item.setOrderQuantity(list.stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO,BigDecimal::add));//数量合计
 					item.setAmount(list.stream().map(OrderItems::getAmount).reduce(BigDecimal.ZERO,BigDecimal::add).multiply(item.getExchangeRate()));//销售金额
-				/*	item.setPurchaseAmount(list.stream().filter(e -> e.getPurchaseAmount() != null).reduce(BigDecimal.ZERO,(x,y) ->{
-						return x.add((y.getPurchaseAmount().add(y.getPartsPrice())).multiply(y.getOrderQuantity()));
-					},BigDecimal::add));//采购金额*/
 					item.setActualQuantity(list.stream().map(OrderItems::getActualQuantity).reduce(BigDecimal.ZERO,BigDecimal::add));//发货数量
 				}