From 191b8ae5c768fbb97c7cdea87edde77d0a10e7da Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:15:41 +0800
Subject: [PATCH] 钣金需求匹配-完善工时计算

---
 aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java |   52 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
index 308fb5e..ad84a51 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
@@ -8,17 +8,19 @@
 import com.aps.common.log.enums.BusinessType;
 import com.aps.common.security.annotation.RequiresPermissions;
 import com.aps.common.security.utils.DictUtils;
-import com.aps.core.domain.ApsGasPipingPlan;
 import com.aps.core.domain.ApsPlatePlan;
 import com.aps.core.domain.ApsPlatePlanTemp;
+import com.aps.core.domain.export.ApsPlatePlanExport;
 import com.aps.core.service.IApsPlatePlanService;
 import com.aps.core.service.IApsPlatePlanTempService;
 import com.aps.system.api.domain.SysDictData;
 import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -29,7 +31,7 @@
  * @date 2025-04-08
  */
 @RestController
-@RequestMapping("/ApsPlatePlan")
+@RequestMapping("/apsPlatePlan")
 public class ApsPlatePlanController extends BaseController {
     @Autowired
     private IApsPlatePlanService apsPlatePlanService;
@@ -38,7 +40,7 @@
     /**
      * 鏌ヨ閽ｉ噾璁″垝绠＄悊鍒楄〃
      */
-    @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:list")
+    @RequiresPermissions("apsPlatePlan:list")
     @GetMapping("/list")
     public TableDataInfo list(ApsPlatePlan apsPlatePlan) {
         //startPage();
@@ -63,7 +65,7 @@
     /**
      * 瀵煎嚭閽ｉ噾璁″垝绠＄悊鍒楄〃
      */
-//    @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:export")
+    @RequiresPermissions("apsPlatePlan:export")
     @Log(title = "閽ｉ噾璁″垝绠＄悊", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ApsPlatePlan apsPlatePlan) {
@@ -123,7 +125,7 @@
     /**
      * 淇敼閽ｉ噾璁″垝绠＄悊
      */
-//    @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:edit")
+    @RequiresPermissions("apsPlatePlan:edit")
     @Log(title = "閽ｉ噾璁″垝绠＄悊", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ApsPlatePlan apsPlatePlan) {
@@ -146,6 +148,7 @@
      * @return
      * @throws Exception
      */
+    @RequiresPermissions("apsPlatePlan:import")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file) throws Exception {
         ExcelUtil<ApsPlatePlanTemp> util = new ExcelUtil<ApsPlatePlanTemp>(ApsPlatePlanTemp.class);
@@ -163,8 +166,9 @@
      * @param planTemp 鍖呭惈閮ㄥ垎璁″垝淇℃伅鐨勪复鏃跺璞★紝鐢ㄤ簬纭璁″垝
      * @return 杩斿洖鎿嶄綔缁撴灉鐨凙jaxResult瀵硅薄
      */
-    @GetMapping("/confirmPart")
-    public AjaxResult confirmPart(ApsPlatePlanTemp planTemp) {
+    @RequiresPermissions("apsPlatePlan:confirm")
+    @PostMapping("/confirmPart")
+    public AjaxResult confirmPart(@RequestBody ApsPlatePlanTemp planTemp) {
         return toAjax(apsPlatePlanService.confirmPlan(planTemp));
     }
     /**
@@ -176,4 +180,38 @@
         List<ApsPlatePlanTemp> list = apsPlatePlanTempService.selectApsPlatePlanTempList(apsPlatePlanTemp);
         return getDataTable(list);
     }
+
+    /**
+     * 閽ｉ噾鍐椾綑宸ュ崟鎶ヨ〃
+     * @param apsPlatePlan
+     * @return
+     */
+    @RequiresPermissions("Aps:apsPlatePlan:redundantOrderList")
+    @GetMapping("/redundantOrderList")
+    public TableDataInfo redundantOrderList(ApsPlatePlan apsPlatePlan) {
+        startPage();
+        List<ApsPlatePlan> list = apsPlatePlanService.selectPlateRedundantOrderList(apsPlatePlan);
+        return getDataTable(list);
+    }
+
+    /**
+     * 閽ｉ噾鍐椾綑宸ュ崟鎶ヨ〃瀵煎嚭
+     * @param apsPlatePlan
+     * @return
+     */
+    @RequiresPermissions("Aps:apsPlatePlan:redundantOrderListExport")
+    @Log(title = "閽ｉ噾鍐椾綑宸ュ崟鎶ヨ〃", businessType = BusinessType.EXPORT)
+    @PostMapping("/redundantOrderListExport")
+    public void redundantOrderListExport(HttpServletResponse response, ApsPlatePlan apsPlatePlan) {
+        List<ApsPlatePlan> planList = apsPlatePlanService.selectPlateRedundantOrderList(apsPlatePlan);
+        List<ApsPlatePlanExport> planListExport = new ArrayList<>();
+        for (ApsPlatePlan plan : planList) {
+            ApsPlatePlanExport planExport = new ApsPlatePlanExport();
+            BeanUtils.copyProperties(plan, planExport);
+            planListExport.add(planExport);
+        }
+        ExcelUtil<ApsPlatePlanExport> util = new ExcelUtil<ApsPlatePlanExport>(ApsPlatePlanExport.class);
+        util.exportExcel(response, planListExport, "閽ｉ噾鍐椾綑宸ュ崟鎶ヨ〃鏁版嵁");
+    }
+
 }

--
Gitblit v1.9.3