From 4b35b69771432f970decd57bd8201d61a3b08887 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 27 三月 2025 10:01:43 +0800
Subject: [PATCH] 最大号字典维护

---
 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
index 95f48c8..03ff167 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
@@ -7,8 +7,10 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.by4cloud.platformx.common.core.util.R;
 import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.device.constant.MaxSizeContant;
 import com.by4cloud.platformx.device.entity.DeviceDemandPlan;
 import com.by4cloud.platformx.device.service.DeviceDemandPlanService;
+import com.by4cloud.platformx.device.service.JcMaxSizeService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -36,6 +38,7 @@
 public class DeviceDemandPlanController {
 
     private final  DeviceDemandPlanService deviceDemandPlanService;
+    private final JcMaxSizeService maxSizeService;
 
     /**
      * 鍒嗛〉鏌ヨ
@@ -43,12 +46,14 @@
      * @param deviceDemandPlan 璁惧闇�姹傝鍒掍富琛�
      * @return
      */
-    @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+    @Operation(summary = "鏈崟浣嶅垎椤垫煡璇�" , description = "鏈崟浣嶅垎椤垫煡璇�" )
     @GetMapping("/page" )
-    @PreAuthorize("@pms.hasPermission('platformx_deviceDemandPlan_view')" )
     public R getDeviceDemandPlanPage(@ParameterObject Page page, @ParameterObject DeviceDemandPlan deviceDemandPlan) {
         LambdaQueryWrapper<DeviceDemandPlan> wrapper = Wrappers.lambdaQuery();
-        return R.ok(deviceDemandPlanService.page(page, wrapper));
+		wrapper.eq(deviceDemandPlan.getDeclareCompId() !=null,DeviceDemandPlan::getDeclareCompId,deviceDemandPlan.getDeclareCompId());
+		wrapper.eq(deviceDemandPlan.getReleasePerson() !=null,DeviceDemandPlan::getReleasePerson,deviceDemandPlan.getReleasePerson());
+		wrapper.eq(deviceDemandPlan.getYear() !=null,DeviceDemandPlan::getYear,deviceDemandPlan.getYear());
+        return R.ok(deviceDemandPlanService.pageByScope(page, wrapper));
     }
 
 
@@ -74,6 +79,7 @@
     @PostMapping
     @PreAuthorize("@pms.hasPermission('platformx_deviceDemandPlan_add')" )
     public R save(@RequestBody DeviceDemandPlan deviceDemandPlan) {
+		deviceDemandPlan.setNumber(maxSizeService.nextNo(MaxSizeContant.PLAN_NUM));
         return R.ok(deviceDemandPlanService.save(deviceDemandPlan));
     }
 

--
Gitblit v1.9.1