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 67cd0ba..71191be 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 @@ -292,6 +292,16 @@ public class CaseApplicationController extends BaseController { return toAjax(caseApplicationService.pendTralSure(caseApplication)); } + /** + * 批量组庭审核 + */ +// @PreAuthorize("@ss.hasPermi('caseManagement:list:checkgroup')") + @Log(title = "批量组庭审核", businessType = BusinessType.UPDATE) + @PostMapping("/pendTralCheckBatch") + public AjaxResult pendTralCheckBatch(@Validated @RequestBody CaseApplication caseApplication) { + return toAjax(caseApplicationService.pendTralCheckBatch(caseApplication)); + } + /** * 修改开庭时间 */ 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 be93e62..9bcfe59 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 @@ -141,4 +141,6 @@ public interface ICaseApplicationService { int submitCaseApplicationBatch(String batchNumber); int submitCaseApplicationCheckBatch(String batchNumber, Integer agreeOrNotCheck, String caseCheckReject); + + int pendTralCheckBatch(CaseApplication 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 0f0d139..4eefd8b 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 @@ -1692,7 +1692,22 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { int rows = 0; //同意组庭 if (isAgreePendTral != null && isAgreePendTral == 1) { - rows = caseApplicationMapper.submitCaseApplication(caseApplication); + CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication); + if(caseApplicationselect==null){ + throw new ServiceException("案件不存在"); + } + String arbitratorId = caseApplicationselect.getArbitratorId(); + String arbitratorName = caseApplicationselect.getArbitratorName(); + List arbitrators = caseApplication.getArbitrators(); + if(arbitrators != null && arbitrators.size() > 0 && StringUtils.isEmpty(arbitratorId) && StringUtils.isEmpty(arbitratorName)){ + List ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList()); + List arbitratorNames = arbitrators.stream().map(Arbitrator::getArbitratorName).collect(Collectors.toList()); + String idstr = ids.stream().map(Object::toString).collect(Collectors.joining(",")); + String arbitratorNamestr = arbitratorNames.stream().map(Object::toString).collect(Collectors.joining(",")); + caseApplication.setArbitratorId(idstr); + caseApplication.setArbitratorName(arbitratorNamestr); + rows = caseApplicationMapper.submitCaseApplication(caseApplication); + } } else { List arbitrators = caseApplication.getArbitrators(); // 仲裁员信息 @@ -2543,7 +2558,25 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Override public List selectCaseApplicationListBatchByRole(CaseApplication caseApplication) { - return caseApplicationMapper.selectAdminCaseApplicationListBatch(caseApplication); + List caseApplicationlist = caseApplicationMapper.selectAdminCaseApplicationListBatch(caseApplication); + if(caseApplicationlist!=null&&caseApplicationlist.size()>0){ + for(CaseApplication caseApplicationselect : caseApplicationlist){ + Integer batchNumber = caseApplicationselect.getBatchNumber(); + CaseApplication caseApplicationsel = new CaseApplication(); + caseApplicationsel.setBatchNumber(batchNumber); + List caseApplications = caseApplicationMapper.listCaseApplicationByBatchNumber(caseApplicationsel); + if (caseApplications != null && caseApplications.size() > 0) { + List caseStatuss = caseApplications.stream().map(CaseApplication::getCaseStatus).collect(Collectors.toList()); + List caseStatusNames = caseApplications.stream().map(CaseApplication::getCaseStatusName).collect(Collectors.toList()); + List caseStatussnew = caseStatuss.stream().distinct().collect(Collectors.toList()); + List caseStatusNamesnew = caseStatusNames.stream().distinct().collect(Collectors.toList()); + String caseStatusName = caseStatusNamesnew.stream().map(Object::toString).collect(Collectors.joining(",")); + caseApplicationselect.setCaseStatusName(caseStatusName); + } + } + } + + return caseApplicationlist; } @Override @@ -2704,6 +2737,66 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { return rows; } + @Override + @Transactional + public int pendTralCheckBatch(CaseApplication caseApplication) { + Integer isAgreePendTral = caseApplication.getIsAgreePendTral(); + int rows = 0; + CaseApplication caseApplicationsel = new CaseApplication(); + caseApplicationsel.setBatchNumber(caseApplication.getBatchNumber()); + caseApplicationsel.setCaseStatus(CaseApplicationConstants.CASE_CROSSEXAMI); + List caseApplications = caseApplicationMapper.listCaseApplicationByBatchNumber(caseApplicationsel); + if (caseApplications != null && caseApplications.size() > 0) { + List caseNums = caseApplications.stream().map(CaseApplication::getCaseNum).collect(Collectors.toList()); + List caseNumsnew = caseNums.stream().distinct().collect(Collectors.toList()); + String caseNumsstr = caseNumsnew.stream().map(Object::toString).collect(Collectors.joining(",")); + throw new ServiceException("案件编号"+caseNumsstr+"在案件质证节点，请先进行案件质证，然后再批量组庭审核"); + } + + CaseApplication caseApplication1 = new CaseApplication(); + caseApplication1.setBatchNumber(caseApplication.getBatchNumber()); + caseApplication1.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL_SUBMMIT); + List caseApplications1 = caseApplicationMapper.listCaseApplicationByBatchNumber(caseApplication1); + if (caseApplications1 != null && caseApplications1.size() > 0) { + for(CaseApplication caseApplicationse:caseApplications1){ + //同意组庭 + if (isAgreePendTral != null && isAgreePendTral == 1) { + + String arbitratorId = caseApplicationse.getArbitratorId(); + String arbitratorName = caseApplicationse.getArbitratorName(); + List arbitrators = caseApplication.getArbitrators(); + if(arbitrators != null && arbitrators.size() > 0 && StringUtils.isEmpty(arbitratorId) && StringUtils.isEmpty(arbitratorName)){ + List ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList()); + List arbitratorNames = arbitrators.stream().map(Arbitrator::getArbitratorName).collect(Collectors.toList()); + String idstr = ids.stream().map(Object::toString).collect(Collectors.joining(",")); + String arbitratorNamestr = arbitratorNames.stream().map(Object::toString).collect(Collectors.joining(",")); + caseApplicationse.setArbitratorId(idstr); + caseApplicationse.setArbitratorName(arbitratorNamestr); + caseApplicationse.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); + rows += caseApplicationMapper.submitCaseApplication(caseApplicationse); + } + } else { + List arbitrators = caseApplication.getArbitrators(); + // 仲裁员信息 + if (arbitrators != null && arbitrators.size() > 0) { + List ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList()); + List arbitratorNames = arbitrators.stream().map(Arbitrator::getArbitratorName).collect(Collectors.toList()); + String idstr = ids.stream().map(Object::toString).collect(Collectors.joining(",")); + String arbitratorNamestr = arbitratorNames.stream().map(Object::toString).collect(Collectors.joining(",")); + caseApplicationse.setArbitratorId(idstr); + caseApplicationse.setArbitratorName(arbitratorNamestr); + caseApplicationse.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); + rows += caseApplicationMapper.submitCaseApplication(caseApplicationse); + } + } + // 新增日志 + insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL, ""); + + } + } + return rows; + } + private String getColumnstr(String columnname) { String columnstr = ""; switch (columnname) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CasePaymentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CasePaymentServiceImpl.java index 7dfd61c..5d240c7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CasePaymentServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CasePaymentServiceImpl.java @@ -330,7 +330,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService { String batchNumber = casePayDTO.getBatchNumber(); CaseApplication caseApplicationsel = new CaseApplication(); caseApplicationsel.setBatchNumber(Integer.parseInt(batchNumber)); - caseApplicationsel.setCaseStatus(CaseApplicationConstants.PENDING_PAYMENT); +// caseApplicationsel.setCaseStatus(CaseApplicationConstants.PENDING_PAYMENT); List caseApplications = caseApplicationMapper.listCaseApplicationByBatchNumber(caseApplicationsel); CasePayListVO listVO = new CasePayListVO(); BigDecimal sum = new BigDecimal(0); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 15de2c3..eae5404 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -856,17 +856,7 @@