团队管理-接单对象范围-查询

db/v2.0/1207.sql

@@ -15,7 +15,3 @@ CREATE TABLE `wm_team_manage`
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='团队管理';
-
--- 积分包表新增字段
-ALTER TABLE `wm_score_package`
-    ADD COLUMN `team_id` int NULL DEFAULT NULL COMMENT '团队id' AFTER `p2p_amount`;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTeamController.java

@@ -260,4 +260,38 @@ public class WmTeamController {
 		Map<String, Object> map = wmTeamService.listSelectableUser(teamId);
 		return R.ok(map);
 	}
+
+	/**
+	 * 查询接单对象范围
+	 *
+	 * @return
+	 */
+	@GetMapping("/list-package-user-scope")
+	public R<List<Map<String, Object>>> listPackageUserScope() {
+		List<Map<String, Object>> resultList = new ArrayList<>();
+		Integer deptId = SecurityUtils.getUser().getDeptId();
+		List<WmTeam> list = wmTeamService.list(Wrappers.<WmTeam>lambdaQuery()
+				.eq(WmTeam::getDeptId, deptId)
+				.eq(WmTeam::getDelFlag, DelEnum.NOT_DEL.val())
+				.eq(WmTeam::getEnableFlag, EnableEnum.ENABLE.val()));
+		if (CollectionUtil.isNotEmpty(list)) {
+			List<Map<String, Object>> mapList = list.stream().map(wmTeam -> {
+				Map<String, Object> teamMap = MapUtil.newHashMap(2);
+				teamMap.put("label", wmTeam.getName());
+				teamMap.put("value", wmTeam.getId());
+				return teamMap;
+			}).collect(Collectors.toList());
+			resultList.addAll(mapList);
+		}
+		Map<String, Object> internalMap = MapUtil.newHashMap(2);
+		internalMap.put("label", "仅内部可见");
+		internalMap.put("value", "1");
+		Map<String, Object> allMap = MapUtil.newHashMap(2);
+		allMap.put("label", "全部可见");
+		allMap.put("value", "2");
+		resultList.add(internalMap);
+		resultList.add(allMap);
+
+		return R.ok(resultList);
+	}
 }

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -1282,9 +1282,9 @@
 		)
 		or
 		(
-		    p.send_package_dept_id = d.dept_id and p.package_user_scope = '3'
+		    p.send_package_dept_id = d.dept_id and p.package_user_scope > '1000'
 			and p.is_receive = '0' and p.enable_flag = '0' and p.enable_type != '2'
-		    and p.team_id is not null and FIND_IN_SET(#{query.zbId}, (SELECT member FROM wm_team WHERE id = p.team_id))
+		    and FIND_IN_SET(#{query.zbId}, (SELECT member FROM wm_team WHERE id = p.package_user_scope))
 			<if test="query.scorePackageName != null and query.scorePackageName != ''">
 				AND p.score_package_name like CONCAT('%',#{query.scorePackageName},'%')
 			</if>