From a26151eff700b514ca92b0ac9207200b866071fc Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 五月 2024 15:24:48 +0800
Subject: [PATCH] 工时统计+权限+异步处理method+检验样品结果判断
---
performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java
index d005b35..f91a216 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.dto.AuxiliaryOutputWorkingHoursDto;
import com.yuanchu.mom.pojo.AuxiliaryOutputWorkingHours;
import com.yuanchu.mom.pojo.AuxiliaryWorkingHoursDay;
import com.yuanchu.mom.service.AuxiliaryOutputWorkingHoursService;
@@ -17,6 +18,8 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.Map;
/**
@@ -41,8 +44,30 @@
@PostMapping("/selectAuxiliaryOutputWorkingHours")
public Result selectAuxiliaryOutputWorkingHours(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- AuxiliaryOutputWorkingHours entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), AuxiliaryOutputWorkingHours.class);
+ AuxiliaryOutputWorkingHoursDto entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), AuxiliaryOutputWorkingHoursDto.class);
return Result.success(auxiliaryOutputWorkingHoursService.selectAuxiliaryOutputWorkingHours(page, entity));
}
+ @ValueClassify("宸ユ椂绠＄悊")
+ @ApiOperation(value = "缁熻浜ч噺宸ユ椂姹囨�诲拰杈呭姪宸ユ椂姹囨��")
+ @PostMapping("/collectWorkingHours")
+ public Result collectWorkingHours(){
+ return Result.success(auxiliaryOutputWorkingHoursService.collectWorkingHours());
+ }
+
+
+ @ValueClassify("宸ユ椂绠＄悊")
+ @ApiOperation(value = "瀵煎嚭")
+ @PostMapping("/exportWorkingHours")
+ public void exportWorkingHours(HttpServletResponse response) throws IOException {
+ auxiliaryOutputWorkingHoursService.exportWorkingHours(response);
+ }
+
+ @ValueClassify("宸ユ椂绠＄悊")
+ @ApiOperation(value = "缁勯暱鏉冮檺")
+ @PostMapping("/leader")
+ public Result leader() {
+ return Result.success();
+ }
+
}
--
Gitblit v1.9.3