From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 22 ++++++++++++++++------
1 files changed, 16 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 fc36b35..bf3275c 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
@@ -1,7 +1,6 @@
package com.mes.damage.controller;
-import cn.hutool.core.date.DateTime;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
import com.mes.damage.service.DamageService;
@@ -11,7 +10,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -23,14 +21,15 @@
* @author wu
* @since 2024-06-25
*/
-@Api(description = "鎶ュ伐淇℃伅")
+@Api(tags = "鎶ュ伐淇℃伅")
@RestController
@RequestMapping("/damage")
@ResponseBody
public class DamageController {
- @Autowired
+ @Autowired(required=true)
private DamageService damageService;
+
@ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
@PostMapping("/selectDamage")
public Result selectDamage(@RequestBody Map map) {
@@ -39,13 +38,18 @@
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));
+ return Result.build(200,"鏌ヨ鎴愬姛",damageService.selectDamage(startTime,endTime,type,status, workingProcedure));
}
@ApiOperation("鎶ュ伐")
@PostMapping("/submitDamage")
public Result submitDamage(@RequestBody List<Damage> damageList) {
damageService.submitDamage(damageList);
+ if(damageList.get(0).getStatus()==1){
+ damageList.forEach(damage -> damage.setStatus(3));
+ }else{
+ damageList.forEach(damage -> damage.setStatus(8));
+ }
damageService.updateBatchById(damageList);
return Result.build(200,"鎶ュ伐鎴愬姛",1);
}
@@ -66,7 +70,7 @@
@ApiOperation("鎷胯蛋鏁版嵁鏌ヨ")
@PostMapping("/selectDamagePrint")
public Result selectDamagePrint(@RequestBody Damage damage) {
- List<Damage> damage2=damageService.selectDamagePrint(damage);
+ List<DamagePrint> damage2=damageService.selectDamagePrint(damage);
return Result.build(200,"鏌ヨ鎴愬姛",damage2);
}
@ApiOperation("鎷胯蛋鎵撳嵃鏌ヨ")
@@ -75,6 +79,12 @@
List<DamagePrint> damage2=damageService.selectDamagePrintDetails(damage);
return Result.build(200,"鏌ヨ鎴愬姛",damage2);
}
+ @ApiOperation("鑷姩鎶ュ伐")
+ @PostMapping("/autoSubmitReport")
+ public Result autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type) {
+ damageService.autoSubmitReport(glassId,deviceId,workingProcedure,remark,type);
+ return Result.build(200,"鏌ヨ鎴愬姛","");
+ }
}
--
Gitblit v1.8.0