From 43b3006894adb07e968ba4d23b2542b791d2b5bf Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 29 四月 2025 14:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java |   49 ++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 11 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 54805ba..1af932f 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
@@ -12,6 +12,7 @@
 import com.aps.core.domain.ApsPlatePlan;
 import com.aps.core.domain.ApsPlatePlanTemp;
 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.factory.annotation.Autowired;
@@ -28,26 +29,41 @@
  * @date 2025-04-08
  */
 @RestController
-@RequestMapping("/ApsPlatePlan")
+@RequestMapping("/apsPlatePlan")
 public class ApsPlatePlanController extends BaseController {
     @Autowired
     private IApsPlatePlanService apsPlatePlanService;
-
+    @Autowired
+    private IApsPlatePlanTempService apsPlatePlanTempService;
     /**
      * 鏌ヨ閽ｉ噾璁″垝绠＄悊鍒楄〃
      */
-    @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:list")
+    @RequiresPermissions("apsPlatePlan:list")
     @GetMapping("/list")
     public TableDataInfo list(ApsPlatePlan apsPlatePlan) {
-        startPage();
+        //startPage();
         List<ApsPlatePlan> list = apsPlatePlanService.selectApsPlatePlanList(apsPlatePlan);
+        List<SysDictData> suspendedDic = DictUtils.getDictCache("aps_is_suspended");
+        List<SysDictData> businessTypeDic = DictUtils.getDictCache("aps_business_type");
+        List<SysDictData> documentStatusDic = DictUtils.getDictCache("aps_document_status");
+        List<SysDictData> accountDic = DictUtils.getDictCache("aps_account");
+        list.parallelStream().forEach(plan->{
+            documentStatusDic.stream().filter(x -> x.getDictValue().equals( plan.getDocumentStatus().trim()))
+                    .findFirst().ifPresent(sysDictData -> plan.setDocumentStatus(sysDictData.getDictLabel()));
+            accountDic.stream().filter(x -> x.getDictValue().equals( plan.getAccount().trim()))
+                    .findFirst().ifPresent(sysDictData -> plan.setAccount(sysDictData.getDictLabel()));
+            businessTypeDic.stream().filter(x -> x.getDictValue().equals(plan.getBusinessType().trim()))
+                    .findFirst().ifPresent(sysDictData -> plan.setBusinessType(sysDictData.getDictLabel()));
+            suspendedDic.stream().filter(x -> x.getDictValue().equals( plan.getIsSuspended()))
+                    .findFirst().ifPresent(sysDictData -> plan.setIsSuspended(sysDictData.getDictLabel()));
+        });
         return getDataTable(list);
     }
 
     /**
      * 瀵煎嚭閽ｉ噾璁″垝绠＄悊鍒楄〃
      */
-    @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:export")
+    @RequiresPermissions("apsPlatePlan:export")
     @Log(title = "閽ｉ噾璁″垝绠＄悊", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ApsPlatePlan apsPlatePlan) {
@@ -88,7 +104,7 @@
     /**
      * 鑾峰彇閽ｉ噾璁″垝绠＄悊璇︾粏淇℃伅
      */
-    @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:query")
+//    @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
         return success(apsPlatePlanService.selectApsPlatePlanById(id));
@@ -97,7 +113,7 @@
     /**
      * 鏂板閽ｉ噾璁″垝绠＄悊
      */
-    @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:add")
+//    @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:add")
     @Log(title = "閽ｉ噾璁″垝绠＄悊", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ApsPlatePlan apsPlatePlan) {
@@ -107,7 +123,7 @@
     /**
      * 淇敼閽ｉ噾璁″垝绠＄悊
      */
-    @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:edit")
+    @RequiresPermissions("apsPlatePlan:edit")
     @Log(title = "閽ｉ噾璁″垝绠＄悊", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ApsPlatePlan apsPlatePlan) {
@@ -117,7 +133,7 @@
     /**
      * 鍒犻櫎閽ｉ噾璁″垝绠＄悊
      */
-    @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:remove")
+//    @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:remove")
     @Log(title = "閽ｉ噾璁″垝绠＄悊", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids) {
@@ -130,6 +146,7 @@
      * @return
      * @throws Exception
      */
+    @RequiresPermissions("apsPlatePlan:import")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file) throws Exception {
         ExcelUtil<ApsPlatePlanTemp> util = new ExcelUtil<ApsPlatePlanTemp>(ApsPlatePlanTemp.class);
@@ -147,8 +164,18 @@
      * @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));
     }
+    /**
+     * 鏌ヨ閽ｉ噾璁″垝涓存椂琛ㄥ垪琛�
+     */
+    @GetMapping("/queryTempPlan")
+    public TableDataInfo list(ApsPlatePlanTemp apsPlatePlanTemp)
+    {
+        List<ApsPlatePlanTemp> list = apsPlatePlanTempService.selectApsPlatePlanTempList(apsPlatePlanTemp);
+        return getDataTable(list);
+    }
 }

--
Gitblit v1.9.3