2022年9月27日 17:50

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

@@ -6,14 +6,26 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 @FeignClient(
 	value = LauncherConstant.APPLICATION_CLIENT_NAME
 )
 public interface ILandDriverClient {
 	String API_PREFIX = "/client";
 	String GET_DRIVER = API_PREFIX + "/getDriver";
+	String DRIVER_BY_IDS = API_PREFIX + "/selectByDriverIds";
 
 	@GetMapping(GET_DRIVER)
 	LandDriver getDriver(@RequestParam("id") Long id);
 
+	/**
+	 * 根据ids查询司机通用方法
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@GetMapping(DRIVER_BY_IDS)
+	List<LandDriver> selectByDriverIds(@RequestParam("ids") String ids);
+
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java

@@ -62,6 +62,7 @@ public interface ISysClient {
 	String REGION = API_PREFIX + "/region";
 	String LIST_ROLE_ALIAS=API_PREFIX+"/listRoleAlias";
 	String GET_ROLE_ID_BY_ALIAS=API_PREFIX+"/getRoleByAlias";
+	String DEPT_BY_IDS = API_PREFIX + "/selectByDeptIds";
 
 	/**
 	 * 通过租户id获取全部租户别名
@@ -288,4 +289,12 @@ public interface ISysClient {
 	@GetMapping(REGION)
 	R<Region> getRegion(@RequestParam("code") String code);
 
+	/**
+	 * 根据ids查询部门通用方法
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@GetMapping(DEPT_BY_IDS)
+	R<List<Dept>> selectByDeptIds(@RequestParam("ids") String ids);
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java

@@ -20,6 +20,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.*;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -155,5 +156,9 @@ public class ISysClientFallback implements ISysClient {
 		return R.fail("获取数据失败");
 	}
 
+	@Override
+	public R<List<Dept>> selectByDeptIds(String ids) {
+		return R.fail("获取数据失败");
+	}
 
 }

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

@@ -1,6 +1,7 @@
 package org.springblade.client.land.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import jdk.internal.dynalink.linker.LinkerServices;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.LandDriver;
 import org.springblade.client.feign.ILandDriverClient;
@@ -10,6 +11,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 @NonDS
 @ApiIgnore()
 @RestController
@@ -23,4 +26,10 @@ public class LandDriverClient implements ILandDriverClient {
 	public LandDriver getDriver(Long id) {
 		return landDriverService.getById(id);
 	}
+
+	@Override
+	@GetMapping(DRIVER_BY_IDS)
+	public List<LandDriver> selectByDriverIds(String ids){
+		return landDriverService.getByDriverIds(ids);
+	}
 }

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

@@ -44,6 +44,7 @@ import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -270,7 +271,9 @@ public class LandDriverServiceImpl extends ServiceImpl<LandDriverMapper, LandDri
 	 * @return
 	 */
 	public List<LandDriver> getByDriverIds(String driverIds){
-		System.out.println("司机"+driverIds);
+		if (driverIds == null || driverIds.equals("")){
+			return new ArrayList<>();
+		}
 		List<Long> collect = Arrays.stream(driverIds.split(","))
 			.map(s -> Long.parseLong(s.trim()))
 			.collect(Collectors.toList());

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

@@ -38,6 +38,7 @@ import org.springblade.land.service.IOrderService;
 import org.springblade.land.util.MessageUtil;
 import org.springblade.land.vo.OrderAcctVO;
 import org.springblade.land.vo.OrderVO;
+import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -731,6 +732,47 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		orderQueryWrapper.in(StringUtil.isNotBlank(order.getStatusIds()), Order::getStatus, Func.toIntList(order.getStatusIds()));
 
 		IPage<Order> pages = baseMapper.selectPage(Condition.getPage(query), orderQueryWrapper);
+
+		String corpIds = "";//客户
+		String createUserIds = "";//创建人
+		String salesmanIds = "";//业务员
+		String dispatcherIds = "";//调度员
+		String dispatchDeptIds = "";//调度部门
+		String fleetIds = "";//车队
+		String driverIds = "";//司机
+
+		for (Order orders : pages.getRecords()){
+			if (ObjectUtil.isNotEmpty(orders.getCorpId())){
+				corpIds = corpIds + orders.getCorpId() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orders.getCreateUser())){
+				createUserIds = createUserIds + orders.getCreateUser() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orders.getSalesman())){
+				salesmanIds = salesmanIds + orders.getSalesman() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orders.getDispatcher())){
+				dispatcherIds = dispatcherIds + orders.getDispatcher() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orders.getDispatchDept())){
+				dispatchDeptIds = dispatchDeptIds + orders.getDispatchDept() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orders.getFleetId())){
+				fleetIds = fleetIds + orders.getFleetId() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orders.getDriverId())){
+				driverIds = driverIds + orders.getDriverId() + ",";
+			}
+		}
+
+		List<CorpsDesc> corpsDescList = 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);
+		List<CorpsDesc> fleetList = corpsDescClient.selectByCorpIds(fleetIds);
+		List<LandDriver> driverList = landDriverClient.selectByDriverIds(driverIds);
+
 		pages.getRecords().forEach(record -> {
 			//杂费客户
 			if (!ObjectUtil.isEmpty(record.getId())){
@@ -740,11 +782,21 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					.eq(OrderFee::getTenantId, AuthUtil.getTenantId());
 				List<OrderFee> feeList = orderFeeMapper.selectList(feeLambdaQueryWrapper);
 
+				String feeCorpIds = "";
+				for (OrderFee orderFee : feeList){
+					if (ObjectUtil.isNotEmpty(orderFee.getCorpId())){
+						feeCorpIds = feeCorpIds + orderFee.getCorpId() + ",";
+					}
+				}
+
+				List<CorpsDesc> feeCorpList = corpsDescClient.selectByCorpIds(feeCorpIds);
+
 				if (!ObjectUtil.isEmpty(feeList)){
 					feeList.forEach(list -> {
-						R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(list.getCorpId());
-						if (corpMessage.isSuccess() && corpMessage.getData() != null) {
-							list.setCorpName(corpMessage.getData().getCname());
+						if (list.getCorpId() != null) {
+							if (ObjectUtil.isNotEmpty(feeCorpList)){
+								list.setCorpName(feeCorpList.stream().filter(e -> e.getId().equals(list.getCorpId())).findFirst().get().getCname());
+							}
 						}
 					});
 					record.setOrderFeeList(feeList);
@@ -753,53 +805,46 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 			//客户
 			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(corpsDescList)) {
+					record.setCorpName(corpsDescList.stream().filter(e -> e.getId().equals(record.getCorpId())).findFirst().get().getCname());
+					record.setCorpShortName(corpsDescList.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());
 				}
 			}
 			//车队
-			if (!ObjectUtil.isEmpty(record.getFleetId())){
-				R<CorpsDesc> fleetMessage = corpsDescClient.getCorpMessage(record.getFleetId());
-				if (fleetMessage.isSuccess() && fleetMessage.getData() != null) {
-					record.setFleetName(fleetMessage.getData().getCname());
-					record.setFleetShortName(fleetMessage.getData().getShortName());
+			if (!ObjectUtil.isEmpty(record.getFleetId())) {
+				if (ObjectUtil.isNotEmpty(fleetList)) {
+					record.setFleetName(fleetList.stream().filter(e -> e.getId().equals(record.getFleetId())).findFirst().get().getCname());
+					record.setFleetShortName(fleetList.stream().filter(e -> e.getId().equals(record.getFleetId())).findFirst().get().getShortName());
 				}
 			}
 			//司机
 			if (!ObjectUtil.isEmpty(record.getDriverId())){
-				LandDriver driver = landDriverClient.getDriver(record.getDriverId());
-				if (ObjectUtil.isNotEmpty(driver)) {
-					record.setDriverName(driver.getName());
+				if (ObjectUtil.isNotEmpty(driverList)) {
+					record.setDriverName(driverList.stream().filter(e -> e.getId().equals(record.getDriverId())).findFirst().get().getName());
 				}
 			}
 			//装货地址货物体积总和

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/SalesPolicyController.java

@@ -102,13 +102,12 @@ public class SalesPolicyController extends BladeController {
 			pages.getRecords().forEach(item -> {
 				//回显代理商中文名
 				if (StringUtils.isNotBlank(item.getCorps())) {
-					List<String> list = Arrays.asList(item.getCorps().split(","));
+					List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(item.getCorps());
 					StringBuffer stringBuffer = new StringBuffer();
-					if (CollectionUtils.isNotEmpty(list)) {
-						list.forEach(items -> {
-							R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(Long.valueOf(items));
-							if (corpMessage.isSuccess() && corpMessage.getData() != null) {
-								stringBuffer.append(corpMessage.getData().getCname()).append(",");
+					if (CollectionUtils.isNotEmpty(corpsDescList)) {
+						corpsDescList.forEach(items -> {
+							if (items != null) {
+								stringBuffer.append(items.getCname()).append(",");
 							}
 						});
 					}

blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java

@@ -128,6 +128,12 @@ public class SysClient implements ISysClient {
 	}
 
 	@Override
+	@GetMapping(DEPT_BY_IDS)
+	public R<List<Dept>> selectByDeptIds(String ids){
+		return R.data(deptService.selectByDeptIds(ids));
+	}
+
+	@Override
 	public R<Post> getPost(Long id) {
 		return R.data(postService.getById(id));
 	}

blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java

@@ -17,6 +17,7 @@
 package org.springblade.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.vo.DeptVO;
 
@@ -73,4 +74,11 @@ public interface DeptMapper extends BaseMapper<Dept> {
 	 */
 	List<String> getDeptNames(Long[] ids);
 
+	/**
+	 * 根据ids查询客户通用方法
+	 *
+	 * @param ids
+	 * @return
+	 */
+	List<Dept> selectByDeptIds(@Param("ids") List<Long> ids);
 }

blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml

@@ -130,4 +130,14 @@
         and is_deleted = 0
     </select>
 
+    <select id="selectByDeptIds" resultMap="deptResultMap">
+        select
+        *
+        from blade_dept
+        where is_deleted = 0
+        and id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 </mapper>

blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java

@@ -19,6 +19,8 @@ package org.springblade.system.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.vo.DeptVO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.Map;
@@ -100,6 +102,14 @@ public interface IDeptService extends IService<Dept> {
 	List<Dept> getDeptChild(Long deptId);
 
 	/**
+	 * 根据ids查询部门通用方法
+	 *
+	 * @param ids
+	 * @return
+	 */
+	List<Dept> selectByDeptIds(String ids);
+
+	/**
 	 * 删除部门
 	 *
 	 * @param ids

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -33,6 +33,8 @@ import org.springblade.system.vo.DeptVO;
 import org.springblade.system.wrapper.DeptWrapper;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -129,6 +131,23 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		return baseMapper.selectList(Wrappers.<Dept>query().lambda().like(Dept::getAncestors, deptId));
 	}
 
+	/**
+	 * 根据ids查询部门通用方法
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+	public List<Dept> selectByDeptIds(String ids){
+		if (ids == null || ids.equals("")){
+			return new ArrayList<>();
+		}
+		List<Long> collect = Arrays.stream(ids.split(","))
+			.map(s -> Long.parseLong(s.trim()))
+			.collect(Collectors.toList());
+		return baseMapper.selectByDeptIds(collect);
+	}
+
 	@Override
 	public boolean removeDept(String ids) {
 		Integer cnt = baseMapper.selectCount(Wrappers.<Dept>query().lambda().in(Dept::getParentId, Func.toLongList(ids)));

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -237,54 +237,74 @@ public class PurchaseOrderController extends BladeController {
 		Page<Order> page=new Page<>(current,size);
 		IPage<Order> pages = orderService.page(page,queryWrapper);
 		List<Order> records = pages.getRecords();
+
+		String belongToCorpIds = "";//所属公司
+		String createUserIds = "";//制单人
+		String updateUserIds = "";//修改人
+		String corpIds = "";//供应商
+		String purchaserIds = "";//采购商
+
+		for (Order orders : records){
+			if (ObjectUtil.isNotEmpty(orders.getCorpId())){
+				belongToCorpIds = belongToCorpIds + orders.getBelongToCorpId() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orders.getCreateUser())){
+				createUserIds = createUserIds + orders.getCreateUser() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orders.getUpdateUser())){
+				updateUserIds = updateUserIds + orders.getUpdateUser() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orders.getCorpId())){
+				corpIds = corpIds + orders.getCorpId() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(orders.getPurchaserId())){
+				purchaserIds = purchaserIds + orders.getPurchaserId();
+			}
+		}
+
+		List<CorpsDesc> belongToCorpList = corpsDescClient.selectByCorpIds(belongToCorpIds);
+		List<User> createUserList = userClient.selectUserIds(createUserIds);
+		List<User> updateUserList = userClient.selectUserIds(updateUserIds);
+		List<CorpsDesc> corpList = corpsDescClient.selectByCorpIds(corpIds);
+		List<CorpsDesc> purchaserList = corpsDescClient.selectByCorpIds(purchaserIds);
+
 		if(CollectionUtils.isNotEmpty(records))
 		{
 			records.forEach(e->{
 				//所属公司
 				if(e.getBelongToCorpId()!=null)
 				{
-					R<CorpsDesc> corpMessage3 = corpsDescClient.getCorpMessage(e.getBelongToCorpId());
-					if(corpMessage3.getData()!=null)
-					{
-						e.setBelongToCorpName(corpMessage3.getData().getCname());
+					if (ObjectUtil.isNotEmpty(belongToCorpList)) {
+						e.setBelongToCorpName(belongToCorpList.stream().filter(d -> d.getId().equals(e.getBelongToCorpId())).findFirst().get().getCname());
 					}
 				}
 
 				//制单人名字
 				if(e.getCreateUser()!=null)
 				{
-					R<User> userR = userClient.userInfoById(e.getCreateUser());
-					if(userR.isSuccess())
-					{
-						e.setCreateUserName(userR.getData().getRealName());
+					if (ObjectUtil.isNotEmpty(createUserList)) {
+						e.setCreateUserName(createUserList.stream().filter(d -> d.getId().equals(e.getCreateUser())).findFirst().get().getRealName());
 					}
 				}
 
 				//修改制单人名字
 				if(e.getUpdateUser()!=null)
 				{
-					R<User> userR = userClient.userInfoById(e.getUpdateUser());
-					if(userR.isSuccess())
-					{
-						e.setUpdateUserName(userR.getData().getRealName());
+					if (ObjectUtil.isNotEmpty(updateUserList)) {
+						e.setUpdateUserName(updateUserList.stream().filter(d -> d.getId().equals(e.getUpdateUser())).findFirst().get().getRealName());
 					}
 				}
 
 				//获取供应商中文名
 				if (e.getCorpId() != null){
-					R<CorpsDesc> corpMessage1 = corpsDescClient.getCorpMessage(e.getCorpId());
-					if(corpMessage1.getData()!=null)
-					{
-                       e.setStrCorpName(corpMessage1.getData().getCname());
+					if (ObjectUtil.isNotEmpty(corpList)) {
+						e.setStrCorpName(corpList.stream().filter(d -> d.getId().equals(e.getCorpId())).findFirst().get().getCname());
 					}
-
 				}
 				//获取采购商中文名
 				if (e.getPurchaserId() != null){
-					R<CorpsDesc> corpMessage2 = corpsDescClient.getCorpMessage(e.getPurchaserId());
-					if(corpMessage2.getData()!=null)
-					{
-						e.setStrPurchaserName(corpMessage2.getData().getCname());
+					if (ObjectUtil.isNotEmpty(purchaserList)) {
+						e.setStrPurchaserName(purchaserList.stream().filter(d -> d.getId().equals(e.getPurchaserId())).findFirst().get().getCname());
 					}
 				}