From 00c4dfc5ac687c93e0b7abafc33abb693b38edd6 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 05 八月 2024 09:14:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
index 9b35277..7cc83b8 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
@@ -1,18 +1,16 @@
package com.mes.work_assignment.controller;
-import cn.hutool.core.date.DateTime;
-import com.mes.damage.service.DamageService;
import com.mes.utils.Result;
+import com.mes.work_assignment.entity.WorkAssignment;
import com.mes.work_assignment.service.WorkAssignmentService;
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.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -31,9 +29,17 @@
private WorkAssignmentService workAssignmentService;
@ApiOperation("鍊肩彮鏁版嵁鏌ヨ")
@PostMapping("/selectWorkAssignment")
- public Result selectWorkAssignment(int line,String workingProcedure) {
+ public Result selectWorkAssignment(@RequestBody Map map) {
+ String line=map.get("line").toString();
+ String workingProcedure=map.get("workingProcedure").toString();
return Result.build(200,"鏌ヨ鎴愬姛",workAssignmentService.selectWorkAssignment(line,workingProcedure));
}
+ @ApiOperation("鍊肩彮鏁版嵁淇敼")
+ @PostMapping("/updateWorkAssignment")
+ public Result updateWorkAssignment(@RequestBody List<WorkAssignment> workAssignmentList) {
+ workAssignmentService.saveOrUpdateBatch(workAssignmentList);
+ return Result.build(200,"淇敼鎴愬姛",1);
+ }
}
--
Gitblit v1.8.0