From 93a16e3707b870856594e89b950174b64bb7d6cd Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 01 三月 2023 10:55:34 +0800
Subject: [PATCH] ecr提交前一步执行原文件存储
---
src/main/java/com/whyc/controller/SoftwareController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/SoftwareController.java b/src/main/java/com/whyc/controller/SoftwareController.java
index 98913ba..462c62f 100644
--- a/src/main/java/com/whyc/controller/SoftwareController.java
+++ b/src/main/java/com/whyc/controller/SoftwareController.java
@@ -42,9 +42,9 @@
@ApiOperation("杞欢涓婁紶")
@PostMapping("upload")
- public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String softwareStr) throws IOException {
+ public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String fontUpdateTime,@RequestParam String softwareStr) throws IOException {
List<Software> softwareList = ActionUtil.getGson().fromJson(softwareStr,new TypeToken<List<Software>>(){}.getType());
- return service.upload(file1,file2,softwareList);
+ return service.upload(file1,file2,fontUpdateTime,softwareList);
}
@ApiOperation("鏇存柊杞欢鐗堟湰瀵瑰簲鐨勯�傜敤鏈哄瀷")
@@ -60,8 +60,9 @@
@RequestParam(required = false) String applyMaterialCode,
@RequestParam(required = false) String applyModel,
@RequestParam(required = false) String owner,
+ @RequestParam(required = false) String boardNumber,
@RequestParam int pageCurr,@RequestParam int pageSize ){
- return service.getAllSoftware(fileName,applyMaterialCode,applyModel,owner,pageCurr,pageSize);
+ return service.getAllSoftware(fileName,applyMaterialCode,applyModel,owner,boardNumber,pageCurr,pageSize);
}
@ApiOperation(value = "鏍规嵁subcode鏌ヨ杞欢鍒楄〃")
--
Gitblit v1.9.1