From 190273ba210cfb659dc47f194b071e1c2f1bb384 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Fri, 20 Oct 2023 16:26:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E6=89=B9=E9=87=8F=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdjudicationController.java | 10 +++---- .../CaseApplicationController.java | 20 +++++--------- .../CaseArbitrateController.java | 14 +++++----- .../mapper/CaseAffiliateMapper.java | 2 +- .../mapper/CaseApplicationMapper.java | 2 +- .../service/IAdjudicationService.java | 2 +- .../service/ICaseApplicationService.java | 6 ++--- .../service/ICaseArbitrateService.java | 4 ++- .../service/impl/AdjudicationServiceImpl.java | 6 +++-- .../impl/CaseApplicationServiceImpl.java | 26 ++++++++++++------- .../impl/CaseArbitrateServiceImpl.java | 7 ++--- .../wisdomarbitrate/CaseAffiliateMapper.xml | 4 +-- .../wisdomarbitrate/CaseApplicationMapper.xml | 4 +-- 13 files changed, 55 insertions(+), 52 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 44f82df..65b3ed2 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,16 +80,14 @@ public class AdjudicationController extends BaseController { /** * 归档(暂时只改案件状态) - * @param caseApplication + * @param ids * @return */ @PostMapping("/caseFile") // @PreAuthorize("@ss.hasPermi('awardManagement:list:file')") - public AjaxResult caseFile(@Validated @RequestBody BatchCaseApplication caseApplication){ - if(CollectionUtil.isEmpty(caseApplication.getList())){ - return error("参数校验失败"); - } - return adjudicationService.caseFile(caseApplication); + public AjaxResult caseFile(@RequestParam(value = "ids",required = true) List ids){ + + return adjudicationService.caseFile(ids); } /** 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 3b080b9..b12e5b6 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(@Validated @RequestBody BatchCaseApplication caseApplication) { - if(CollectionUtil.isEmpty(caseApplication.getList())){ + public AjaxResult submitCaseApplication(@RequestParam(value = "ids",required = true) List ids) { + if(CollectionUtil.isEmpty(ids)){ return error("参数校验失败"); } - return toAjax(caseApplicationService.submitCaseApplication(caseApplication)); + return toAjax(caseApplicationService.submitCaseApplication(ids)); } /** @@ -102,12 +102,9 @@ public class CaseApplicationController extends BaseController { // @PreAuthorize("@ss.hasPermi('caseManagement:list:delete')") @Log(title = "删除立案数据", businessType = BusinessType.DELETE) @PostMapping("/removeCaseApplication") - public AjaxResult removeCaseApplication(@Validated @RequestBody BatchCaseApplication caseApplication) { - if(CollectionUtil.isEmpty(caseApplication.getList())){ - return error("参数校验失败"); - } + public AjaxResult removeCaseApplication(@RequestParam(value = "ids",required = true) List ids) { - return toAjax(caseApplicationService.deletecaseApplicationByIds(caseApplication)); + return success(caseApplicationService.deletecaseApplicationByIds(ids)); } /** @@ -258,11 +255,8 @@ public class CaseApplicationController extends BaseController { // @PreAuthorize("@ss.hasPermi('caseManagement:list:check')") @Log(title = "提交立案审查", businessType = BusinessType.UPDATE) @PostMapping("/submitCaseApplicationCheck") - public AjaxResult submitCaseApplicationCheck(@Validated @RequestBody BatchCaseApplication caseApplication) { - if(CollectionUtil.isEmpty(caseApplication.getList())){ - return error("参数校验失败"); - } - return toAjax(caseApplicationService.submitCaseApplicationCheck(caseApplication)); + public AjaxResult submitCaseApplicationCheck(@RequestParam(value = "ids",required = true) List ids,@RequestParam(value = "agreeOrNotCheck",required = true) Integer agreeOrNotCheck) { + return toAjax(caseApplicationService.submitCaseApplicationCheck(ids,agreeOrNotCheck)); } /** 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 8b5d385..406945d 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 @@ -12,6 +12,8 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/arbitrate") public class CaseArbitrateController extends BaseController { @@ -20,18 +22,16 @@ public class CaseArbitrateController extends BaseController { /** * 审核仲裁方式 - * @param caseApplication + * @param ids * @param opinion 1同意，0拒绝 * @return */ @PutMapping("/method") // @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')") - public AjaxResult examineArbitrateMethod(@Validated @RequestBody BatchCaseApplication caseApplication - ,Integer opinion){ - if(CollectionUtil.isEmpty(caseApplication.getList())){ - return error("参数校验失败"); - } - return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion); + public AjaxResult examineArbitrateMethod(@RequestParam(value = "ids",required = true) List ids + ,@RequestParam(value = "opinion",required = true) Integer opinion){ + + return caseArbitrateService.examineArbitrateMethod(ids,opinion); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAffiliateMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAffiliateMapper.java index 3116d21..a4e913b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAffiliateMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAffiliateMapper.java @@ -14,7 +14,7 @@ public interface CaseAffiliateMapper { void deletecaseAffiliate(CaseApplication caseApplication); - void batchDeletecaseAffiliate(BatchCaseApplication caseApplication); + void batchDeletecaseAffiliate(@Param("ids") List ids); List selectCaseAffiliate(CaseAffiliate caseAffiliate); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java index 09fdec8..431b502 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java @@ -75,5 +75,5 @@ public interface CaseApplicationMapper { * @param caseApplication * @return */ - int batchDeletecaseApplication(BatchCaseApplication caseApplication); + int batchDeletecaseApplication(@Param("ids") List ids); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IAdjudicationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IAdjudicationService.java index 8ea8294..7b3e490 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IAdjudicationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IAdjudicationService.java @@ -16,7 +16,7 @@ public interface IAdjudicationService { AjaxResult signature(CaseApplication caseApplication); - AjaxResult caseFile(BatchCaseApplication caseApplication); + AjaxResult caseFile( List ids); AjaxResult service(Long id, String appEmail, String resEmail, String apptrackingNum, String restrackingNum); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java index 7a9008e..e1672d6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java @@ -22,9 +22,9 @@ public interface ICaseApplicationService { int editCaseApplication(CaseApplication caseApplication); - int submitCaseApplication(BatchCaseApplication caseApplication); + int submitCaseApplication( List ids); - int deletecaseApplicationByIds(BatchCaseApplication caseApplication); + int deletecaseApplicationByIds(List ids); CaseApplication selectCaseApplication(CaseApplication caseApplication); @@ -42,7 +42,7 @@ public interface ICaseApplicationService { int checkArbitrateRecord(CaseApplication caseApplication); - int submitCaseApplicationCheck(BatchCaseApplication caseApplication); + int submitCaseApplicationCheck(List ids, Integer agreeOrNotCheck); CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java index e630ad2..da878c0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java @@ -5,10 +5,12 @@ import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord; import com.ruoyi.wisdomarbitrate.domain.BatchCaseApplication; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; +import java.util.List; + public interface ICaseArbitrateService { AjaxResult writtenHear(ArbitrateRecord arbitrateRecord); - AjaxResult examineArbitrateMethod(BatchCaseApplication caseApplication, Integer opinion); + AjaxResult examineArbitrateMethod(List ids, Integer opinion); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java index 83ad8da..458961e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java @@ -438,9 +438,11 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } @Override - public AjaxResult caseFile(BatchCaseApplication batchCaseApplication) { + public AjaxResult caseFile( List ids) { try { - for (CaseApplication caseApplication : batchCaseApplication.getList()) { + for (Long id :ids) { + CaseApplication caseApplication = new CaseApplication(); + caseApplication.setId(id); //更改案件状态(暂时) caseApplication.setCaseStatus(CaseApplicationConstants.CASE_ARCHIVED); caseApplicationMapper.submitCaseApplication(caseApplication); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index 68368f1..ed6837f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -38,6 +38,8 @@ import com.ruoyi.wisdomarbitrate.utils.SignAward; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestParam; + import java.io.File; import java.io.IOException; import java.math.BigDecimal; @@ -786,9 +788,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Override @Transactional - public int submitCaseApplication(BatchCaseApplication caseApplication) { + public int submitCaseApplication( List ids) { int rows=0; - for (CaseApplication application : caseApplication.getList()) { + for (Long id : ids) { + CaseApplication application = new CaseApplication(); + application.setId(id); //提交立案申请 application.setCaseStatus(CaseApplicationConstants.CASE_CHECK); rows += caseApplicationMapper.submitCaseApplication(application); @@ -800,10 +804,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Override @Transactional - public int deletecaseApplicationByIds(BatchCaseApplication caseApplication) { + public int deletecaseApplicationByIds(List ids ) { - caseAffiliateMapper.batchDeletecaseAffiliate(caseApplication); - return caseApplicationMapper.batchDeletecaseApplication(caseApplication); + caseAffiliateMapper.batchDeletecaseAffiliate(ids); + return caseApplicationMapper.batchDeletecaseApplication(ids); } @Override @@ -1414,15 +1418,17 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Override @Transactional - public int submitCaseApplicationCheck(BatchCaseApplication batchCaseApplication) { + public int submitCaseApplicationCheck(List ids, Integer agreeOrNotCheck) { //提交立案审查 int rows = 0; - for (CaseApplication caseApplication : batchCaseApplication.getList()) { - Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck(); - if(agreeOrNotCheck.intValue()==1){//同意审核 + for (Long id : ids) { + CaseApplication caseApplication = new CaseApplication(); + caseApplication.setId(id); + caseApplication.setAgreeOrNotCheck(agreeOrNotCheck); + if(agreeOrNotCheck ==1){//同意审核 caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_PAYMENT); rows+= caseApplicationMapper.submitCaseApplication(caseApplication); - }else if(agreeOrNotCheck.intValue()==2){//拒绝审核 + }else if(agreeOrNotCheck ==2){//拒绝审核 caseApplication.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION); rows+= caseApplicationMapper.submitCaseApplication(caseApplication); } 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 263c977..cdb2083 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 @@ -36,10 +36,11 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { @Override @Transactional - public AjaxResult examineArbitrateMethod(BatchCaseApplication batchCaseApplication, Integer opinion) { - for (CaseApplication caseApplication : batchCaseApplication.getList()) { - + public AjaxResult examineArbitrateMethod(List ids, Integer opinion) { + for (Long id : ids) { + CaseApplication caseApplication = new CaseApplication(); + caseApplication.setId(id); //查询案件详细信息 CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication); if (caseApplication1 == null) { diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml index f44eb14..6cb5797 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml @@ -109,8 +109,8 @@ delete from case_affiliate where case_appli_id in - - #{item.id} + + #{item} diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index e73a996..fbeb037 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -454,8 +454,8 @@ delete from case_application where id in - - #{item.id} + + #{item} -- 2.54.0