From d940d0b4c0e7d6fcebfb0fea2bed1c514e1f796f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 01 七月 2024 14:35:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 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 29a1038..b821404 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,9 +1,18 @@
package com.mes.damage.controller;
+import cn.hutool.core.date.DateTime;
+import com.mes.damage.entity.Damage;
+import com.mes.damage.service.DamageService;
+import com.mes.utils.Result;
+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.RestController;
+
+import java.util.List;
/**
* <p>
@@ -11,11 +20,32 @@
* </p>
*
* @author wu
- * @since 2024-06-13
+ * @since 2024-06-25
*/
@RestController
-@RequestMapping("/glassinfo/damage")
+@RequestMapping("/damage")
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));
+ }
+
+ @ApiOperation("鎶ュ伐")
+ @GetMapping("/submitDamage")
+ public Result submitDamage(DateTime startTime , DateTime endTime,int type,int status,int workingProcedureId) {
+ damageService.submitDamage(startTime,endTime,type,status,workingProcedureId);
+ return Result.build(200,"鎶ュ伐鎴愬姛",1);
+ }
+
+ @ApiOperation("鎶ュ伐鏁版嵁淇敼")
+ @GetMapping("/updateDamage")
+ public Result updateDamage(List<Damage> damageList) {
+ damageService.updateBatchById(damageList);
+ return Result.build(200,"淇敼鎴愬姛",1);
+ }
}
--
Gitblit v1.8.0