From 42c9a823636766679bd77a2c6cf6e0a0416d8e91 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Sat, 11 May 2024 09:05:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=B2=E8=A3=81bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdomarbitrate/CaseApplicationLogController.java | 2 +- .../service/impl/AdjudicationServiceImpl.java | 3 --- .../service/impl/CaseApplicationServiceImpl.java | 5 ----- .../service/impl/CaseEvidenceServiceImpl.java | 2 -- .../wisdomarbitrate/service/impl/CaseZipImportImpl.java | 1 - .../mapper/wisdomarbitrate/CaseLogRecordMapper.xml | 6 +++--- 6 files changed, 4 insertions(+), 15 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationLogController.java index e980e1c..63f1e41 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationLogController.java @@ -65,7 +65,7 @@ public class CaseApplicationLogController { if(vo.getCaseId()==null || vo.getVersion()==null){ return AjaxResult.error("参数校验错误"); } - // todo 需确定 + return caseApplicationLogService.revoke(vo); } 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 f9544e9..a5aff97 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 @@ -141,7 +141,6 @@ public class AdjudicationServiceImpl implements IAdjudicationService { @Override @Transactional public AjaxResult createDocument(CaseApplication caseApplicationReq) { - // todo 生成裁决书单独出接口，即确定审理结果接口，提交按钮只改变案件状态和生成签名链接 String templatePath = ""; String templateName = ""; @@ -348,7 +347,6 @@ public class AdjudicationServiceImpl implements IAdjudicationService { hearDateStr = sdf.format(hearDate); datas.put("审理日期", hearDateStr); } - // todo 线上仲裁/线下仲裁方式未选择 //线上开庭时+线上仲裁 if (arbitratMethod != null && arbitratMethod == 1) { String replace = onLine.replace(onLineDate, Optional.of(hearDateStr).orElse("")); @@ -1344,7 +1342,6 @@ public class AdjudicationServiceImpl implements IAdjudicationService { @Transactional @Override public AjaxResult batchDocument(List ids) { - // todo 多线程生成裁决书 // List execList=new ArrayList<>(); // if(CollectionUtil.isNotEmpty(columnValueList)) { // setExecList(execList, columnValueList); 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 42cbad5..37ebea5 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 @@ -223,7 +223,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { */ @Override public List selectCaseApplicationListByRole(CaseApplication caseApplication) { - // todo 案件列表查询Bug修复，需要看见已办案件 // 获取登录用户 LoginUser loginUser = getLoginUser(); SysUser user = loginUser.getUser(); @@ -386,7 +385,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { */ public List page(CaseApplication caseApplication) { List caseApplications= new ArrayList<>(); - // todo 案件列表查询Bug修复，需要看见已办案件 // 获取登录用户 LoginUser loginUser = getLoginUser(); SysUser user = loginUser.getUser(); @@ -1707,7 +1705,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { for (String baseColumn : baseColumns) { if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseApplication, baseColumn))){ errorMsg.append(baseColumn).append("不能为空，"); - // todo 暂抛出异常，后边改为提示具体的字段 throw new ServiceException("必填字段未填写，请完善案件信息！"); } } @@ -1721,7 +1718,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { for (String applicAffiliateColumn : applicAffiliateColumns) { if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseAffiliate, applicAffiliateColumn))){ errorMsg.append(applicAffiliateColumn).append("不能为空，"); - // todo 暂抛出异常，后边改为提示具体的字段 throw new ServiceException("必填字段未填写，请完善案件信息！"); } } @@ -1731,7 +1727,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { for (String applicAffiliateColumn : dectborAffiliateColumns) { if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseAffiliate, applicAffiliateColumn))){ errorMsg.append(applicAffiliateColumn).append("不能为空，"); - // todo 暂抛出异常，后边改为提示具体的字段 throw new ServiceException("必填字段未填写，请完善案件信息！"); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java index aecff46..dd2a5b9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java @@ -481,7 +481,6 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService { private List getCaseEvidenceVOList(String identityNum, List caseStatusList, Integer identityType) { List caseListByRespondent = caseEvidenceMapper.getCaseListByRespondent(identityNum, caseStatusList, identityType,null,SecurityUtils.getUsername()); - // todo 返回房间号和开庭时间 if (caseListByRespondent != null && caseListByRespondent.size() > 0) { for (CaseEvidenceVO caseEvidenceVO : caseListByRespondent) { //根据案件id查询姓名 @@ -502,7 +501,6 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService { } private List getCaseEvidenceVOListByPhone(String phone, List caseStatusList, Integer identityType) { List caseListByRespondent = caseEvidenceMapper.getCaseListByRespondent(null, caseStatusList, identityType,phone,SecurityUtils.getUsername()); - // todo 返回房间号和开庭时间 if (caseListByRespondent != null && caseListByRespondent.size() > 0) { for (CaseEvidenceVO caseEvidenceVO : caseListByRespondent) { //根据案件id查询姓名 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java index 8bec27c..3635d83 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java @@ -692,7 +692,6 @@ public class CaseZipImportImpl { try { BigDecimal bigDecimal = new BigDecimal(caseSubjectAmount); caseApplication.setCaseSubjectAmount(bigDecimal); - // todo 案件标的名字要改，字典配置中也要改 //todo 暂时设置计费比率为0.01 BigDecimal feeRate = new BigDecimal(0.01); BigDecimal feePayable = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2, BigDecimal.ROUND_HALF_UP); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml index bd37136..4fb0e78 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml @@ -35,9 +35,9 @@ when 3 then '缴费确认' when 4 then '案件质证' when 5 then '组庭审核' when 6 then '组庭确定' when 7 then '审核仲裁方式' when 8 then '开庭审理' when 9 then '书面审理' - when 11 then '法律顾问核验裁决书' - when 18 then '仲裁员审核裁决书' - when 12 then '部门长审核裁决书' when 13 then '裁决书签名' when 14 then '裁决书用印' + when 11 then '核验裁决书' + when 18 then '审核裁决书' + when 12 then '审核裁决书' when 13 then '裁决书签名' when 14 then '裁决书用印' when 15 then '决书送达' when 16 then '案件归档' when 17 then '已归档' when 26 then '证据确认成功' when 31 then '修改开庭时间' -- 2.54.0