feat: 积分包列表加模糊查询条件-

关联积分包名称

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

@@ -2559,7 +2559,8 @@ public class WmScorePackageController {
 								 @RequestParam(value = "typeid", required = false) String typeId,
 								 @RequestParam(value = "monthStart", required = false) String monthStart,
 								 @RequestParam(value = "monthEnd", required = false) String monthEnd,
-								 @RequestParam(value = "acceptUser", required = false) String acceptUser
+								 @RequestParam(value = "acceptUser", required = false) String acceptUser,
+								 @RequestParam(value = "relationScoreId", required = false) String relationScoreId
 	) {
 
 		Integer sendDeptId = SecurityUtils.getUser().getDeptId();
@@ -2575,19 +2576,19 @@ public class WmScorePackageController {
 
 		}
 
-		LambdaQueryWrapper<WmScorePackage> queryWrapper = Wrappers.<WmScorePackage>lambdaQuery()
-				.eq(WmScorePackage::getPackageType1, packageType1)
-				.eq(WmScorePackage::getPackageType2, packageType2)
-				.like(StrUtil.isNotEmpty(scorePackageName), WmScorePackage::getScorePackageName, scorePackageName)
-				.eq(scorePackageStatus != null, WmScorePackage::getScorePackageStatus, scorePackageStatus)
-				.eq(WmScorePackage::getSendPackageDeptId, sendDeptId)
-				.between(start != null && end != null, WmScorePackage::getCreateTime, start, end);
+		QueryWrapper<WmScorePackage> queryWrapper = Wrappers.<WmScorePackage>query()
+				.eq("p.package_type1", packageType1)
+				.eq("p.package_type2", packageType2)
+				.like(StrUtil.isNotBlank(scorePackageName), "p.score_package_name", scorePackageName)
+				.eq(scorePackageStatus != null, "p.score_package_status", scorePackageStatus)
+				.eq("p.send_package_dept_id", sendDeptId)
+				.between(start != null && end != null, "p.create_time", start, end);
 
 		if (StringUtil.isEmpty(typeId)) {
-			queryWrapper.in(WmScorePackage::getTypeid, "3", "4");
+			queryWrapper.in("p.typeid", "3", "4");
 		} else {
 			List<String> split = StrUtil.split(typeId, StrUtil.COMMA);
-			queryWrapper.in(WmScorePackage::getTypeid, split);
+			queryWrapper.in("p.typeid", split);
 		}
 
 		boolean onePersonScorePackageFlag = PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(String.valueOf(packageType1))
@@ -2604,18 +2605,19 @@ public class WmScorePackageController {
 			if (CollectionUtil.isNotEmpty(teamList)) {
 				// 如果配置了，则只查询所在团队下发的积分包
 				List<String> teamIdList = teamList.stream().map(wmTeam -> String.valueOf(wmTeam.getId())).collect(Collectors.toList());
-				queryWrapper.in(WmScorePackage::getPackageUserScope, teamIdList);
+				queryWrapper.in("p.package_user_scope", teamIdList);
 			}
 		}
 
 		Page<WmScorePackage> wmScorePackagePage = null;
-		if (StrUtil.isNotBlank(acceptUser)) {
+//		if (StrUtil.isNotBlank(acceptUser) || StrUtil.isNotBlank(relationScoreId)) {
 			// 带有接单对象acceptUser模糊查询的查询
-			wmScorePackagePage = wmScorePackageMapper.listScorePackage(new Page<>(current, size), queryWrapper.orderByDesc(WmScorePackage::getCreateTime), acceptUser);
-		} else {
-			wmScorePackagePage = wmScorePackageMapper.selectPage(new Page<>(current, size), queryWrapper
-					.orderByDesc(WmScorePackage::getCreateTime));
-		}
+			wmScorePackagePage = wmScorePackageMapper.listScorePackage(new Page<>(current, size),
+					queryWrapper.orderByDesc("p.create_time"), acceptUser, relationScoreId);
+//		} else {
+//			wmScorePackagePage = wmScorePackageMapper.selectPage(new Page<>(current, size), queryWrapper
+//					.orderByDesc("p.create_time"));
+//		}
 
 		List<WmScorePackage> pageRecords = wmScorePackagePage.getRecords();
 
@@ -2661,8 +2663,7 @@ public class WmScorePackageController {
 								 @RequestParam(value = "scorePackageStatus", required = false) Integer scorePackageStatus,
 								 @RequestParam(value = "typeid", required = false) String typeId,
 								 @RequestParam(value = "monthStart", required = false) String monthStart,
-								 @RequestParam(value = "monthEnd", required = false) String monthEnd,
-								 @RequestParam(value = "acceptUser", required = false) String acceptUser
+								 @RequestParam(value = "monthEnd", required = false) String monthEnd
 	) {
 
 		Integer sendDeptId = SecurityUtils.getUser().getDeptId();
@@ -2700,32 +2701,8 @@ public class WmScorePackageController {
 			queryWrapper.in(WmScorePackage::getTypeid, split);
 		}
 
-//		boolean onePersonScorePackageFlag = packageType1List.contains(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val())
-//				&& PackageTypeEnum.TYPE2_TASK_PACKAGE.val().equals(String.valueOf(packageType2));
-//		boolean multiPersonScorePackageFlag = packageType1List.contains(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val())
-//				&& PackageTypeEnum.TYPE2_SETTLE_PACKAGE.val().equals(String.valueOf(packageType2));
-//		if (onePersonScorePackageFlag || multiPersonScorePackageFlag) {
-//			// 如果是个人承接-按积分值/多人承接-按积分值，判断当前用户是否配置了团队负责人
-//			List<WmTeam> teamList = wmTeamService.list(Wrappers.<WmTeam>lambdaQuery()
-//					.eq(WmTeam::getDeptId, sendDeptId)
-//					.eq(WmTeam::getEnableFlag, EnableEnum.ENABLE.val())
-//					.eq(WmTeam::getDelFlag, DelEnum.NOT_DEL.val())
-//					.apply("FIND_IN_SET({0}, leader)", String.valueOf(userId)));
-//			if (CollectionUtil.isNotEmpty(teamList)) {
-//				// 如果配置了，则只查询所在团队下发的积分包
-//				List<String> teamIdList = teamList.stream().map(wmTeam -> String.valueOf(wmTeam.getId())).collect(Collectors.toList());
-//				queryWrapper.in(WmScorePackage::getPackageUserScope, teamIdList);
-//			}
-//		}
-
-		Page<WmScorePackage> wmScorePackagePage = null;
-		if (StrUtil.isNotBlank(acceptUser)) {
-			// 带有接单对象acceptUser模糊查询的查询
-			wmScorePackagePage = wmScorePackageMapper.listScorePackage(new Page<>(current, size), queryWrapper.orderByDesc(WmScorePackage::getCreateTime), acceptUser);
-		} else {
-			wmScorePackagePage = wmScorePackageMapper.selectPage(new Page<>(current, size), queryWrapper
+		Page<WmScorePackage> wmScorePackagePage = wmScorePackageMapper.selectPage(new Page<>(current, size), queryWrapper
 					.orderByDesc(WmScorePackage::getCreateTime));
-		}
 
 		List<WmScorePackage> pageRecords = wmScorePackagePage.getRecords();
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmScorePackageMapper.java

@@ -18,7 +18,6 @@
 package com.qunzhixinxi.hnqz.admin.mapper;
 
 import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -155,6 +154,6 @@ public interface WmScorePackageMapper extends DataScopeMapper<WmScorePackage> {
 	 * @param acceptUser
 	 * @return
 	 */
-	Page<WmScorePackage> listScorePackage(Page<WmScorePackage> page, @Param(Constants.WRAPPER) LambdaQueryWrapper<WmScorePackage> queryWrapper,
-										  @Param("acceptUser") String acceptUser);
+	Page<WmScorePackage> listScorePackage(Page<WmScorePackage> page, @Param(Constants.WRAPPER) QueryWrapper<WmScorePackage> queryWrapper,
+										  @Param("acceptUser") String acceptUser, @Param("relationScoreId") String relationScoreId);
 }

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

@@ -1503,12 +1503,23 @@
 		FROM wm_score_package p
 				 LEFT JOIN wm_score_package_status ps on ps.package_id = p.id and ps.status = 2
 				 LEFT JOIN sys_user u on u.user_id = ps.user_id
-		WHERE u.realname LIKE CONCAT('%',#{acceptUser},'%')
-		<if test="ew != null">
-			<if test="ew.nonEmptyOfWhere">
-				AND
+			<if test="relationScoreId != null">
+				LEFT JOIN wm_score_package p2 on p2.id = p.relation_score_id
 			</if>
-			${ew.sqlSegment}
-		</if>
+		<where>
+			<if test="acceptUser != null">
+				u.realname LIKE CONCAT('%',#{acceptUser},'%')
+			</if>
+			<if test="relationScoreId != null">
+				p2.score_package_name LIKE CONCAT('%',#{relationScoreId},'%')
+			</if>
+
+			<if test="ew != null">
+				<if test="ew.nonEmptyOfWhere">
+					AND
+				</if>
+				${ew.sqlSegment}
+			</if>
+		</where>
 	</select>
 </mapper>