From fbde0b947b4641081b558302ea77d88c902c4cd1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 30 四月 2025 10:03:24 +0800
Subject: [PATCH] 可靠性计划优化检验项

---
 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index 4e8624e..29cfa15 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -1,23 +1,26 @@
 package com.ruoyi.inspect.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.inspect.dto.InsOrderPlanDTO;
-import com.ruoyi.inspect.dto.InsOrderPlanProductDto;
-import com.ruoyi.inspect.dto.InsProductBindingDto;
-import com.ruoyi.inspect.dto.SaveInsContextDto;
+import com.ruoyi.inspect.dto.*;
 import com.ruoyi.inspect.pojo.InsOrder;
 import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
 import com.ruoyi.inspect.pojo.InsOrderFile;
 import com.ruoyi.inspect.pojo.InsProduct;
 import com.ruoyi.inspect.service.InsOrderFileService;
 import com.ruoyi.inspect.service.InsOrderPlanService;
+import com.ruoyi.inspect.service.InsOrderRatesService;
 import com.ruoyi.inspect.service.InsProductService;
+import com.ruoyi.performance.dto.AuxiliaryOutputWorkingHoursTemporaryDto;
+import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;
+import com.ruoyi.performance.service.AuxiliaryOutputWorkingHoursTemporaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -35,10 +38,9 @@
 public class InsOrderPlanController {
 
     private InsOrderPlanService insOrderPlanService;
-
     private InsOrderFileService insOrderFileService;
-
     private InsProductService insProductService;
+    private AuxiliaryOutputWorkingHoursTemporaryService auxiliaryOutputWorkingHoursTemporaryService;
 
 
     @ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@@ -122,6 +124,7 @@
 
 
     @ApiOperation(value = "涓婁紶闄勪欢")
+    @PreAuthorize("@ss.hasPermi('upload:order:file')")
     @PostMapping("/uploadFile")
     public Result<?> taskUploadFile(Integer orderId, MultipartFile file) {
         return Result.success(insOrderPlanService.uploadFile(orderId, file));
@@ -129,6 +132,7 @@
 
 
     @ApiOperation(value = "鍒犻櫎闄勪欢")
+    @PreAuthorize("@ss.hasPermi('del:order:file')")
     @DeleteMapping("/delfile")
     public Result<?> delfile(Integer id) {
         return Result.success(insOrderFileService.removeById(id));
@@ -192,18 +196,14 @@
 
     /**
      *
-     * @param param 妯℃澘鍐呭
-     * @param currentTable 褰撳墠妯℃澘id
-     * @param sampleId 褰撳墠鏍峰搧id
-     * @param orderId 褰撳墠璁㈠崟id
-     * @param sonLaboratory 瀛愯瘯楠屽
+     * @param insUnqualifiedRetestResultDto
      * @return
      */
     @ApiOperation(value = "淇濆瓨涓嶅悎鏍煎娴嬫楠屽唴瀹�")
     @PostMapping("/saveUnqualifiedContext")
-    public Result<?> saveUnqualifiedContext(String param, Integer currentTable, Integer sampleId, Integer orderId, String sonLaboratory) {
-        Map<String, Object> param2 = JSON.parseObject(param, Map.class);
-        insOrderPlanService.saveUnqualifiedContext(param2, currentTable, sampleId, orderId, sonLaboratory);
+    public Result<?> saveUnqualifiedContext(@RequestBody InsUnqualifiedRetestResultDto insUnqualifiedRetestResultDto) {
+        Map<String, Object> param2 = JSON.parseObject(insUnqualifiedRetestResultDto.getParam(), Map.class);
+        insOrderPlanService.saveUnqualifiedContext(param2, insUnqualifiedRetestResultDto.getCurrentTable(), insUnqualifiedRetestResultDto.getSampleId(), insUnqualifiedRetestResultDto.getOrderId(), insUnqualifiedRetestResultDto.getSonLaboratory());
         return Result.success();
     }
 
@@ -223,6 +223,7 @@
 
 
     @ApiOperation(value = "淇敼妫�楠岄」鍐呭")
+    @PreAuthorize("@ss.hasPermi('update:product:onPlan')")
     @PostMapping("/updateProductOnPlan")
     public Result<?> updateProductOnPlan(@RequestBody InsProduct insProduct) {
         insProductService.updateById(insProduct);
@@ -259,4 +260,26 @@
     public Result<?> delProductTreeByProductId(Integer productId) {
         return Result.success(insProductService.removeBindingProductTree(productId));
     }
+
+    /**
+     * 鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏
+     * @return
+     */
+    @ApiOperation(value = "鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏")
+    @PreAuthorize("@ss.hasPermi('get:working:hours:byOrder')")
+    @GetMapping("/getWorkingHoursByOrderId")
+    public Result<IPage<AuxiliaryOutputWorkingHoursTemporaryDto>> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporaryDto workingHoursTemporary) {
+        return Result.success(auxiliaryOutputWorkingHoursTemporaryService.getWorkingHoursByOrderId(page, workingHoursTemporary));
+    }
+
+    /**
+     * 淇敼宸ユ椂璇︽儏
+     * @return
+     */
+    @ApiOperation(value = "淇敼宸ユ椂璇︽儏")
+    @PreAuthorize("@ss.hasPermi('update:order:workingHours')")
+    @PostMapping("/updateWorkingHours")
+    public Result updateWorkingHours(@RequestBody AuxiliaryOutputWorkingHoursTemporary workingHoursTemporary) {
+        return Result.success(auxiliaryOutputWorkingHoursTemporaryService.updateById(workingHoursTemporary));
+    }
 }

--
Gitblit v1.9.3