From 2d0358932cd63ed46778be72d126fc8d766a27a8 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 18 九月 2024 16:15:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 ea9bcb2..295e4fd 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
@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateTime;
import com.mes.damage.entity.Damage;
+import com.mes.damage.entity.DamagePrint;
import com.mes.damage.service.DamageService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
@@ -43,13 +44,9 @@
@ApiOperation("鎶ュ伐")
@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);
+ public Result submitDamage(@RequestBody List<Damage> damageList) {
+ damageService.submitDamage(damageList);
+ damageService.updateBatchById(damageList);
return Result.build(200,"鎶ュ伐鎴愬姛",1);
}
@@ -66,6 +63,18 @@
damageService.insertDamage(damage);
return Result.build(200,"鏂板鎴愬姛",1);
}
+ @ApiOperation("鎷胯蛋鏁版嵁鏌ヨ")
+ @PostMapping("/selectDamagePrint")
+ public Result selectDamagePrint(@RequestBody Damage damage) {
+ List<DamagePrint> damage2=damageService.selectDamagePrint(damage);
+ return Result.build(200,"鏌ヨ鎴愬姛",damage2);
+ }
+ @ApiOperation("鎷胯蛋鎵撳嵃鏌ヨ")
+ @PostMapping("/selectDamagePrintDetails")
+ public Result selectDamagePrintDetails(@RequestBody Damage damage) {
+ List<DamagePrint> damage2=damageService.selectDamagePrintDetails(damage);
+ return Result.build(200,"鏌ヨ鎴愬姛",damage2);
+ }
}
--
Gitblit v1.8.0