From 8a76767b0a7ad271c8487a02063590b956deb5df Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 25 七月 2024 14:30:30 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java |   44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
index b821404..ea9bcb2 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -5,14 +5,14 @@
 import com.mes.damage.entity.Damage;
 import com.mes.damage.service.DamageService;
 import com.mes.utils.Result;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
-
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -22,30 +22,50 @@
  * @author wu
  * @since 2024-06-25
  */
+@Api(description = "鎶ュ伐淇℃伅")
 @RestController
 @RequestMapping("/damage")
+@ResponseBody
 public class DamageController {
 
     @Autowired
     private DamageService damageService;
     @ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
-    @GetMapping("/selectDamage")
-    public Result selectDamage(DateTime startTime , DateTime endTime,int type,int status,int workingProcedureId) {
-        return Result.build(200,"鏌ヨ鎴愬姛",damageService.selectDamage(startTime,endTime,type,status,workingProcedureId));
+    @PostMapping("/selectDamage")
+    public Result selectDamage(@RequestBody Map map) {
+        String startTime=map.get("startTime").toString();
+        String endTime=map.get("endTime").toString();
+        int type =Integer.parseInt(map.get("type").toString());
+        int status =Integer.parseInt(map.get("status").toString());
+        String workingProcedure =map.get("workingProcedure").toString();
+        return Result.build(200,"鏌ヨ鎴愬姛",damageService.selectDamage(startTime,endTime,type,status,workingProcedure));
     }
 
     @ApiOperation("鎶ュ伐")
-    @GetMapping("/submitDamage")
-    public Result submitDamage(DateTime startTime , DateTime endTime,int type,int status,int workingProcedureId) {
-        damageService.submitDamage(startTime,endTime,type,status,workingProcedureId);
+    @PostMapping("/submitDamage")
+    public Result submitDamage(@RequestBody Map map) {
+        String startTime=map.get("startTime").toString();
+        String endTime=map.get("endTime").toString();
+        int type =Integer.parseInt(map.get("type").toString());
+        int status =Integer.parseInt(map.get("status").toString());
+        String workingProcedure =map.get("workingProcedure").toString();
+        damageService.submitDamage(startTime,endTime,type,status,workingProcedure);
         return Result.build(200,"鎶ュ伐鎴愬姛",1);
     }
 
     @ApiOperation("鎶ュ伐鏁版嵁淇敼")
-    @GetMapping("/updateDamage")
-    public Result updateDamage(List<Damage> damageList) {
+    @PostMapping("/updateDamage")
+    public Result updateDamage(@RequestBody List<Damage> damageList) {
         damageService.updateBatchById(damageList);
         return Result.build(200,"淇敼鎴愬姛",1);
     }
+
+    @ApiOperation("鎶ュ伐鏁版嵁鏂板")
+    @PostMapping("/insertDamage")
+    public Result insertDamage(@RequestBody Damage damage) {
+        damageService.insertDamage(damage);
+        return Result.build(200,"鏂板鎴愬姛",1);
+    }
+
 }
 

--
Gitblit v1.8.0