变更

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

@@ -86,16 +86,16 @@ public class CorpsDescController extends BladeController {
 		corpsDesc.setIsDeleted(0);
 		corpsDesc.setTenantId(SecureUtil.getTenantId());
 		IPage<CorpsDescVO> pages = corpsDescService.selectCorpsDescPage(Condition.getPage(query), corpsDesc);
+
 		if (CollectionUtils.isNotEmpty(pages.getRecords())) {
 			pages.getRecords().forEach(item -> {
 				if (StringUtils.isNotBlank(item.getAdminProfiles())) {
-					List<String> list = Arrays.asList(item.getAdminProfiles().split(","));
+					List<User> updateUserList = userClient.selectUserIds(item.getAdminProfiles());
 					StringBuffer stringBuffer = new StringBuffer();
-					if (CollectionUtils.isNotEmpty(list)) {
-						list.forEach(items -> {
-							R<User> user = userClient.userInfoById(Long.valueOf(items));
-							if (user.isSuccess() && user.getData() != null) {
-								stringBuffer.append(user.getData().getName()).append(",");
+					if (CollectionUtils.isNotEmpty(updateUserList)) {
+						updateUserList.forEach(items -> {
+							if (items != null) {
+								stringBuffer.append(items.getName()).append(",");
 							}
 						});
 					}

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

@@ -83,4 +83,11 @@ public interface CorpsDescMapper extends BaseMapper<CorpsDesc> {
 	@SqlParser(filter=true)
 	List<CorpsDesc> getCorp(@Param("CorpsDesc") CorpsDesc corpsDesc);
 
+	/**
+	 * 查询车队信息
+	 *
+	 * @param fleetIds
+	 * @return
+	 */
+	List<CorpsDesc> getByFleetIds(@Param("fleetIds") List<Long> fleetIds);
 }

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

@@ -360,4 +360,14 @@
             and status = #{CorpsDesc.status}
         </if>
     </select>
+    <select id="getByFleetIds" resultMap="corpsDescResultMap">
+        select
+            *
+        from basic_corps_desc
+        where is_deleted = 0
+          and id in
+        <foreach item="id" collection="fleetIds" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 </mapper>

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

@@ -172,4 +172,12 @@ public interface ICorpsDescService extends IService<CorpsDesc> {
 	 * @return
 	 */
 	int inserts(CorpsDesc corpsDesc);
+
+	/**
+	 * 查询车队
+	 *
+	 * @param fleetIds
+	 * @return
+	 */
+	List<CorpsDesc> getByFleetIds(String fleetIds);
 }

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

@@ -855,4 +855,17 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 		return result;
 	}
 
+	/**
+	 * 查询车队
+	 *
+	 * @param fleetIds
+	 * @return
+	 */
+	public List<CorpsDesc> getByFleetIds(String fleetIds){
+		List<Long> collect = Arrays.stream(fleetIds.split(","))
+			.map(s -> Long.parseLong(s.trim()))
+			.collect(Collectors.toList());
+		return baseMapper.getByFleetIds(collect);
+	}
+
 }

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

@@ -143,17 +143,27 @@ public class LandVehicleController extends BladeController {
 			.eq(LandVehicle::getTenantId, AuthUtil.getTenantId())
 			.eq(LandVehicle::getIsDeleted, 0)
 		);
+		String fleetIds = "";//车队id
+		String driverIds = "";//司机id
+		for (LandVehicle vehicle : vehicleList){
+			fleetIds = fleetIds + vehicle.getFleetId() + ",";
+			if (ObjectUtil.isNotEmpty(vehicle.getDriverId())){
+				driverIds = driverIds + vehicle.getDriverId() + ",";
+			}
+		}
+
+		List<CorpsDesc> fleetList = corpsDescService.getByFleetIds(fleetIds);
+		List<LandDriver> driverList = landDriverService.getByDriverIds(driverIds);
+
 		vehicleList.forEach(vehicle -> {
 			if (ObjectUtil.isNotEmpty(vehicle.getFleetId())) {
-				CorpsDesc fleet = corpsDescService.getById(vehicle.getFleetId());
-				vehicle.setFleetName(fleet.getCname());
+				vehicle.setFleetName(fleetList.stream().filter(e -> e.getId().equals(vehicle.getFleetId())).findFirst().get().getCname());
 			}
 
 			if (ObjectUtil.isNotEmpty(vehicle.getDriverId())) {
-				LandDriver driver = landDriverService.getById(vehicle.getDriverId());
-				if (driver != null) {
-					vehicle.setDriverName(driver.getName());
-					vehicle.setTel(driver.getTel());
+				if (driverList != null) {
+					vehicle.setDriverName(driverList.stream().filter(e -> e.getId().equals(vehicle.getDriverId())).findFirst().get().getName());
+					vehicle.setTel(driverList.stream().filter(e -> e.getId().equals(vehicle.getDriverId())).findFirst().get().getTel());
 				}
 			}
 		});

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

@@ -18,6 +18,7 @@ package org.springblade.client.land.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.client.entity.LandDriver;
 import org.springblade.client.vo.LandDriverVO;
 
@@ -40,4 +41,12 @@ public interface LandDriverMapper extends BaseMapper<LandDriver> {
 	 */
 	List<LandDriverVO> selectLandDriverPage(IPage page, LandDriverVO landDriver);
 
+	/**
+	 * 获得司机信息
+	 *
+	 * @param driverIds
+	 * @return
+	 */
+	List<LandDriver> getByDriverIds(@Param("driverIds") List<Long> driverIds);
+
 }

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

@@ -30,4 +30,15 @@
         select * from basic_land_driver where is_deleted = 0
     </select>
 
+    <select id="getByDriverIds" resultMap="landDriverResultMap">
+        select
+            *
+        from basic_land_driver
+        where is_deleted = 0
+        and id in
+        <foreach item="id" collection="driverIds" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
 </mapper>

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

@@ -85,4 +85,12 @@ public interface ILandDriverService extends IService<LandDriver> {
 	 */
 	R importData(List<DriverExcel> data, Boolean isCovered);
 
+	/**
+	 * 获得司机信息
+	 *
+	 * @param driverIds
+	 * @return
+	 */
+	List<LandDriver> getByDriverIds(String driverIds);
+
 }

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

@@ -44,8 +44,10 @@ import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 陆运司机表 服务实现类
@@ -261,4 +263,18 @@ public class LandDriverServiceImpl extends ServiceImpl<LandDriverMapper, LandDri
 		return R.success("ok");
 	}
 
+	/**
+	 * 获得司机信息
+	 *
+	 * @param driverIds
+	 * @return
+	 */
+	public List<LandDriver> getByDriverIds(String driverIds){
+		System.out.println("司机"+driverIds);
+		List<Long> collect = Arrays.stream(driverIds.split(","))
+			.map(s -> Long.parseLong(s.trim()))
+			.collect(Collectors.toList());
+		return baseMapper.getByDriverIds(collect);
+	}
+
 }

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

@@ -109,6 +109,7 @@
         <where>
             t1.tenant_id = #{acct.tenantId}
             and t1.is_deleted = 0
+            and t2.is_deleted = 0
             and t2.kind = '2'
             <if test="acct.corpName != null and acct.corpName != ''">and t3.cname like concat('%', #{acct.corpName}, '%')</if>
             <if test="acct.corpId != null and acct.corpId != ''">and t1.corp_id like concat('%', #{acct.corpId}, '%')</if>

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/SalesPolicyServiceImpl.java

@@ -28,6 +28,7 @@ import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.mocha.entity.SalesPolicy;
 import org.springblade.mocha.entity.SalesPolicyItem;
 import org.springblade.mocha.excel.SalesItemExcel;
@@ -36,6 +37,7 @@ import org.springblade.mocha.mapper.SalesPolicyMapper;
 import org.springblade.mocha.service.ISalesPolicyService;
 import org.springblade.mocha.vo.SalesPolicyItemVO;
 import org.springblade.mocha.vo.SalesPolicyVO;
+import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
@@ -152,15 +154,28 @@ public class SalesPolicyServiceImpl extends ServiceImpl<SalesPolicyMapper, Sales
 		}
 		List<SalesPolicyItem> specialItemList = salesPolicyItemMapper.selectList(new QueryWrapper<SalesPolicyItem>().eq("pid", salesPolicy.getId())
 			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).eq("sales_type", 1));
+
+		String updateUserIds = "";//修改人id拼接
+		String createUserIds = "";//创建人id拼接
+		for (SalesPolicyItem items : specialItemList){
+			updateUserIds = updateUserIds + items.getUpdateUser() + ",";
+			createUserIds = createUserIds + items.getCreateUser() + ",";
+		}
+
+		//获得修改人信息
+		List<User> updateUserList = userClient.selectUserIds(updateUserIds);
+		//获得创建人信息
+		List<User> createUserList = userClient.selectUserIds(createUserIds);
+
 		if (CollectionUtils.isNotEmpty(specialItemList)) {
 			specialItemList.forEach(item -> {
-				String createName = this.getUserName(item.getCreateUser());
-				if (StringUtils.isNotBlank(createName)) {
-					item.setCreateUserName(createName);
+				if (ObjectUtil.isNotEmpty(updateUserList)) {
+					item.setUpdateUserName(updateUserList.stream().filter(e -> e.getId().equals(item.getUpdateUser())).findFirst().get().getName());
 				}
-				String updateName = this.getUserName(item.getUpdateUser());
-				if (StringUtils.isNotBlank(updateName)) {
-					item.setUpdateUserName(updateName);
+
+				if (ObjectUtil.isNotEmpty(createUserList)) {
+					item.setUpdateUserName(createUserList.stream().filter(e -> e.getId().equals(item.getCreateUser())).findFirst().get().getName());
+
 				}
 				item.setIsSpecial("特价".equals(policy.getType()) ? 1 : 0);
 			});
@@ -168,15 +183,25 @@ public class SalesPolicyServiceImpl extends ServiceImpl<SalesPolicyMapper, Sales
 		}
 		List<SalesPolicyItem> presentItemList = salesPolicyItemMapper.selectList(new QueryWrapper<SalesPolicyItem>().eq("pid", salesPolicy.getId())
 			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).eq("sales_type", 2));
+		updateUserIds = "";//修改人id拼接
+		createUserIds = "";//创建人id拼接
+		for (SalesPolicyItem items : presentItemList){
+			updateUserIds = updateUserIds + items.getUpdateUser() + ",";
+			createUserIds = createUserIds + items.getCreateUser() + ",";
+		}
+		//获得修改人信息
+		List<User> updateUserList2 = userClient.selectUserIds(updateUserIds);
+		//获得创建人信息
+		List<User> createUserList2 = userClient.selectUserIds(createUserIds);
 		if (CollectionUtils.isNotEmpty(presentItemList)) {
 			presentItemList.forEach(item -> {
-				String createName = this.getUserName(item.getCreateUser());
-				if (StringUtils.isNotBlank(createName)) {
-					item.setCreateUserName(createName);
+				if (ObjectUtil.isNotEmpty(updateUserList2)) {
+					item.setUpdateUserName(updateUserList2.stream().filter(e -> e.getId().equals(item.getUpdateUser())).findFirst().get().getName());
 				}
-				String updateName = this.getUserName(item.getUpdateUser());
-				if (StringUtils.isNotBlank(updateName)) {
-					item.setUpdateUserName(updateName);
+
+				if (ObjectUtil.isNotEmpty(createUserList2)) {
+					item.setUpdateUserName(createUserList2.stream().filter(e -> e.getId().equals(item.getCreateUser())).findFirst().get().getName());
+
 				}
 				item.setIsSpecial("特价".equals(policy.getType()) ? 1 : 0);
 			});

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -105,10 +105,51 @@ public class UserController {
 
 	@GetMapping("/userList")
 	public R userList(UserVO userVO) {
-		if (AuthUtil.getTenantId().equals("234557") && !StringUtil.isNotBlank(userVO.getRoleAlias())){
+		if (AuthUtil.getTenantId().equals("234557") && StringUtil.isBlank(userVO.getRoleAlias())){
 			userVO.setRoleAlias("业务员");
 		}
-		if (AuthUtil.getTenantId().equals("234557") && !"业务员".equals(userVO.getRoleAlias())){
+		LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.like(StringUtils.isNotBlank(userVO.getRealName()), User::getRealName, userVO.getRealName())
+			.like(ObjectUtil.isNotEmpty(userVO.getDeptPid()), User::getDeptPid, userVO.getDeptPid())
+			.eq(User::getTenantId, AuthUtil.getTenantId())
+			.eq(User::getIsDeleted, 0);
+
+		if (ObjectUtil.isNotEmpty(userVO.getDeptPid())) {
+			userVO.setRoleAlias("分管调度");
+		}
+		if (StringUtil.isNotBlank(userVO.getRoleAlias())) {
+			R<Long> roleR = sysClient.getRoleByAlias(userVO.getRoleAlias());
+			if (!roleR.isSuccess()) {
+				return R.data(new ArrayList<>());
+			}
+			lambdaQueryWrapper.like(User::getRoleId, roleR.getData());
+		}
+
+		if (StringUtil.isNotBlank(userVO.getUserExt())) {
+			List<Long> userIdList = userService.getUserIdByCorpId(Long.parseLong(userVO.getUserExt()));
+			if (CollectionUtil.isNotEmpty(userIdList)) {
+				lambdaQueryWrapper.in(User::getId, userIdList);
+			}
+		}
+
+		List<UserVO> userList = UserWrapper.build().listVO(userService.list(lambdaQueryWrapper));
+		if (StringUtil.isNotBlank(userVO.getSource())) {
+			userList.forEach(user -> {
+				R<List<String>> deptNameR = sysClient.getDeptNames(user.getDeptId());
+				if (deptNameR.isSuccess()) {
+					user.setDeptName(String.join(",", deptNameR.getData()));
+				}
+			});
+		}
+		return R.data(userList);
+	}
+
+	/**
+	 * 根据部门id查找运输调度
+	 */
+	@GetMapping("/deptUserList")
+	public R deptUserList(UserVO userVO) {
+		if (ObjectUtil.isEmpty(userVO.getDeptPid())){
 			return R.data(new ArrayList<>());
 		}
 		LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();