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/SafetyInspectionItemController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Controller/SafetyInspectionItemController.java b/src/main/java/com/gk/hotwork/Controller/SafetyInspectionItemController.java
index 80a26ba..f508ae0 100644
--- a/src/main/java/com/gk/hotwork/Controller/SafetyInspectionItemController.java
+++ b/src/main/java/com/gk/hotwork/Controller/SafetyInspectionItemController.java
@@ -7,6 +7,7 @@
import com.gk.hotwork.Domain.SafetyInspectionItem;
import com.gk.hotwork.Domain.Utils.FilterObject;
import com.gk.hotwork.Domain.Utils.Msg;
+import com.gk.hotwork.Domain.dto.resp.SafetyInspectionElementRespDTO;
import com.gk.hotwork.Service.SafetyInspectionItemService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -42,6 +43,19 @@
IPage page = safetyInspectionItemService.selectPage(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser());
return success(page);
}
+ @ApiOperation("根据B级要素id获取分页数据")
+ @PostMapping("/page/c")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "pageIndex",value = "当前页码"),
+ @ApiImplicitParam(name = "pageSize",value = "每页行数"),
+ @ApiImplicitParam(name = "element_c",value = "B要素的id"),
+ })
+ public Msg selectCPage(@RequestBody FilterObject filterObject) {
+ Integer pageIndex = filterObject.getPageIndex();
+ Integer pageSize = filterObject.getPageSize();
+ IPage page = safetyInspectionItemService.selectCPage(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser());
+ return success(page);
+ }
@ApiOperation("/A级要素下面的检查项")
@PostMapping("/infoElementA")
@@ -50,8 +64,8 @@
})
public Msg infoElementA(@RequestBody JSONObject jsonObject) {
Long id = jsonObject.getLong("id");
- List<SafetyInspectionItem> list = safetyInspectionItemService.infoElementA(id, getUser());
- return success(list);
+ SafetyInspectionElementRespDTO respDTO = safetyInspectionItemService.infoElementA(id, getUser());
+ return success(respDTO);
}
@@ -60,6 +74,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "elementA",value = "A级要素id"),
@ApiImplicitParam(name = "elementB",value = "B级要素id"),
+ @ApiImplicitParam(name = "elementC",value = "C级要素id"),
@ApiImplicitParam(name = "standardization_requirements",value = "标准化要求"),
@ApiImplicitParam(name = "enterprise_standard",value = "企业达标标准"),
@ApiImplicitParam(name = "review_method",value = "评审方法"),
@@ -71,12 +86,14 @@
return success();
}
+
@ApiOperation("/修改")
@PostMapping("/mod")
@ApiImplicitParams({
@ApiImplicitParam(name = "id",value = "id"),
@ApiImplicitParam(name = "elementA",value = "A级要素id"),
@ApiImplicitParam(name = "elementB",value = "B级要素id"),
+ @ApiImplicitParam(name = "elementC",value = "C级要素id"),
@ApiImplicitParam(name = "standardization_requirements",value = "标准化要求"),
@ApiImplicitParam(name = "enterprise_standard",value = "企业达标标准"),
@ApiImplicitParam(name = "review_method",value = "评审方法"),
--
Gitblit v1.9.2