fix: 团队管理-修复接单对象范围问题

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmScorePackage.java

@@ -329,6 +329,13 @@ public class WmScorePackage extends Model<WmScorePackage> {
 
 	@ApiModelProperty(value = "接单对象范围")
 	private String packageUserScope;
+
+	/**
+	 * 接单对象范围名称
+	 */
+	@TableField(exist = false)
+	private String packageUserScopeName;
+
 	@TableField(exist = false)
 	private Integer certStatus;
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmTeamService.java

@@ -18,7 +18,6 @@ public interface WmTeamService extends IService<WmTeam> {
 	/**
 	 * 查询可选择的人员
 	 *
-	 *
 	 * @param deptId
 	 * @param teamId
 	 * @param userNameOrPhone
@@ -27,8 +26,15 @@ public interface WmTeamService extends IService<WmTeam> {
 	Map<String, Object> listSelectableUser(Integer deptId, Integer teamId, String userNameOrPhone);
 
 	/**
-	 * 团队批量导入成员
+	 * 查询接单对象范围名称
 	 *
+	 * @param packageUserScope
+	 * @return
+	 */
+	String getPackageUserScopeName(String packageUserScope);
+
+	/**
+	 * 团队批量导入成员
 	 *
 	 * @param teamId
 	 * @param excelMap

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -95,6 +95,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 	private final WmDaDrugEntDrugtableService wmDaDrugEntDrugtableService;
 	private final WmReportMapper wmReportMapper;
 	private final SysDictItemService sysDictItemService;
+	private final WmTeamService wmTeamService;
 	private final RedisTemplate<String, String> redisTemplate;
 
 	@Override
@@ -2093,6 +2094,12 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		scorePackage.setReportMqName(CacheConstants.EXPORT_ZB_REPORT_CACHE);
 		getReportOpt(scorePackage);
 
+		// 接单对象范围名称
+		if (StrUtil.isNotBlank(scorePackage.getPackageUserScope())) {
+			String packageUserScopeName = wmTeamService.getPackageUserScopeName(scorePackage.getPackageUserScope());
+			scorePackage.setPackageUserScopeName(packageUserScopeName);
+		}
+
 		return new AsyncResult<>(scorePackage);
 	}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTeamServiceImpl.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUserRole;
 import com.qunzhixinxi.hnqz.admin.entity.WmTeam;
@@ -15,6 +16,7 @@ import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.SysUserMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.SysUserRoleMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTeamMapper;
+import com.qunzhixinxi.hnqz.admin.service.SysDictItemService;
 import com.qunzhixinxi.hnqz.admin.service.WmTeamService;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
@@ -47,6 +49,8 @@ public class WmTeamServiceImpl extends ServiceImpl<WmTeamMapper, WmTeam> impleme
 
 	private final SysUserRoleMapper sysUserRoleMapper;
 
+	private final SysDictItemService sysDictItemService;
+
 	/**
 	 * 查询可选择的人员
 	 *
@@ -158,6 +162,31 @@ public class WmTeamServiceImpl extends ServiceImpl<WmTeamMapper, WmTeam> impleme
 		return resultMap;
 	}
 
+	/**
+	 * 查询接单对象范围名称
+	 *
+	 * @param packageUserScope
+	 * @return
+	 */
+	@Override
+	public String getPackageUserScopeName(String packageUserScope) {
+		String packageUserScopeName = "";
+		int packageUserScopeInt = Integer.parseInt(packageUserScope);
+		if (packageUserScopeInt >= 1000) {
+			// 1.查询当前企业下的团队
+			WmTeam team = this.getById(packageUserScopeInt);
+			packageUserScopeName = team.getName();
+		} else {
+			// 2.原有的字典数据项
+			SysDictItem dictItem = sysDictItemService.getOne(Wrappers.<SysDictItem>lambdaQuery()
+					.eq(SysDictItem::getType, "package_user_scope")
+					.eq(SysDictItem::getValue, packageUserScope)
+					.eq(SysDictItem::getDelFlag, DelEnum.NOT_DEL.val()));
+			packageUserScopeName = dictItem.getLabel();
+		}
+		return packageUserScopeName;
+	}
+
 	/**
 	 * 团队批量导入成员
 	 *
@@ -209,10 +238,10 @@ public class WmTeamServiceImpl extends ServiceImpl<WmTeamMapper, WmTeam> impleme
 	/**
 	 * 校验用户信息
 	 *
-	 * @param excelList   excel用户数据
-	 * @param team        team对象
-	 * @param errorMap    错误信息map
-	 * @param currentList 正确数据list
+	 * @param excelList      excel用户数据
+	 * @param team           team对象
+	 * @param errorMap       错误信息map
+	 * @param currentList    正确数据list
 	 * @param repeatUserList 重复成员用户list
 	 */
 	private void checkoutUserInfo(List<WmTeamExcelModel> excelList, WmTeam team, Map<String, String> errorMap,