From 58579a382615c0f9bd03b52ae7227a2ca64f43f3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 23 八月 2023 16:43:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 chart-server/src/main/java/com/yuanchu/limslaboratory/controller/WorkController.java |   69 ++++++++++++++++++++++++++++++++++
 1 files changed, 69 insertions(+), 0 deletions(-)

diff --git a/chart-server/src/main/java/com/yuanchu/limslaboratory/controller/WorkController.java b/chart-server/src/main/java/com/yuanchu/limslaboratory/controller/WorkController.java
new file mode 100644
index 0000000..e9daed7
--- /dev/null
+++ b/chart-server/src/main/java/com/yuanchu/limslaboratory/controller/WorkController.java
@@ -0,0 +1,69 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import com.yuanchu.limslaboratory.pojo.vo.ProjectNumVo;
+import com.yuanchu.limslaboratory.service.WorkService;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags = "鏅鸿兘鍥捐〃-->宸ヤ綔缁熻")
+@RestController
+@RequestMapping("/work")
+public class WorkController {
+
+    @Resource
+    WorkService workService;
+
+    @ApiOperation("璐d换浜洪」鐩暟缁熻")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "startTime", value = "妫�楠屽紑濮嬫棩鏈�", dataTypeClass = String.class, required = true),
+            @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸棩鏈�", dataTypeClass = String.class, required = true),
+            @ApiImplicitParam(name = "type", value = "妫�楠岀被鍨�(0:鍘熸潗鏂�;1:鎴愬搧;2:濮旀墭鍝�)", dataTypeClass = Integer.class, required = true)
+    })
+    @GetMapping("/dutyMater")
+    public Result dutyMater(String startTime,String endTime,Integer type) {
+        return Result.success(workService.dutyMater(startTime,endTime,type));
+    }
+
+
+    @ApiOperation("鎵ц浜洪」鐩暟缁熻")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "startTime", value = "妫�楠屽紑濮嬫棩鏈�", dataTypeClass = String.class, required = true),
+            @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸棩鏈�", dataTypeClass = String.class, required = true),
+            @ApiImplicitParam(name = "type", value = "妫�楠岀被鍨�(0:鍘熸潗鏂�;1:鎴愬搧;2:濮旀墭鍝�)", dataTypeClass = Integer.class, required = true)
+    })
+    @GetMapping("/executeMater")
+    public Result executeMater(String startTime,String endTime,Integer type) {
+        return Result.success(workService.executeMater(startTime,endTime,type));
+    }
+
+    @ApiOperation("璐d换浜哄強鏃剁巼")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "startTime", value = "妫�楠屽紑濮嬫棩鏈�", dataTypeClass = String.class, required = true),
+            @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸棩鏈�", dataTypeClass = String.class, required = true),
+            @ApiImplicitParam(name = "type", value = "妫�楠岀被鍨�(0:鍘熸潗鏂�;1:鎴愬搧;2:濮旀墭鍝�)", dataTypeClass = Integer.class, required = true)
+    })
+    @GetMapping("/dutytimely")
+    public Result dutytimely(String startTime,String endTime,Integer type) {
+        return Result.success(workService.dutytimely(startTime,endTime,type));
+    }
+
+    @ApiOperation("鎵ц浜哄強鏃剁巼")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "startTime", value = "妫�楠屽紑濮嬫棩鏈�", dataTypeClass = String.class, required = true),
+            @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸棩鏈�", dataTypeClass = String.class, required = true),
+            @ApiImplicitParam(name = "type", value = "妫�楠岀被鍨�(0:鍘熸潗鏂�;1:鎴愬搧;2:濮旀墭鍝�)", dataTypeClass = Integer.class, required = true)
+    })
+    @GetMapping("/executetimely")
+    public Result executetimely(String startTime,String endTime,Integer type) {
+        return Result.success(workService.executetimely(startTime,endTime,type));
+    }
+}

--
Gitblit v1.9.3