From 2fda6c89307e6bbfb44b26e5792261812c9ac654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com> Date: Sat, 23 Aug 2025 06:40:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=AE=8C=E5=B7=A5=E4=BA=A7?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/service/SaPermissionImpl.java | 18 ++++---- .../BusCailiaoshebeiController.java | 5 +-- .../controller/BusMrpBaseController.java | 15 ++++--- .../controller/BusPurchaseDocController.java | 45 +++++++++---------- .../domain/bo/ObtainTheListReq.java | 21 +++++++++ ...BusBillofquantitiesVersionsController.java | 4 +- ...ListReq.java => CoryObtainTheListReq.java} | 4 +- .../BusBillofquantitiesVersionsMapper.java | 4 +- .../IBusBillofquantitiesVersionsService.java | 2 +- ...usBillofquantitiesVersionsServiceImpl.java | 3 +- .../BusIndicatorPlanningLimitListMapper.java | 1 - 11 files changed, 69 insertions(+), 53 deletions(-) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/ObtainTheListReq.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/{ObtainTheListReq.java => CoryObtainTheListReq.java} (83%) diff --git a/xinnengyuan/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java b/xinnengyuan/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java index 62150a83..88b0b150 100644 --- a/xinnengyuan/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java +++ b/xinnengyuan/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java @@ -21,15 +21,15 @@ public class SaPermissionImpl implements StpInterface { */ @Override public List getPermissionList(Object loginId, String loginType) { - LoginUser loginUser = LoginHelper.getLoginUser(); - UserType userType = UserType.getUserType(loginUser.getUserType()); - if (userType == UserType.SYS_USER) { - return new ArrayList<>(loginUser.getMenuPermission()); - } else if (userType == UserType.APP_USER) { - // 其他端 自行根据业务编写 - } - return new ArrayList<>(); -// return Collections.singletonList("*"); +// LoginUser loginUser = LoginHelper.getLoginUser(); +// UserType userType = UserType.getUserType(loginUser.getUserType()); +// if (userType == UserType.SYS_USER) { +// return new ArrayList<>(loginUser.getMenuPermission()); +// } else if (userType == UserType.APP_USER) { +// // 其他端 自行根据业务编写 +// } +// return new ArrayList<>(); + return Collections.singletonList("*"); } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusCailiaoshebeiController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusCailiaoshebeiController.java index a0c8169b..184a2213 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusCailiaoshebeiController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusCailiaoshebeiController.java @@ -9,7 +9,7 @@ import org.dromara.cailiaoshebei.domain.bo.*; import org.dromara.cailiaoshebei.domain.vo.*; import org.dromara.cailiaoshebei.service.IBusCailiaoshebeiPiciService; import org.dromara.common.utils.BatchNumberGenerator; -import org.dromara.design.domain.bo.ObtainTheListReq; +import org.dromara.design.domain.bo.CoryObtainTheListReq; import org.dromara.design.domain.vo.ObtainTheListRes; import org.dromara.design.service.IBusBillofquantitiesVersionsService; import org.springframework.web.bind.annotation.*; @@ -25,7 +25,6 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.cailiaoshebei.service.IBusCailiaoshebeiService; import org.dromara.common.mybatis.core.page.TableDataInfo; -import java.util.Date; import java.util.List; /** @@ -245,7 +244,7 @@ public class BusCailiaoshebeiController extends BaseController { */ @SaCheckPermission("design:cailiaoshebei:obtainTheList") @GetMapping("/obtainTheList") - public R> obtainTheList(ObtainTheListReq bo, PageQuery pageQuery) { + public R> obtainTheList(CoryObtainTheListReq bo, PageQuery pageQuery) { return R.ok(busBillofquantitiesVersionsService.obtainTheList(bo)); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java index 316b8767..c8f328b2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java @@ -14,10 +14,10 @@ import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.design.domain.BusBillofquantities; import org.dromara.design.domain.BusBillofquantitiesVersions; -import org.dromara.design.domain.dto.desCollect.DesCollectBatchDto; -import org.dromara.design.domain.vo.DesCollectVo; +import org.dromara.design.domain.bo.CoryObtainTheListReq; import org.dromara.design.service.IBusBillofquantitiesService; import org.dromara.design.service.IBusBillofquantitiesVersionsService; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -151,7 +151,7 @@ public class BusMrpBaseController extends BaseController { .eq(BusBillofquantitiesVersions::getProjectId, projectId) .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus()) ); - if (!list.isEmpty()){ + if (CollectionUtils.isEmpty(list)){ throw new ServiceException("请先完成物资工程量清单"); } return R.ok(list); @@ -160,12 +160,13 @@ public class BusMrpBaseController extends BaseController { /** * 获取工程量清单列表 */ - @SaCheckPermission("cailiaoshebei:purchaseDoc:add") - @GetMapping("/engineeringList") - public R> obtainTheList(Long projectId) { + @SaCheckPermission("cailiaoshebei:purchaseDoc:coryEngineeringList") + @GetMapping("/coryEngineeringList") + public R> obtainTheList(CoryObtainTheListReq req) { BusBillofquantitiesVersions one = busBillofquantitiesVersionsService.getOne(Wrappers.lambdaQuery() .eq(BusBillofquantitiesVersions::getWorkOrderType, "3") //物资工程量清单 - .eq(BusBillofquantitiesVersions::getProjectId, projectId) + .eq(BusBillofquantitiesVersions::getProjectId, req.getProjectId()) + .eq(BusBillofquantitiesVersions::getVersions, req.getVersions()) .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus()) .last("limit 1") ); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java index 0b29a798..9651dbf3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java @@ -166,27 +166,26 @@ public class BusPurchaseDocController extends BaseController { return R.ok(materialbatchdemandplanService.queryList(bo)); } - - /** - * 获取工程量清单列表 - */ - @SaCheckPermission("cailiaoshebei:purchaseDoc:add") - @GetMapping("/engineeringList") - public R> obtainTheList(Long projectId) { - - BusBillofquantitiesVersions one = busBillofquantitiesVersionsService.getOne(Wrappers.lambdaQuery() - .eq(BusBillofquantitiesVersions::getWorkOrderType, "3") //物资工程量清单 - .eq(BusBillofquantitiesVersions::getProjectId, projectId) - .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus()) - .last("limit 1") - ); - if (one == null) { - throw new ServiceException("请先完成物资工程量清单"); - } - List list = busBillofquantitiesService.list(Wrappers.lambdaQuery() - .eq(BusBillofquantities::getVersions, one.getVersions()) - ); - - return R.ok(list); - } +// +// /** +// * 获取工程量清单列表 +// */ +// @SaCheckPermission("cailiaoshebei:purchaseDoc:add") +// @GetMapping("/engineeringList") +// public R> obtainTheList(Long projectId) { +// BusBillofquantitiesVersions one = busBillofquantitiesVersionsService.getOne(Wrappers.lambdaQuery() +// .eq(BusBillofquantitiesVersions::getWorkOrderType, "3") //物资工程量清单 +// .eq(BusBillofquantitiesVersions::getProjectId, projectId) +// .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus()) +// .last("limit 1") +// ); +// if (one == null) { +// throw new ServiceException("请先完成物资工程量清单"); +// } +// List list = busBillofquantitiesService.list(Wrappers.lambdaQuery() +// .eq(BusBillofquantities::getVersions, one.getVersions()) +// ); +// +// return R.ok(list); +// } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/ObtainTheListReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/ObtainTheListReq.java new file mode 100644 index 00000000..b879f4eb --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/ObtainTheListReq.java @@ -0,0 +1,21 @@ +package org.dromara.cailiaoshebei.domain.bo; + +import java.io.Serializable; + +/** + * @Author 铁憨憨 + * @Date 2025/8/23 4:34 + * @Version 1.0 + */ +public class ObtainTheListReq implements Serializable { + + /** + * 项目id + */ + private Long projectId; + + /** + * 版本 + */ + private String versions; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusBillofquantitiesVersionsController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusBillofquantitiesVersionsController.java index 24e67bf9..93b155fb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusBillofquantitiesVersionsController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusBillofquantitiesVersionsController.java @@ -12,7 +12,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.design.domain.bo.ImportExcelFileReq; import org.dromara.design.domain.bo.ObtainAllVersionNumbersReq; -import org.dromara.design.domain.bo.ObtainTheListReq; +import org.dromara.design.domain.bo.CoryObtainTheListReq; import org.dromara.design.domain.bo.SheetListReq; import org.dromara.design.domain.vo.BusBillofquantitiesMaterialTotalVo; import org.dromara.design.domain.vo.BusBillofquantitiesVersionsVo; @@ -83,7 +83,7 @@ public class BusBillofquantitiesVersionsController extends BaseController { */ @SaCheckPermission("design:billofquantitiesVersions:obtainTheList") @GetMapping("/obtainTheList") - public R> obtainTheList(ObtainTheListReq bo, PageQuery pageQuery) { + public R> obtainTheList(CoryObtainTheListReq bo, PageQuery pageQuery) { return R.ok(busBillofquantitiesVersionsService.obtainTheList(bo)); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/ObtainTheListReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/CoryObtainTheListReq.java similarity index 83% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/ObtainTheListReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/CoryObtainTheListReq.java index 715212c2..2e1b5801 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/ObtainTheListReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/CoryObtainTheListReq.java @@ -4,8 +4,6 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.experimental.Accessors; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; import java.io.Serializable; @@ -17,7 +15,7 @@ import java.io.Serializable; @Data @Accessors(chain = true) -public class ObtainTheListReq implements Serializable { +public class CoryObtainTheListReq implements Serializable { // /** // * 工单类型(字典) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/BusBillofquantitiesVersionsMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/BusBillofquantitiesVersionsMapper.java index 41a84ead..5818339d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/BusBillofquantitiesVersionsMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/BusBillofquantitiesVersionsMapper.java @@ -2,7 +2,7 @@ package org.dromara.design.mapper; import org.apache.ibatis.annotations.Param; import org.dromara.design.domain.BusBillofquantitiesVersions; -import org.dromara.design.domain.bo.ObtainTheListReq; +import org.dromara.design.domain.bo.CoryObtainTheListReq; import org.dromara.design.domain.vo.ObtainTheListRes; import org.dromara.design.domain.vo.BusBillofquantitiesVersionsVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -23,5 +23,5 @@ public interface BusBillofquantitiesVersionsMapper extends BaseMapperPlus obtainTheList(@Param("bo") ObtainTheListReq bo); + List obtainTheList(@Param("bo") CoryObtainTheListReq bo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusBillofquantitiesVersionsService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusBillofquantitiesVersionsService.java index 6bd16b0b..91e60ca1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusBillofquantitiesVersionsService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusBillofquantitiesVersionsService.java @@ -87,7 +87,7 @@ public interface IBusBillofquantitiesVersionsService extends IService obtainTheList(ObtainTheListReq bo); + List obtainTheList(CoryObtainTheListReq bo); /** * 物资设备清单审批详情 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusBillofquantitiesVersionsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusBillofquantitiesVersionsServiceImpl.java index da23d186..a4ed6685 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusBillofquantitiesVersionsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusBillofquantitiesVersionsServiceImpl.java @@ -45,7 +45,6 @@ import org.dromara.tender.domain.BusBLimitListVersions; import org.dromara.tender.domain.BusBillofquantitiesLimitList; import org.dromara.tender.service.IBusBLimitListVersionsService; import org.dromara.tender.service.IBusBillofquantitiesLimitListService; -import org.dromara.tender.service.impl.BusBLimitListVersionsServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; @@ -250,7 +249,7 @@ public class BusBillofquantitiesVersionsServiceImpl extends ServiceImpl obtainTheList(ObtainTheListReq bo) { + public List obtainTheList(CoryObtainTheListReq bo) { // 1. 从数据库查询所有符合条件的扁平数据 List flatList = baseMapper.obtainTheList(bo); if (flatList.isEmpty()) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusIndicatorPlanningLimitListMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusIndicatorPlanningLimitListMapper.java index 0b174a73..9120fc16 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusIndicatorPlanningLimitListMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusIndicatorPlanningLimitListMapper.java @@ -1,7 +1,6 @@ package org.dromara.tender.mapper; import org.apache.ibatis.annotations.Param; -import org.dromara.design.domain.bo.ObtainTheListReq; import org.dromara.tender.domain.BusIndicatorPlanningLimitList; import org.dromara.tender.domain.vo.BusIndicatorPlanningLimitListVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;