From 981c563b223ee69b47fc5db56b35c5959c30a625 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期五, 11 四月 2025 15:37:05 +0800
Subject: [PATCH] 工艺路线字段调整

---
 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
index e570cac..6b79ff2 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
@@ -8,7 +8,6 @@
 import com.aps.common.log.enums.BusinessType;
 import com.aps.core.domain.ApsResourceGroup;
 import com.aps.core.domain.ApsResourceGroupTemp;
-import com.aps.core.param.ApsResourceGroupParam;
 import com.aps.core.service.IApsResourceGroupService;
 import com.aps.core.service.IApsResourceGroupTempService;
 import jakarta.annotation.Resource;
@@ -16,6 +15,8 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**
@@ -25,7 +26,7 @@
  * &#064;date  2025-04-10
  */
 @RestController
-@RequestMapping("/ApsResourceGroup")
+@RequestMapping("/apsResourceGroup")
 public class ApsResourceGroupController extends BaseController
 {
     @Resource
@@ -38,7 +39,7 @@
      */
     /*@RequiresPermissions("ApsResourceGroup:list")*/
     @GetMapping("/list")
-    public TableDataInfo list(ApsResourceGroupParam apsResourceGroup)
+    public TableDataInfo list(ApsResourceGroup apsResourceGroup)
     {
         //startPage();
         List<ApsResourceGroup> list = apsResourceGroupService.selectApsResourceGroupList(apsResourceGroup);
@@ -51,7 +52,7 @@
     /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:export")*/
     @Log(title = "璧勬簮缁�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ApsResourceGroupParam apsResourceGroup)
+    public void export(HttpServletResponse response, ApsResourceGroup apsResourceGroup)
     {
         List<ApsResourceGroup> list = apsResourceGroupService.selectApsResourceGroupList(apsResourceGroup);
         ExcelUtil<ApsResourceGroup> util = new ExcelUtil<>(ApsResourceGroup.class);
@@ -128,8 +129,9 @@
      */
     @PostMapping("/confirmData")
     public AjaxResult confirmData(@RequestBody ApsResourceGroupTemp temp) {
-
-        apsResourceGroupService.confirmData(temp.getBatchNumber(),temp.getRequestDate());
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
+        apsResourceGroupService.confirmData(temp.getBatchNumber(),localDateTime);
         return AjaxResult.success("纭鎴愬姛锛�");
     }
 }

--
Gitblit v1.9.3