From 57fca4f8e41c2504246459656cb3791621a039f0 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 23 十月 2025 08:29:05 +0800
Subject: [PATCH] 1、报工查询界面改为分页 2、查询工程添加工程名称
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 80 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 17 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 b821404..0a55b53 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,51 +1,97 @@
package com.mes.damage.controller;
-import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mes.damage.entity.Damage;
+import com.mes.damage.entity.DamagePrint;
import com.mes.damage.service.DamageService;
+import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author wu
* @since 2024-06-25
*/
+@Api(tags = "鎶ュ伐淇℃伅")
@RestController
@RequestMapping("/damage")
+@ResponseBody
public class DamageController {
- @Autowired
+ @Autowired(required = true)
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));
+ @PostMapping("/selectDamage")
+ public Result<Page<Damage>> 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());
+ String workingProcedure = map.get("workingProcedure").toString();
+ int pageNo = Integer.parseInt(map.get("pageNo").toString());
+ int pageSize = Integer.parseInt(map.get("pageSize").toString());
+ return Result.build(200, "鏌ヨ鎴愬姛", damageService.selectDamage(startTime, endTime, type, status, workingProcedure, pageNo, pageSize));
}
@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);
+ @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);
}
@ApiOperation("鎶ュ伐鏁版嵁淇敼")
- @GetMapping("/updateDamage")
- public Result updateDamage(List<Damage> damageList) {
+ @PostMapping("/updateDamage")
+ public Result updateDamage(@RequestBody List<Damage> damageList) {
damageService.updateBatchById(damageList);
- return Result.build(200,"淇敼鎴愬姛",1);
+ return Result.build(200, "淇敼鎴愬姛", 1);
}
+
+ @ApiOperation("鎶ュ伐鏁版嵁鏂板")
+ @PostMapping("/insertDamage")
+ public Result insertDamage(@RequestBody Damage damage) {
+ 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);
+ }
+
+ @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