From 86adbb1544142dcfb48333dade822f81640607a6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 13:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 base-server/src/main/java/com/yuanchu/mom/controller/TechnicalModelController.java |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/base-server/src/main/java/com/yuanchu/mom/controller/TechnicalModelController.java b/base-server/src/main/java/com/yuanchu/mom/controller/TechnicalModelController.java
index 044cc10..7df8a17 100644
--- a/base-server/src/main/java/com/yuanchu/mom/controller/TechnicalModelController.java
+++ b/base-server/src/main/java/com/yuanchu/mom/controller/TechnicalModelController.java
@@ -59,26 +59,23 @@
 
     @ApiOperation(value = "鏂板鎶�鏈寚鏍囩淮鎶�-->閫夋嫨椤圭洰鐖剁被")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class, required = true)
+            @ApiImplicitParam(name = "techTemId", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class, required = true)
     })
     @GetMapping("/chooseProFath")
-    public Result chooseProFath(Integer id) {
-        return Result.success(technicalModelService.chooseProFath(id));
+    public Result chooseProFath(Integer techTemId) {
+        return Result.success(technicalModelService.chooseProFath(techTemId));
     }
 
     @ApiOperation(value = "鏂板鎶�鏈寚鏍囩淮鎶�")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class, required = true)
-    })
     @PostMapping("/addTechMode")
-    public Result addTechMode(Integer id, @Validated @RequestBody TechnicalModelDto technicalModelDto) {
-        technicalModelService.addTechMode(id, technicalModelDto);
+    public Result addTechMode(@Validated @RequestBody TechnicalModelDto technicalModelDto) {
+        technicalModelService.addTechMode(technicalModelDto);
         return Result.success("鏂板鎴愬姛!");
     }
 
     @ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "鎶�鏈寚鏍噄d", dataTypeClass = Integer.class,required = true)
+            @ApiImplicitParam(name = "id", value = "鎶�鏈寚鏍噄d", dataTypeClass = Integer.class, required = true)
     })
     @GetMapping("/selecTechById")
     public Result selecTechById(Integer id) {
@@ -87,27 +84,27 @@
 
     @ApiOperation(value = "缂栬緫")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "鎶�鏈寚鏍噄d", dataTypeClass = Integer.class,required = true)
+            @ApiImplicitParam(name = "id", value = "鎶�鏈寚鏍噄d", dataTypeClass = Integer.class, required = true)
     })
     @PostMapping("/writeTechById")
-    public Result writeTechById(Integer id,@Validated @RequestBody TechnicalModelDto technicalModelDto) {
-        technicalModelService.writeTechById(id,technicalModelDto);
-        return Result.success("淇敼"+id+"鎴愬姛!");
+    public Result writeTechById(Integer id, @Validated @RequestBody TechnicalModelDto technicalModelDto) {
+        technicalModelService.writeTechById(id, technicalModelDto);
+        return Result.success("淇敼" + id + "鎴愬姛!");
     }
 
     @ApiOperation(value = "鍒犻櫎")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "鎶�鏈寚鏍噄d", dataTypeClass = Integer.class,required = true)
+            @ApiImplicitParam(name = "id", value = "鎶�鏈寚鏍噄d", dataTypeClass = Integer.class, required = true)
     })
     @PostMapping("/delTechById")
     public Result delTechById(Integer id) {
         technicalModelService.delTechById(id);
-        return Result.success("鍒犻櫎"+id+"鎴愬姛!");
+        return Result.success("鍒犻櫎" + id + "鎴愬姛!");
     }
 
     @ApiOperation(value = "鎵归噺鍒犻櫎")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "ids", value = "鎶�鏈寚鏍噄d", dataTypeClass = String.class,required = true)
+            @ApiImplicitParam(name = "ids", value = "鎶�鏈寚鏍噄d", dataTypeClass = String.class, required = true)
     })
     @PostMapping("/delAllTech")
     public Result delAllTech(String ids) {

--
Gitblit v1.9.3