From 00c4dfc5ac687c93e0b7abafc33abb693b38edd6 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 05 八月 2024 09:14:33 +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 | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 9cd2ca4..d096488 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
@@ -25,35 +25,43 @@
@Api(description = "鎶ュ伐淇℃伅")
@RestController
@RequestMapping("/damage")
+@ResponseBody
public class DamageController {
@Autowired
private DamageService damageService;
@ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
- @ResponseBody
@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());
- int workingProcedure =Integer.parseInt(map.get("workingProcedure").toString());
-// String startTime , String endTime, int type, int status, int workingProcedure
+ String workingProcedure =map.get("workingProcedure").toString();
return Result.build(200,"鏌ヨ鎴愬姛",damageService.selectDamage(startTime,endTime,type,status,workingProcedure));
}
@ApiOperation("鎶ュ伐")
@PostMapping("/submitDamage")
- public Result submitDamage(DateTime startTime , DateTime endTime,int type,int status,int workingProcedureId) {
- damageService.submitDamage(startTime,endTime,type,status,workingProcedureId);
+ public Result submitDamage(@RequestBody List<Damage> damageList) {
+ damageService.submitDamage(damageList);
+ damageService.updateBatchById(damageList);
return Result.build(200,"鎶ュ伐鎴愬姛",1);
}
@ApiOperation("鎶ュ伐鏁版嵁淇敼")
@PostMapping("/updateDamage")
- public Result updateDamage(List<Damage> damageList) {
+ 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