Merge remote-tracking branch 'origin/dev' into dev

zhuo

2025-02-22 25bb326310aec0fd209a88db5d8909863e523390

Merge remote-tracking branch 'origin/dev' into dev

 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());

 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);
    }

 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));
    }


 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));
    }


 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();
    }

 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));
    }

 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));
    }

 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);
    }

 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 -->