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/ApsPlatePlanController.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 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 1af932f..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;
@@ -178,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