From 156dbab600d7727c13790e8b9a677107cfad2387 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 10:40:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
index 0200092..894f904 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
@@ -1,26 +1,19 @@
package com.aps.core.controller.mainPlan;
-import java.util.List;
-
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.aps.common.core.utils.poi.ExcelUtil;
+import com.aps.common.core.web.controller.BaseController;
+import com.aps.common.core.web.domain.AjaxResult;
+import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.service.IApsPlateStandardRequireService;
-import com.aps.common.core.web.controller.BaseController;
-import com.aps.common.core.web.domain.AjaxResult;
-import com.aps.common.core.utils.poi.ExcelUtil;
-import com.aps.common.core.web.page.TableDataInfo;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* 閽ｉ噾宸ュ崟鏍囧噯闇�姹侰ontroller
@@ -110,4 +103,28 @@
{
return toAjax(apsPlateStandardRequireService.deleteApsPlateStandardRequireByIds(ids));
}
+
+ /**
+ * 閽ｉ噾渚涘簲缂哄彛鎶ヨ〃
+ */
+ @RequiresPermissions("Aps:ApsPlateStandardRequire:supplyGapList")
+ @GetMapping("/supplyGapList")
+ public TableDataInfo selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire)
+ {
+ startPage();
+ List<ApsPlateStandardRequire> list = apsPlateStandardRequireService.selectPlateSupplyGapList(apsPlateStandardRequire);
+ return getDataTable(list);
+ }
+
+ @RequiresPermissions("Aps:ApsPlateStandardRequire:supplyGapListExport")
+ @Log(title = "閽ｉ噾渚涘簲缂哄彛鎶ヨ〃瀵煎嚭", businessType = BusinessType.EXPORT)
+ @PostMapping("/supplyGapListExport")
+ public void supplyGapListExport(HttpServletResponse response, ApsPlateStandardRequire apsPlateStandardRequire)
+ {
+ List<ApsPlateStandardRequire> list = apsPlateStandardRequireService.selectPlateSupplyGapList(apsPlateStandardRequire);
+ ExcelUtil<ApsPlateStandardRequire> util = new ExcelUtil<ApsPlateStandardRequire>(ApsPlateStandardRequire.class);
+ util.exportExcel(response, list, "閽ｉ噾渚涘簲缂哄彛鎶ヨ〃鏁版嵁");
+ }
+
+
}
--
Gitblit v1.9.3