From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 5b5dcb7..63c1825 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
@@ -27,7 +27,7 @@
@ResponseBody
public class DamageController {
- @Autowired
+ @Autowired(required=true)
private DamageService damageService;
@ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
@PostMapping("/selectDamage")
@@ -37,13 +37,14 @@
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, workingProcedure));
+ return Result.build(200,"鏌ヨ鎴愬姛",damageService.selectDamage(startTime,endTime,type,status, workingProcedure));
}
@ApiOperation("鎶ュ伐")
@PostMapping("/submitDamage")
public Result submitDamage(@RequestBody List<Damage> damageList) {
damageService.submitDamage(damageList);
+ damageList.forEach(damage -> damage.setStatus(3));
damageService.updateBatchById(damageList);
return Result.build(200,"鎶ュ伐鎴愬姛",1);
}
--
Gitblit v1.8.0