From 26739ae8b4e216cc5a1fe59014d1470bbcd88d5a Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 26 六月 2025 20:29:51 +0800
Subject: [PATCH] 工单审批完善
---
src/main/java/com/whyc/pojo/web_site/WorkflowMain.java | 7 +++++++
src/main/java/com/whyc/controller/WorkflowMainController.java | 11 ++++++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorkflowMainController.java b/src/main/java/com/whyc/controller/WorkflowMainController.java
index a7a1fe2..8e47704 100644
--- a/src/main/java/com/whyc/controller/WorkflowMainController.java
+++ b/src/main/java/com/whyc/controller/WorkflowMainController.java
@@ -8,11 +8,14 @@
import com.whyc.service.WorkflowMainService;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
+import com.whyc.util.JsonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.util.List;
import java.util.Map;
@RestController
@@ -23,10 +26,16 @@
@Autowired
private WorkflowMainService service;
- @PostMapping("submit")
+ /*@PostMapping("submit")
@ApiOperation(value = "鎻愪氦鍗曟嵁", notes = "浼犲弬:taskDesc,mainType,mainTypeCN,mainTypeEn,dealRoleId,processLevel")
public Response<Integer> submit(@RequestBody WorkflowMain main){
return service.submit(main);
+ }*/
+ @PostMapping("submit")
+ @ApiOperation(value = "鎻愪氦鍗曟嵁", notes = "浼犲弬:taskDesc,mainType,mainTypeCN,mainTypeEn,dealRoleId,processLevel")
+ public Response<Integer> submit(@RequestParam String mainJsonStr, @RequestPart List<MultipartFile> fileList, @RequestPart List<MultipartFile> picList){
+ WorkflowMain main = JsonUtil.getGson().fromJson(mainJsonStr, WorkflowMain.class);
+ return service.submit(main);
}
diff --git a/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java b/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java
index f385245..9e2dc09 100644
--- a/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java
+++ b/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java
@@ -7,6 +7,7 @@
import lombok.Data;
import lombok.ToString;
import org.apache.ibatis.type.Alias;
+import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.util.List;
@@ -101,4 +102,10 @@
@TableField(exist = false)
private List<WorkflowDevice> deviceList;
+
+ @TableField(exist = false)
+ private List<MultipartFile> fileList;
+
+ @TableField(exist = false)
+ private List<MultipartFile> picList;
}
--
Gitblit v1.9.1