From 0d0d50438d82311b7eb3ca93026943d8febbf8e5 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 31 Mar 2026 13:36:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E8=80=83=E8=AF=84=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluation/dto/CorpEvalPageQry.java | 2 +- .../dto/CorpEvalStatisticsPageQry.java | 1 + .../dto/CorpHiddenEvaluationPageQry.java | 2 + .../dto/HiddenEvaluationPageQry.java | 1 + .../dto/UserEvalStatisticsPageQry.java | 2 +- .../evaluation/domain/enums/MenuEnum.java | 64 +++++++++++++++++++ .../mapper/HiddenEvaluationRecordMapper.java | 16 +++-- .../HiddenEvaluationRecordRepositoryImpl.java | 26 ++++++-- 8 files changed, 104 insertions(+), 10 deletions(-) create mode 100644 web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/enums/MenuEnum.java diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/CorpEvalPageQry.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/CorpEvalPageQry.java index 4e0e150..7f1c6c3 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/CorpEvalPageQry.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/CorpEvalPageQry.java @@ -29,7 +29,7 @@ public class CorpEvalPageQry extends PageQuery { @ApiModelProperty(value = "企业名称") private String corpinfoName; - + private String menuPath; } diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/CorpEvalStatisticsPageQry.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/CorpEvalStatisticsPageQry.java index 29fa060..c56fe37 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/CorpEvalStatisticsPageQry.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/CorpEvalStatisticsPageQry.java @@ -22,5 +22,6 @@ public class CorpEvalStatisticsPageQry extends PageQuery { private String evaluationUserName; + private String menuPath; } diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/CorpHiddenEvaluationPageQry.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/CorpHiddenEvaluationPageQry.java index 48dcfde..31cc535 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/CorpHiddenEvaluationPageQry.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/CorpHiddenEvaluationPageQry.java @@ -31,5 +31,7 @@ public class CorpHiddenEvaluationPageQry extends PageQuery { @ApiModelProperty(value = "考评组成员名称") private String userName; + + private String menuPath; } diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/HiddenEvaluationPageQry.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/HiddenEvaluationPageQry.java index bca070c..9962aa2 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/HiddenEvaluationPageQry.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/HiddenEvaluationPageQry.java @@ -51,5 +51,6 @@ public class HiddenEvaluationPageQry extends PageQuery { @ApiModelProperty(value = "考评完成结束时间") private String completeEndTime; + private String menuPath; } diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/UserEvalStatisticsPageQry.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/UserEvalStatisticsPageQry.java index d745a35..0c3f925 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/UserEvalStatisticsPageQry.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/UserEvalStatisticsPageQry.java @@ -27,6 +27,6 @@ public class UserEvalStatisticsPageQry extends PageQuery { private List userIdList; - + private String menuPath; } diff --git a/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/enums/MenuEnum.java b/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/enums/MenuEnum.java new file mode 100644 index 0000000..0eb5568 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/enums/MenuEnum.java @@ -0,0 +1,64 @@ +package com.zcloud.hidden.evaluation.domain.enums; + +import lombok.Getter; + +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 菜单枚举 + */ +@Getter +public enum MenuEnum { + //分公司考评组配置 + GFDKPZPZ("/hiddenEvaluation/container/supervision/evaluationTeamConfig/list", "gfd-kpzpz"), + //分公司隐患考评 + GFDFGSYHKP("/hiddenEvaluation/container/supervision/hiddenEvaluation/list", "gfd-fgsyhkp"), + //人员考评管理 + GFDRYKPGL("/hiddenEvaluation/container/supervision/personnelEvaluation/list", "gfd-rykpgl"), + //分公司绩效考评 + GFDFGSJXKP("/hiddenEvaluation/container/supervision/performanceEvaluation/list", "gfd-fgsjxkp"), + + + //企业端 + //分公司隐患考评 + QYDYHKP("/hiddenEvaluation/container/enterprise/hiddenEvaluation/list", "qyd-yhkp"), + //人员考评管理 + QYDRYKPGL("/hiddenEvaluation/container/enterprise/personnelEvaluation/userExchangeList", "qyd-rykpgl"), + + ; + + private final String path; + private final String menuKey; + + private static final Map PATH_MAP = + Arrays.stream(values()) + .collect(Collectors.toMap(MenuEnum::getPath, Function.identity())); + + MenuEnum(String path, String menuKey) { + this.path = path; + this.menuKey = menuKey; + } + + public String getPath() { + return path; + } + + public String getMenuKey() { + return menuKey; + } + + // 通过name获取枚举 + public static MenuEnum getByPath(String path) { + return PATH_MAP.get(path); + } + + // 通过path获取age + public static String getMenuKeyByPath(String path) { + MenuEnum entry = PATH_MAP.get(path); + return entry != null ? entry.getMenuKey() : null; + } + +} diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/HiddenEvaluationRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/HiddenEvaluationRecordMapper.java index 48cf42c..5fe797c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/HiddenEvaluationRecordMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/HiddenEvaluationRecordMapper.java @@ -2,6 +2,8 @@ package com.zcloud.hidden.evaluation.persistence.mapper; 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.hidden.evaluation.persistence.dataobject.*; import org.apache.ibatis.annotations.Mapper; @@ -14,18 +16,24 @@ import java.util.Map; * @Date 2026-03-25 10:36:44 */ @Mapper +@DataScopes({ + @DataScope(method = "corpHidddenPage", menuPerms = ""), + @DataScope(method = "corpEvalStatisticsPage", menuPerms = ""), + @DataScope(method = "userEvalStatisticsPage", menuPerms = ""), + @DataScope(method = "corpEvalPage", menuPerms = ""), +}) public interface HiddenEvaluationRecordMapper extends BaseMapper { - IPage corpHidddenPage(IPage iPage, Map params); + IPage corpHidddenPage(IPage iPage, Map params, String menuPerms); IPage hidddenPage(IPage iPage, Map params); - IPage corpEvalStatisticsPage(IPage iPage, Map params); + IPage corpEvalStatisticsPage(IPage iPage, Map params, String menuPerms); - IPage userEvalStatisticsPage(IPage iPage, Map params); + IPage userEvalStatisticsPage(IPage iPage, Map params, String menuPerms); IPage hidddenEvalPage(IPage iPage, Map params); - IPage corpEvalPage(IPage iPage, Map params); + IPage corpEvalPage(IPage iPage, Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/HiddenEvaluationRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/HiddenEvaluationRecordRepositoryImpl.java index 0856670..7cb27c4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/HiddenEvaluationRecordRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/HiddenEvaluationRecordRepositoryImpl.java @@ -7,6 +7,7 @@ import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; +import com.zcloud.hidden.evaluation.domain.enums.MenuEnum; import com.zcloud.hidden.evaluation.domain.model.HiddenEvaluationRecordE; import com.zcloud.hidden.evaluation.persistence.dataobject.*; import com.zcloud.hidden.evaluation.persistence.mapper.HiddenEvaluationRecordMapper; @@ -41,13 +42,18 @@ public class HiddenEvaluationRecordRepositoryImpl extends BaseRepositoryImpl corpHidddenPage(Map params) { IPage iPage = new Query().getPage(params); - IPage result = hiddenEvaluationRecordMapper.corpHidddenPage(iPage, params); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = hiddenEvaluationRecordMapper.corpHidddenPage(iPage, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } @Override public PageResponse hidddenPage(Map params) { IPage iPage = new Query().getPage(params); + IPage result = hiddenEvaluationRecordMapper.hidddenPage(iPage, params); return PageHelper.pageToResponse(result, result.getRecords()); } @@ -62,14 +68,22 @@ public class HiddenEvaluationRecordRepositoryImpl extends BaseRepositoryImpl corpEvalStatisticsPage(Map params) { IPage iPage = new Query().getPage(params); - IPage result = hiddenEvaluationRecordMapper.corpEvalStatisticsPage(iPage, params); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = hiddenEvaluationRecordMapper.corpEvalStatisticsPage(iPage, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } @Override public PageResponse userEvalStatisticsPage(Map params) { IPage iPage = new Query().getPage(params); - IPage result = hiddenEvaluationRecordMapper.userEvalStatisticsPage(iPage, params); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = hiddenEvaluationRecordMapper.userEvalStatisticsPage(iPage, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } @@ -92,7 +106,11 @@ public class HiddenEvaluationRecordRepositoryImpl extends BaseRepositoryImpl corpEvalPage(Map params) { IPage iPage = new Query().getPage(params); - IPage result = hiddenEvaluationRecordMapper.corpEvalPage(iPage, params); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = hiddenEvaluationRecordMapper.corpEvalPage(iPage, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } }