From 70a46cd5e65b1ee16fb4bb4954a01129e6898b6d Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 12 五月 2025 18:29:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteLineController.java |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteLineController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteLineController.java
index 16abad2..2622075 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteLineController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteLineController.java
@@ -8,11 +8,14 @@
 import com.aps.common.log.enums.BusinessType;
 import com.aps.common.security.annotation.RequiresPermissions;
 import com.aps.core.domain.ApsStandardProcessRouteLine;
+import com.aps.core.mapper.ApsStandardProcessRouteLineMapper;
 import com.aps.core.service.IApsStandardProcessRouteLineService;
+import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -30,10 +33,12 @@
     @Autowired
     private IApsStandardProcessRouteLineService apsStandardProcessRouteLineService;
 
+    @Resource
+    private ApsStandardProcessRouteLineMapper mapper;
     /**
      * 鏌ヨ鏍囧噯宸ヨ壓璺嚎Line鍒楄〃
      */
-    @RequiresPermissions("ApsStandardProcessRouteLine:ApsStandardProcessRouteLine:list")
+    @RequiresPermissions("Aps:ApsStandardProcessRouteLine:list")
     @GetMapping("/list")
     public TableDataInfo list(ApsStandardProcessRouteLine apsStandardProcessRouteLine)
     {
@@ -45,7 +50,7 @@
     /**
      * 瀵煎嚭鏍囧噯宸ヨ壓璺嚎Line鍒楄〃
      */
-    @RequiresPermissions("ApsStandardProcessRouteLine:ApsStandardProcessRouteLine:export")
+    @RequiresPermissions("Aps:ApsStandardProcessRouteLine:export")
     @Log(title = "鏍囧噯宸ヨ壓璺嚎Line", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ApsStandardProcessRouteLine apsStandardProcessRouteLine)
@@ -58,7 +63,7 @@
     /**
      * 鑾峰彇鏍囧噯宸ヨ壓璺嚎Line璇︾粏淇℃伅
      */
-    @RequiresPermissions("ApsStandardProcessRouteLine:ApsStandardProcessRouteLine:query")
+    @RequiresPermissions("Aps:ApsStandardProcessRouteLine:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -68,7 +73,7 @@
     /**
      * 鏂板鏍囧噯宸ヨ壓璺嚎Line
      */
-    @RequiresPermissions("ApsStandardProcessRouteLine:ApsStandardProcessRouteLine:add")
+    @RequiresPermissions("Aps:ApsStandardProcessRouteLine:add")
     @Log(title = "鏍囧噯宸ヨ壓璺嚎Line", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ApsStandardProcessRouteLine apsStandardProcessRouteLine)
@@ -79,7 +84,7 @@
     /**
      * 淇敼鏍囧噯宸ヨ壓璺嚎Line
      */
-    @RequiresPermissions("ApsStandardProcessRouteLine:ApsStandardProcessRouteLine:edit")
+    @RequiresPermissions("Aps:ApsStandardProcessRouteLine:edit")
     @Log(title = "鏍囧噯宸ヨ壓璺嚎Line", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ApsStandardProcessRouteLine apsStandardProcessRouteLine)
@@ -90,11 +95,20 @@
     /**
      * 鍒犻櫎鏍囧噯宸ヨ壓璺嚎Line
      */
-    @RequiresPermissions("ApsStandardProcessRouteLine:ApsStandardProcessRouteLine:remove")
+    @RequiresPermissions("Aps:ApsStandardProcessRouteLine:remove")
     @Log(title = "鏍囧噯宸ヨ壓璺嚎Line", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(apsStandardProcessRouteLineService.deleteApsStandardProcessRouteLineByIds(ids));
     }
+
+
+
+    @PostMapping("/getStandardTime")
+    public AjaxResult getStandardTime(@RequestBody ApsStandardProcessRouteLine apsStandardProcessRouteLine)
+    {
+        BigDecimal standardTime = mapper.selectTotalStandTime(apsStandardProcessRouteLine.getRouteId()).getStandardTime();
+        return toAjax(standardTime.intValue());
+    }
 }

--
Gitblit v1.9.3