From 49034a174da199c56fa132973b99a6b06cd5b4a4 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期一, 23 十二月 2024 17:05:29 +0800
Subject: [PATCH] 修改sql
---
assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/AssAccessoryFileController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/AssAccessoryFileController.java b/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/AssAccessoryFileController.java
index be5100b..97c3298 100644
--- a/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/AssAccessoryFileController.java
+++ b/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/AssAccessoryFileController.java
@@ -3,11 +3,14 @@
import com.gkhy.assess.common.annotation.RepeatSubmit;
import com.gkhy.assess.common.api.CommonResult;
+import com.gkhy.assess.system.domain.AssProjectSupplement;
import com.gkhy.assess.system.service.AssAccessoryFileService;
+import com.gkhy.assess.system.service.AssProjectSupplementFileService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -28,6 +31,8 @@
public class AssAccessoryFileController {
@Autowired
private AssAccessoryFileService assAccessoryFileService;
+ @Autowired
+ private AssProjectSupplementFileService assProjectSupplementFileService;
@RepeatSubmit
@ApiOperation(value = "评估文件上传(图片/文件)")
@@ -36,18 +41,19 @@
@ApiImplicitParam(paramType = "body", name = "projectId", dataType = "long", required = true, value = "项目id"),
@ApiImplicitParam(paramType = "body", name = "moduleType", dataType = "int", required = true, value = "上传模块code:1主要装置前的合影照片,2现场勘验照片,3企业陪同人员图片,4现场勘验视频,5编制现场安全检查表,6评审记录附件,7评价结论,8过程控制记录文档附件,9项目归档材料,10报备申请附件,11项目整改情况附件")
})
- public CommonResult uploadFile(@RequestParam @NotNull Long projectId,@RequestParam @NotNull Integer moduleType, @RequestParam MultipartFile file){
- return CommonResult.success(assAccessoryFileService.uploadFile(projectId,moduleType,file));
+ public CommonResult uploadFile(@RequestParam @NotNull Long projectId,@RequestParam @NotNull Integer moduleType,@RequestParam MultipartFile file){
+ return CommonResult.success(assAccessoryFileService.uploadFile(projectId, moduleType, file));
}
@ApiOperation(value = "根据项目id获取评估文件")
@GetMapping("/getAccessoryFileByProjectId")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "projectId", dataType = "long", required = true, value = "项目id"),
+ @ApiImplicitParam(paramType = "query", name = "processId", dataType = "long", required = true, value = "过程id"),
@ApiImplicitParam(paramType = "query", name = "moduleType", dataType = "int", required = true, value = "上传模块code")
})
- public CommonResult getAccessoryFileByProjectId(Long projectId,Integer moduleType){
- return CommonResult.success(assAccessoryFileService.getAccessoryFileByProjectId(projectId,moduleType));
+ public CommonResult getAccessoryFileByProjectId(Long projectId,Integer moduleType,@RequestParam(required = false) Long processId){
+ return CommonResult.success(assAccessoryFileService.getAccessoryFileByProjectId(projectId,processId,moduleType));
}
--
Gitblit v1.9.2