From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:40:48 +0800
Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备，第二次修改就只针对当前样品
---
performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
index 70f9af3..3cc5cb5 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.AuxiliaryWorkingHoursDayDto;
+import com.yuanchu.mom.dto.HoursDay;
import com.yuanchu.mom.pojo.AuxiliaryWorkingHours;
import com.yuanchu.mom.pojo.AuxiliaryWorkingHoursDay;
import com.yuanchu.mom.service.AuxiliaryWorkingHoursDayService;
@@ -20,6 +21,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.List;
import java.util.Map;
/**
@@ -48,12 +50,14 @@
return Result.success(auxiliaryWorkingHoursDayService.selectAuxiliaryWorkingHoursDay(page, entity));
}
+ @ValueClassify("宸ユ椂绠＄悊")
@ApiOperation(value = "鏍规嵁缂栧彿鏌ヨ杈呭姪宸ユ椂閰嶇疆淇℃伅")
@PostMapping("/selectAuxiliaryWorkingHoursByNumber")
public Result selectAuxiliaryWorkingHoursByNumber(String number) {
return Result.success(auxiliaryWorkingHoursDayService.selectAuxiliaryWorkingHoursByNumber(number));
}
+ @ValueClassify("宸ユ椂绠＄悊")
@ApiOperation(value = "鏍规嵁缂栧彿褰撳墠鐢ㄦ埛淇℃伅鏌ヨ鎵�鍦ㄧ彮娆�")
@PostMapping("/selectshiftByUser")
public Result selectshiftByUser(LocalDateTime dateTime) {
@@ -70,15 +74,15 @@
@ValueClassify("宸ユ椂绠＄悊")
@ApiOperation(value = "鎵瑰噯宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
@PostMapping("/approve")
- public Result approve(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
- return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(auxiliaryWorkingHoursDay));
+ public Result approve(@RequestBody HoursDay hoursDay ) {
+ return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(hoursDay));
}
@ValueClassify("宸ユ椂绠＄悊")
@ApiOperation(value = "瀹℃牳宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
@PostMapping("/check")
- public Result check(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay ) {
- return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(auxiliaryWorkingHoursDay));
+ public Result check(@RequestBody HoursDay hoursDay ) {
+ return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(hoursDay));
}
@ValueClassify("宸ユ椂绠＄悊")
--
Gitblit v1.9.3