From 4e0147ac43533a4dc99f86d443618a4959c28162 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 04 七月 2023 12:14:53 +0800
Subject: [PATCH] 邮件用户查询更新
---
src/main/java/com/whyc/controller/WorksheetMainController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorksheetMainController.java b/src/main/java/com/whyc/controller/WorksheetMainController.java
index a248063..ce2b7ac 100644
--- a/src/main/java/com/whyc/controller/WorksheetMainController.java
+++ b/src/main/java/com/whyc/controller/WorksheetMainController.java
@@ -1,10 +1,12 @@
package com.whyc.controller;
import com.github.pagehelper.PageInfo;
+import com.whyc.config.EnumWorksheetType;
import com.whyc.dto.Response;
import com.whyc.dto.WorksheetMainDTO;
import com.whyc.dto.WorksheetMainDTO2;
import com.whyc.pojo.DocUser;
+import com.whyc.pojo.ProcedureDocApproving;
import com.whyc.pojo.WorksheetMain;
import com.whyc.service.WorksheetMainService;
import com.whyc.util.ActionUtil;
@@ -14,6 +16,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.mail.MessagingException;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@@ -124,14 +128,14 @@
}
@GetMapping("handlingListPage")
- @ApiOperation("鏌ョ湅鍒嗛〉-寰呭鐞�")
+ @ApiOperation(tags = "娴佺▼鍗″拰SOP",value = "鏌ョ湅鍒嗛〉-寰呭鐞�")
public Response<PageInfo<WorksheetMain>> getHandlingListPage(@RequestParam int pageNum, @RequestParam int pageSize){
DocUser user = ActionUtil.getUser();
return service.getHandlingListPage(user,pageNum,pageSize);
}
@GetMapping("handledListPage")
- @ApiOperation("鏌ョ湅鍒嗛〉-宸插鐞�")
+ @ApiOperation(tags = "娴佺▼鍗″拰SOP",value = "鏌ョ湅鍒嗛〉-宸插鐞�")
public Response<PageInfo<WorksheetMain>> getHandledListPage(@RequestParam int pageNum, @RequestParam int pageSize){
DocUser user = ActionUtil.getUser();
return service.getHandledListPage(user,pageNum,pageSize);
@@ -152,10 +156,30 @@
}
@GetMapping("myListPage")
- @ApiOperation("鎴戠殑宸ュ崟")
+ @ApiOperation(tags = "娴佺▼鍗″拰SOP",value = "鎴戠殑宸ュ崟")
public Response<PageInfo<WorksheetMain>> getMyList(@RequestParam int pageNum,@RequestParam int pageSize){
DocUser user = ActionUtil.getUser();
return service.getMyList(pageNum,pageSize,user);
}
+ /**
+ * {@link EnumWorksheetType#getType()}
+ * @param approving
+ * @return
+ * @throws IOException
+ * @throws MessagingException
+ */
+ @PostMapping("productProcedureAndSOP")
+ @ApiOperation(tags = "娴佺▼鍗″拰SOP",value = "纭杩囩▼-浜у搧娴佺▼鍗″強SOP鎻愪氦",notes = "type:1-娴佺▼鍗�,2-SOP")
+ public Response addProductProcedureAndSOP(@RequestBody ProcedureDocApproving approving) throws IOException, MessagingException {
+ DocUser user = ActionUtil.getUser();
+ return service.addProductProcedureAndSOP(approving,user);
+ }
+
+ @GetMapping("procedurePreview")
+ @ApiOperation(tags = "娴佺▼鍗″拰SOP",value = "纭杩囩▼-棰勮pdf",notes = "")
+ public Response procedurePreview(HttpServletResponse response,@RequestParam int mainId) throws IOException {
+ return service.procedurePreview(response,mainId);
+ }
+
}
--
Gitblit v1.9.1