Merge branch 'feat-20230510-querycondition3'

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

@@ -2560,7 +2560,8 @@ public class WmScorePackageController {
 								 @RequestParam(value = "monthStart", required = false) String monthStart,
 								 @RequestParam(value = "monthEnd", required = false) String monthEnd,
 								 @RequestParam(value = "acceptUser", required = false) String acceptUser,
-								 @RequestParam(value = "relationScoreId", required = false) String relationScoreId
+								 @RequestParam(value = "relationScoreId", required = false) String relationScoreId,
+								 @RequestParam(value = "toApproval", required = false) Boolean toApproval
 	) {
 
 		Integer sendDeptId = SecurityUtils.getUser().getDeptId();
@@ -2614,7 +2615,7 @@ public class WmScorePackageController {
 //		if (StrUtil.isNotBlank(acceptUser) || StrUtil.isNotBlank(relationScoreId)) {
 			// 带有接单对象acceptUser模糊查询的查询
 			wmScorePackagePage = wmScorePackageMapper.listScorePackage(new Page<>(current, size),
-					queryWrapper.orderByDesc("p.create_time"), acceptUser, relationScoreId);
+					queryWrapper.orderByDesc("p.create_time"), acceptUser, relationScoreId, toApproval);
 //		} else {
 //			wmScorePackagePage = wmScorePackageMapper.selectPage(new Page<>(current, size), queryWrapper
 //					.orderByDesc("p.create_time"));
@@ -2655,7 +2656,6 @@ public class WmScorePackageController {
 	 * 积分包列表（结算包管理列表、无团队限制）
 	 *
 	 * @param packageType1 多个逗号分隔
-	 * @param acceptUser 接单对象，模糊查询
 	 */
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/page-settle-package")

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

@@ -179,5 +179,6 @@ public interface WmScorePackageMapper extends DataScopeMapper<WmScorePackage> {
 	 * @return
 	 */
 	Page<WmScorePackage> listScorePackage(Page<WmScorePackage> page, @Param(Constants.WRAPPER) QueryWrapper<WmScorePackage> queryWrapper,
-										  @Param("acceptUser") String acceptUser, @Param("relationScoreId") String relationScoreId);
+										  @Param("acceptUser") String acceptUser, @Param("relationScoreId") String relationScoreId,
+										  @Param("toApproval") Boolean toApproval);
 }

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

@@ -1613,7 +1613,7 @@
 
 	<!-- 积分包列表查询 -->
 	<select id="listScorePackage" resultType="com.qunzhixinxi.hnqz.admin.entity.WmScorePackage">
-		SELECT p.*
+		SELECT distinct p.*
 		FROM wm_score_package p
 			<if test="acceptUser != null">
 				 LEFT JOIN wm_score_package_status ps on ps.package_id = p.id and ps.status = 2
@@ -1622,12 +1622,18 @@
 			<if test="relationScoreId != null">
 				LEFT JOIN wm_score_package p2 on p2.id = p.relation_score_id
 			</if>
+			<if test="toApproval != null and toApproval == true">
+				LEFT JOIN wm_task t on t.score_package_id = p.id
+			</if>
 		<where>
 			<if test="acceptUser != null">
-				u.realname LIKE CONCAT('%',#{acceptUser},'%')
+				AND u.realname LIKE CONCAT('%',#{acceptUser},'%')
 			</if>
 			<if test="relationScoreId != null">
-				p2.score_package_name LIKE CONCAT('%',#{relationScoreId},'%')
+				AND p2.score_package_name LIKE CONCAT('%',#{relationScoreId},'%')
+			</if>
+			<if test="toApproval != null and toApproval == true">
+				AND t.task_status = 2
 			</if>
 
 			<if test="ew != null">