From 0a18d191e0ec670c8a5843e531b9c5d08e0578a9 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 27 Mar 2026 11:08:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/project/KeyProjectPageQry.java | 2 ++ .../key/project/domain/enums/MenuEnum.java | 30 +++++++++++-------- .../persistence/mapper/KeyProjectMapper.java | 8 ++--- .../project/KeyProjectRepositoryImpl.java | 13 ++++---- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java index a75eda0..458bea6 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java @@ -73,5 +73,7 @@ public class KeyProjectPageQry extends PageQuery { //相关方单位负责人id @ApiModelProperty(value = "相关方单位负责人id") private Long xgfMasterUserId; + + private String menuPath; } diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/enums/MenuEnum.java b/web-domain/src/main/java/com/zcloud/key/project/domain/enums/MenuEnum.java index 880fca6..6ab792d 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/enums/MenuEnum.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/enums/MenuEnum.java @@ -12,22 +12,28 @@ import java.util.stream.Collectors; */ @Getter public enum MenuEnum { - //领域部门 - LYBMGL("/domain/container/supervision/domainDepartment", "lybmgl"), - //领域组 - LYZGL("/domain/container/supervision/domainGroup", "lyzgl"), - //课题任务管理 - GFDKTRW("/domain/container/supervision/projectTask/list", "gfd-ktrw"), - //课题评分管理 - GFDKTPF("/domain/container/supervision/projectScore", "gfd-ktpf"), + //监管端 + //重点作业情况统计 + JGDZDZYQKTJ("/keyProject/container/supervision/keyStats/list", "jgd-zdzyqktj"), + //重点作业管理 + JGDZDZYGL("/keyProject/container/supervision/keyProjectManage/keyProjectManage/list", "jgd-zdzygl"), + //重点作业确认 + JGDZDZYQR("/keyProject/container/supervision/keyProjectManage/keyProjectConfirm/list", "jgd-zdzyqr"), + //企业端 - //课题任务管理 - QYDKTRW("/domain/container/branchCompany/projectTask/list", "qyd-ktrw"), - //课题评分管理 - QYDKTPF("/domain/container/branchCompany/projectScore", "qyd-ktpf"), + //重点作业情况统计 + QYDZDZYQKTJ("/keyProject/container/branchCompany/keyStats/list", "qyd-zdzyqktj"), + //重点作业管理 + QYDZDZYGL("/keyProject/container/branchCompany/keyProjectManage/keyProjectManage/list", "qyd-zdzygl"), + //重点作业确认 + QYDZDZYQR("/keyProject/container/branchCompany/keyProjectManage/keyProjectConfirm/list", "qyd-zdzyqr"), + //相关方 + //重点作业情况统计 + XGFZDZYQKTJ("/keyProject/container/stakeholder/keyStats/list", "xgf-zdzyqktj"), + XGFZDZYSQ("/keyProject/container/stakeholder/keyProjectApple/list", "xgf-zdzysq"), ; private final String path; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java index 575ead3..c810a68 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java @@ -19,10 +19,10 @@ import java.util.Map; * @Date 2026-03-16 10:00:38 */ @Mapper -//@DataScopes({ -// @DataScope(method = "listPage", menuPerms = ""), -// @DataScope(method = "pageConfirm", menuPerms = ""), -//}) +@DataScopes({ + @DataScope(method = "listPage", menuPerms = ""), + @DataScope(method = "pageConfirm", menuPerms = ""), +}) public interface KeyProjectMapper extends BaseMapper { IPage listPage(IPage iPage, Map params, String menuPerms); diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java index 665f3d0..d168925 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java @@ -5,6 +5,7 @@ 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.gbscommon.utils.Query; +import com.zcloud.key.project.domain.enums.MenuEnum; import com.zcloud.key.project.persistence.dataobject.project.CorpStatisticsDO; import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; import com.zcloud.key.project.persistence.dataobject.project.KeyProjectStatisticsDO; @@ -31,9 +32,9 @@ public class KeyProjectRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { IPage iPage = new Query().getPage(params); String menuPerms = ""; -// if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ -// menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); -// } + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } IPage result = keyProjectMapper.listPage(iPage, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } @@ -42,9 +43,9 @@ public class KeyProjectRepositoryImpl extends BaseRepositoryImpl pageConfirm(Map params) { IPage iPage = new Query().getPage(params); String menuPerms = ""; -// if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ -// menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); -// } + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } IPage result = keyProjectMapper.pageConfirm(iPage, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); }