From 25bb326310aec0fd209a88db5d8909863e523390 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 22 二月 2025 14:12:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java | 4 ++--
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java | 2 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java | 2 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java | 2 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java | 2 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java | 2 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java | 2 +-
pom.xml | 2 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
index 3e5702c..64e7189 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
@@ -92,7 +92,7 @@
@ApiOperation(value = "鏂板")
@PostMapping("/analysisOfMajorRiskFactorsAdded")
- public void analysisOfMajorRiskFactorsAdded(ManageControlPlanList manageControlPlanList) {
+ public void analysisOfMajorRiskFactorsAdded(@RequestBody ManageControlPlanList manageControlPlanList) {
Integer userId = SecurityUtils.getUserId().intValue();
manageControlPlanList.setEditor(userId);
manageControlPlanList.setEditorDate(LocalDateTime.now());
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java
index 731ac07..f23bc8d 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java
@@ -69,13 +69,13 @@
@ApiOperation(value = "瀹℃牳鏂囦欢鍙樻洿")
@PostMapping("/checkManageDocumentAlter")
- public Result checkManageDocumentAlter(ManageDocumentAlter manageDocumentAlter){
+ public Result checkManageDocumentAlter(@RequestBody ManageDocumentAlter manageDocumentAlter){
return Result.success(manageDocumentAlterService.checkManageDocumentAlter(manageDocumentAlter));
}
@ApiOperation(value = "瀹℃牳鏌ョ湅闄勪欢")
- @PostMapping("/checkManageDocumentAlterPdf")
+ @GetMapping("/checkManageDocumentAlterPdf")
public void checkManageDocumentAlterPdf(Long id, HttpServletResponse response)throws Exception {
manageDocumentAlterService.checkManageDocumentAlterPdf(id,response);
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java
index 4740b22..59fb849 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java
@@ -69,7 +69,7 @@
@ApiOperation(value = "瀹℃牳鏂囦欢鍙楁帶")
@PostMapping("/checkManageDocumentControlled")
- public Result checkManageDocumentControlled(ManageDocumentControlled manageDocumentControlled){
+ public Result checkManageDocumentControlled(@RequestBody ManageDocumentControlled manageDocumentControlled){
return Result.success(manageDocumentControlledService.checkManageDocumentControlled(manageDocumentControlled));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java
index 840cd80..83b6a28 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java
@@ -63,7 +63,7 @@
@ApiOperation(value = "缂栬緫鏂囦欢鍙戞斁鍥炴敹")
@PostMapping("/doManageDocumentIssueRecycle")
- public Result doManageDocumentIssueRecycle(ManageDocumentIssueRecycle manageDocumentIssueRecycle){
+ public Result doManageDocumentIssueRecycle(@RequestBody ManageDocumentIssueRecycle manageDocumentIssueRecycle){
return Result.success(manageDocumentIssueRecycleService.doManageDocumentIssueRecycle(manageDocumentIssueRecycle));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java
index eb08a35..0fb9c68 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java
@@ -38,7 +38,7 @@
@ApiOperation(value = "鏂板浼氳璁板綍鍙備細浜哄憳")
@PostMapping("/add")
- public Result addParticipants(List<ManageMeetingParticipants> list){
+ public Result addParticipants(@RequestBody List<ManageMeetingParticipants> list){
manageMeetingParticipantsService.saveBatch(list);
return Result.success();
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java
index 0623941..1bb3064 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java
@@ -45,7 +45,7 @@
}
@ApiOperation(value = "缂栬緫璇勫璁″垝")
- @PutMapping("/modifyReviewProgram")
+ @PostMapping("/modifyReviewProgram")
public Result modifyReviewProgram(@RequestBody ManageReviewProgram manageReviewProgram){
return Result.success(manageReviewProgramService.updateById(manageReviewProgram));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java
index a7f58df..dd8f817 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java
@@ -44,7 +44,7 @@
}
@ApiOperation(value = "缂栬緫绠＄悊璇勫鎶ュ憡")
- @PutMapping("/modifyReviewReport")
+ @PostMapping("/modifyReviewReport")
public Result modifyReviewReport(@RequestBody ManageReviewReport manageReviewReport){
return Result.success(manageReviewReportService.updateById(manageReviewReport));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java
index 52c2f47..0e01a26 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java
@@ -104,7 +104,7 @@
}
@ApiOperation(value = "鍒犻櫎")
- @GetMapping("/removeRiskFactors")
+ @DeleteMapping("/removeRiskFactors")
public void removeRiskFactors(Integer id) {
manageRiskAssessmentResultsService.removeById(id);
}
diff --git a/pom.xml b/pom.xml
index 94e9b64..cc85619 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<fastjson.version>2.0.23</fastjson.version>
<oshi.version>6.6.5</oshi.version>
<commons.io.version>2.13.0</commons.io.version>
- <poi.version>4.1.2</poi.version>
+ <poi.version>5.2.2</poi.version>
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
<!-- override dependency version -->
--
Gitblit v1.9.3