Merge branch 'master' of http://gogs.gisvg.com/YDM/graduate

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java

@@ -816,7 +816,7 @@ public class UserController {
         }
         pageReqVO.setGrade(project.getStudentGrade());
         pageReqVO.setUserType("1");
-        List<StudentProjectRespVO> list =userService.getPassedStudentsPage(pageReqVO,project.getId()).getList();
+        List<StudentProjectRespVO> list =userService.getUnPassedStudentsPage(pageReqVO,project.getId()).getList();
         // 导出 Excel
         ExcelUtils.write(response, "今年项目学生未通过的名单.xls", "数据", studentUnPassedExportRespVO.class,
                 BeanUtils.toBean(list, studentUnPassedExportRespVO.class));

yudao-module-system/yudao-module-system-biz/src/main/resources/Mapper/user/AdminUserMapper.xml

@@ -517,17 +517,6 @@
             <when test="isPassed == 1">IN (2, 4)</when>
         </choose>
 
-        AND (
-        <if test="reqVO.selectStatus != null">
-            CASE
-            WHEN #{reqVO.selectStatus} = 4 THEN COALESCE(MAX(CASE WHEN r.select_type = 4 THEN 1 ELSE 0 END), 0) = 1
-            WHEN #{reqVO.selectStatus} = 2 THEN COALESCE(MAX(CASE WHEN r.select_type = 2 THEN 1 ELSE 0 END), 0) = 1
-            WHEN #{reqVO.selectStatus} = 1 THEN COALESCE(MAX(CASE WHEN r.select_type = 1 THEN 1 ELSE 0 END), 0) = 1
-            WHEN #{reqVO.selectStatus} = 0 THEN COALESCE(MAX(CASE WHEN r.select_type = 0 THEN 1 ELSE 0 END), 0) = 1
-            END
-        </if>
-        )
-
         ORDER BY
         a.id DESC
 
@@ -596,16 +585,7 @@
             <when test="isPassed == 0">IN (0, 1)</when>
             <when test="isPassed == 1">IN (2, 4)</when>
         </choose>
-        AND (
-        <if test="reqVO.selectStatus != null">
-            CASE
-            WHEN #{reqVO.selectStatus} = 4 THEN COALESCE(MAX(CASE WHEN r.select_type = 4 THEN 1 ELSE 0 END), 0) = 1
-            WHEN #{reqVO.selectStatus} = 2 THEN COALESCE(MAX(CASE WHEN r.select_type = 2 THEN 1 ELSE 0 END), 0) = 1
-            WHEN #{reqVO.selectStatus} = 1 THEN COALESCE(MAX(CASE WHEN r.select_type = 1 THEN 1 ELSE 0 END), 0) = 1
-            WHEN #{reqVO.selectStatus} = 0 THEN COALESCE(MAX(CASE WHEN r.select_type = 0 THEN 1 ELSE 0 END), 0) = 1
-            END
-        </if>
-        )
+
         ) AS subquery;
     </select>