feat: 积分包查询列表-接单对象acceptUser模糊查询

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

@@ -2530,6 +2530,8 @@ public class WmScorePackageController {
 
 	/**
 	 * 分配积分列表查询--派工平台
+	 *
+	 * @param acceptUser 接单对象，模糊查询
 	 */
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/getScorePackagePage")
@@ -2541,7 +2543,8 @@ 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 = "monthEnd", required = false) String monthEnd,
+								 @RequestParam(value = "acceptUser", required = false) String acceptUser
 	) {
 
 		Integer sendDeptId = SecurityUtils.getUser().getDeptId();
@@ -2586,8 +2589,14 @@ public class WmScorePackageController {
 			}
 		}
 
-		Page<WmScorePackage> wmScorePackagePage = wmScorePackageMapper.selectPage(new Page<>(current, size), queryWrapper
-				.orderByDesc(WmScorePackage::getCreateTime));
+		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
+					.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,10 @@
 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;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageApiOutput;
@@ -143,4 +146,15 @@ public interface WmScorePackageMapper extends DataScopeMapper<WmScorePackage> {
 	 * @return
 	 */
 	List<WmScorePackageSettleOutput> listAllPackageSettle(@Param("query")WmScorePackageSettleInput input);
+
+	/**
+	 * 积分包列表查询-单独处理有acceptUser条件的情况
+	 *
+	 * @param page
+	 * @param queryWrapper
+	 * @param acceptUser
+	 * @return
+	 */
+	Page<WmScorePackage> listScorePackage(Page<WmScorePackage> page, @Param(Constants.WRAPPER) LambdaQueryWrapper<WmScorePackage> queryWrapper,
+										  @Param("acceptUser") String acceptUser);
 }

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

@@ -1496,4 +1496,19 @@
 		ORDER BY
 		p.create_time DESC
 	</select>
+
+	<!-- 积分包列表查询 -->
+	<select id="listScorePackage" resultType="com.qunzhixinxi.hnqz.admin.entity.WmScorePackage">
+		SELECT p.*
+		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>
+			${ew.sqlSegment}
+		</if>
+	</select>
 </mapper>