From 55b94886f07ddd77d0b9ebbbf2d6ff8e92f682a4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 16 七月 2024 16:59:26 +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 | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 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..9cd2ca4 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 org.springframework.web.bind.annotation.RequestMapping;
+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.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -11,11 +20,40 @@
* </p>
*
* @author wu
- * @since 2024-06-13
+ * @since 2024-06-25
*/
+@Api(description = "鎶ュ伐淇℃伅")
@RestController
-@RequestMapping("/glassinfo/damage")
+@RequestMapping("/damage")
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
+ 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);
+ return Result.build(200,"鎶ュ伐鎴愬姛",1);
+ }
+
+ @ApiOperation("鎶ュ伐鏁版嵁淇敼")
+ @PostMapping("/updateDamage")
+ public Result updateDamage(List<Damage> damageList) {
+ damageService.updateBatchById(damageList);
+ return Result.build(200,"淇敼鎴愬姛",1);
+ }
}
--
Gitblit v1.8.0