From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期三, 30 八月 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf
---
src/main/java/com/gk/hotwork/Controller/SafetySelfInspectionController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Controller/SafetySelfInspectionController.java b/src/main/java/com/gk/hotwork/Controller/SafetySelfInspectionController.java
index 2c60902..2c571ec 100644
--- a/src/main/java/com/gk/hotwork/Controller/SafetySelfInspectionController.java
+++ b/src/main/java/com/gk/hotwork/Controller/SafetySelfInspectionController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gk.hotwork.Controller.Base.BaseController;
+import com.gk.hotwork.Domain.AttachmentInfo;
import com.gk.hotwork.Domain.SafetySelfInspection;
import com.gk.hotwork.Domain.SafetySelfInspectionItem;
import com.gk.hotwork.Domain.Utils.FilterObject;
@@ -38,7 +39,7 @@
@ApiImplicitParam(name = "pageSize",value = "每页行数"),
@ApiImplicitParam(name = "inspectionName",value = "自查清单名称"),
@ApiImplicitParam(name = "inspectorName",value = "检查人名称"),
- @ApiImplicitParam(name = "checkedCompanyId",value = "被检查公司id"),
+ @ApiImplicitParam(name = "checkedCompanyName",value = "被检查公司名称"),
@ApiImplicitParam(name = "inspectionStartTime",value = "开始时间"),
@ApiImplicitParam(name = "inspectionEndTime",value = "结束时间"),
@ApiImplicitParam(name = "status",value = "状态"),
@@ -126,6 +127,15 @@
safetySelfInspectionService.addItemExpert(itemList, getUser());
return success();
}
+ @ApiOperation("/添加检查清单附件")
+ @PostMapping("/add/check/attachment")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "attachmentList",value = "附件集合"),
+ })
+ public Msg addCheckAttachment(@RequestBody List<AttachmentInfo> attachmentList) {
+ safetySelfInspectionService.addCheckAttachment(attachmentList, getUser());
+ return success();
+ }
@ApiOperation("/新增")
--
Gitblit v1.9.2