diff --git a/web-client/src/main/java/com/zcloud/edu/dto/study/ClassPageQry.java b/web-client/src/main/java/com/zcloud/edu/dto/study/ClassPageQry.java index eb46166..dc6bee0 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/study/ClassPageQry.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/study/ClassPageQry.java @@ -36,6 +36,7 @@ public class ClassPageQry extends PageQuery { private String phone; private String signFlag; private String examination; + private String menuPath; } diff --git a/web-client/src/main/java/com/zcloud/edu/dto/study/StudentPageQry.java b/web-client/src/main/java/com/zcloud/edu/dto/study/StudentPageQry.java index bdf8e02..6e3f5fa 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/study/StudentPageQry.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/study/StudentPageQry.java @@ -31,5 +31,6 @@ public class StudentPageQry extends PageQuery { private String likeClassName; private Integer state; private String phone; + private String menuPath; } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/archives/ArchivesPdfFileMapper.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/archives/ArchivesPdfFileMapper.java index d009dd6..97abbce 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/archives/ArchivesPdfFileMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/archives/ArchivesPdfFileMapper.java @@ -1,8 +1,14 @@ package com.zcloud.edu.persistence.mapper.archives; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.datascope.annotation.DataScope; +import com.jjb.saas.framework.datascope.annotation.DataScopes; import com.zcloud.edu.persistence.dataobject.archives.ArchivesPdfFileDO; +import com.zcloud.edu.persistence.dataobject.study.ClassDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * web-infrastructure @@ -11,7 +17,10 @@ import org.apache.ibatis.annotations.Mapper; * @Date 2026-02-02 10:32:42 */ @Mapper +@DataScopes({ + @DataScope(method = "listPage", menuPerms = "") +}) public interface ArchivesPdfFileMapper extends BaseMapper { - + IPage listPage(IPage page, @Param("ew") QueryWrapper queryWrapper, @Param("menuPerms") String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/ClassMapper.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/ClassMapper.java index 2d20ee0..1cab8f5 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/ClassMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/ClassMapper.java @@ -3,6 +3,8 @@ package com.zcloud.edu.persistence.mapper.study; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.datascope.annotation.DataScope; +import com.jjb.saas.framework.datascope.annotation.DataScopes; import com.zcloud.edu.persistence.dataobject.study.ClassDO; import com.zcloud.edu.persistence.dataobject.study.StudentDO; import com.zcloud.edu.persistence.mapper.po.study.ClassQuestionPO; @@ -20,9 +22,12 @@ import java.util.Map; * @Date 2026-01-13 14:18:12 */ @Mapper +@DataScopes({ + @DataScope(method = "listPage", menuPerms = "") +}) public interface ClassMapper extends BaseMapper { - IPage listPage(IPage page, @Param("ew") QueryWrapper queryWrapper, String menuPerms); + IPage listPage(IPage page, @Param("ew") QueryWrapper queryWrapper,@Param("menuPerms") String menuPerms); List listStatistics(@Param("ew") QueryWrapper queryWrapper, String menuPerms); IPage listStuClassPage(IPage page, @Param("params") Map params, String menuPerms); diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/archives/ArchivesPdfFileRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/archives/ArchivesPdfFileRepositoryImpl.java index 0ece7d1..0efb425 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/archives/ArchivesPdfFileRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/archives/ArchivesPdfFileRepositoryImpl.java @@ -7,6 +7,7 @@ import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.edu.domain.enums.MenuEnum; import com.zcloud.edu.persistence.dataobject.archives.ArchivesPdfFileDO; import com.zcloud.edu.persistence.mapper.archives.ArchivesPdfFileMapper; import com.zcloud.edu.persistence.repository.archives.ArchivesPdfFileRepository; @@ -14,6 +15,7 @@ import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; import java.util.Map; @@ -36,7 +38,12 @@ public class ArchivesPdfFileRepositoryImpl extends BaseRepositoryImpl result = archivesPdfFileMapper.selectPage(iPage, queryWrapper); + + String menuPerms = ""; + if (!ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = archivesPdfFileMapper.listPage(iPage, queryWrapper, menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/ClassRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/ClassRepositoryImpl.java index 557b877..7c465e2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/ClassRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/ClassRepositoryImpl.java @@ -51,7 +51,7 @@ public class ClassRepositoryImpl extends BaseRepositoryImpl queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params,"c."); - queryWrapper.orderByAsc("c.state").orderByDesc("c.create_time"); + queryWrapper.eq("c.delete_enum","FALSE"); diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/StudentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/StudentRepositoryImpl.java index a9e32c7..d2146e1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/StudentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/StudentRepositoryImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.edu.domain.enums.MenuEnum; import com.zcloud.edu.persistence.dataobject.study.ClassDO; import com.zcloud.edu.persistence.dataobject.study.StudentDO; import com.zcloud.edu.persistence.mapper.po.study.StudentCountPO; @@ -43,10 +44,14 @@ public class StudentRepositoryImpl extends BaseRepositoryImpl personnelFileListPage(Map params) { IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByDesc("create_time"); - IPage result = studentMapper.selectPage(iPage, queryWrapper); +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); +// queryWrapper.orderByDesc("create_time"); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = studentMapper.personnelFileListPage(iPage, params, menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/resources/mapper/archives/ArchivesPdfFileMapper.xml b/web-infrastructure/src/main/resources/mapper/archives/ArchivesPdfFileMapper.xml index 08b09af..4884d9c 100644 --- a/web-infrastructure/src/main/resources/mapper/archives/ArchivesPdfFileMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/archives/ArchivesPdfFileMapper.xml @@ -4,5 +4,15 @@ + diff --git a/web-infrastructure/src/main/resources/mapper/study/ClassMapper.xml b/web-infrastructure/src/main/resources/mapper/study/ClassMapper.xml index 2dae8d7..0ed7853 100644 --- a/web-infrastructure/src/main/resources/mapper/study/ClassMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/study/ClassMapper.xml @@ -83,7 +83,7 @@ c.corpinfo_id, ci.corp_name, CASE - WHEN state = 1 THEN 1 + WHEN c.state = 1 THEN 1 + left join student s on s.class_id = c.class_id and s.delete_enum = 'FALSE' + + where c.delete_enum = 'FALSE' + + AND ${ew.sqlSegment} + + group by c.id + ORDER BY c.state ASC, c.create_time DESC - +