From 39bce7bd624d6c5c3f4cfcbdf41b3e39cc32568f Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Fri, 20 Oct 2023 17:13:12 +0800 Subject: [PATCH] 1 --- .../AdjudicationController.java | 10 +++++---- .../CaseApplicationController.java | 22 ++++++++++++------- .../CaseArbitrateController.java | 13 ++++++----- .../domain/BatchCaseApplication.java | 10 ++++++++- .../impl/CaseArbitrateServiceImpl.java | 2 +- .../wisdomarbitrate/CaseApplicationMapper.xml | 3 ++- 6 files changed, 39 insertions(+), 21 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java index 65b3ed2..a38755d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java @@ -80,14 +80,16 @@ public class AdjudicationController extends BaseController { /** * 归档(暂时只改案件状态) - * @param ids + * @param batchCaseApplication * @return */ @PostMapping("/caseFile") // @PreAuthorize("@ss.hasPermi('awardManagement:list:file')") - public AjaxResult caseFile(@RequestParam(value = "ids",required = true) List ids){ - - return adjudicationService.caseFile(ids); + public AjaxResult caseFile(@RequestBody BatchCaseApplication batchCaseApplication){ + if(CollectionUtil.isEmpty(batchCaseApplication.getIds())){ + return error("参数校验失败"); + } + return adjudicationService.caseFile(batchCaseApplication.getIds()); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java index b12e5b6..2f2554f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java @@ -89,11 +89,11 @@ public class CaseApplicationController extends BaseController { // @PreAuthorize("@ss.hasPermi('caseManagement:list:submit')") @Log(title = "提交立案申请", businessType = BusinessType.UPDATE) @PostMapping("/submitCaseApplication") - public AjaxResult submitCaseApplication(@RequestParam(value = "ids",required = true) List ids) { - if(CollectionUtil.isEmpty(ids)){ + public AjaxResult submitCaseApplication(@RequestBody BatchCaseApplication batchCaseApplication) { + if(CollectionUtil.isEmpty(batchCaseApplication.getIds())){ return error("参数校验失败"); } - return toAjax(caseApplicationService.submitCaseApplication(ids)); + return toAjax(caseApplicationService.submitCaseApplication(batchCaseApplication.getIds())); } /** @@ -102,9 +102,11 @@ public class CaseApplicationController extends BaseController { // @PreAuthorize("@ss.hasPermi('caseManagement:list:delete')") @Log(title = "删除立案数据", businessType = BusinessType.DELETE) @PostMapping("/removeCaseApplication") - public AjaxResult removeCaseApplication(@RequestParam(value = "ids",required = true) List ids) { - - return success(caseApplicationService.deletecaseApplicationByIds(ids)); + public AjaxResult removeCaseApplication(@RequestBody BatchCaseApplication batchCaseApplication) { + if(CollectionUtil.isEmpty(batchCaseApplication.getIds())){ + return error("参数校验失败"); + } + return success(caseApplicationService.deletecaseApplicationByIds(batchCaseApplication.getIds())); } /** @@ -235,6 +237,7 @@ public class CaseApplicationController extends BaseController { @Log(title = "审核裁决书", businessType = BusinessType.UPDATE) @PostMapping("/checkArbitrateRecord") public AjaxResult checkArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) { + return toAjax(caseApplicationService.checkArbitrateRecord(caseApplication)); } @@ -255,8 +258,11 @@ public class CaseApplicationController extends BaseController { // @PreAuthorize("@ss.hasPermi('caseManagement:list:check')") @Log(title = "提交立案审查", businessType = BusinessType.UPDATE) @PostMapping("/submitCaseApplicationCheck") - public AjaxResult submitCaseApplicationCheck(@RequestParam(value = "ids",required = true) List ids,@RequestParam(value = "agreeOrNotCheck",required = true) Integer agreeOrNotCheck) { - return toAjax(caseApplicationService.submitCaseApplicationCheck(ids,agreeOrNotCheck)); + public AjaxResult submitCaseApplicationCheck(@RequestBody BatchCaseApplication batchCaseApplication) { + if(CollectionUtil.isEmpty(batchCaseApplication.getIds())|| batchCaseApplication.getAgreeOrNotCheck()==null){ + return error("参数校验失败"); + } + return success(caseApplicationService.submitCaseApplicationCheck(batchCaseApplication.getIds(),batchCaseApplication.getAgreeOrNotCheck())); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java index 406945d..9f09e90 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java @@ -22,16 +22,17 @@ public class CaseArbitrateController extends BaseController { /** * 审核仲裁方式 - * @param ids - * @param opinion 1同意，0拒绝 + * @param batchCaseApplication + * @param batchCaseApplication 1同意，0拒绝 * @return */ @PutMapping("/method") // @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')") - public AjaxResult examineArbitrateMethod(@RequestParam(value = "ids",required = true) List ids - ,@RequestParam(value = "opinion",required = true) Integer opinion){ - - return caseArbitrateService.examineArbitrateMethod(ids,opinion); + public AjaxResult examineArbitrateMethod(@RequestBody BatchCaseApplication batchCaseApplication){ + if(CollectionUtil.isEmpty(batchCaseApplication.getIds())|| batchCaseApplication.getOpinion()==null){ + return error("参数校验失败"); + } + return caseArbitrateService.examineArbitrateMethod(batchCaseApplication.getIds(),batchCaseApplication.getOpinion()); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/BatchCaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/BatchCaseApplication.java index 3436b9f..b881187 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/BatchCaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/BatchCaseApplication.java @@ -11,5 +11,13 @@ import java.util.List; */ @Data public class BatchCaseApplication { - private List list; + private List ids; + /** + * 是否同意，0拒绝，1同意 + */ + private Integer agreeOrNotCheck; + /** + * 1同意，0拒绝 + */ + private Integer opinion; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java index cdb2083..be1cf7b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java @@ -44,7 +44,7 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { //查询案件详细信息 CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication); if (caseApplication1 == null) { - return AjaxResult.error(); + return AjaxResult.success(); } int arbitratMethod = caseApplication1.getArbitratMethod(); String caseNum = caseApplication1.getCaseNum(); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index fbeb037..911f3e0 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -44,6 +44,7 @@ +