Pārlūkot izejas kodu

仲裁bug修复

18792927508 2 gadus atpakaļ
vecāks
revīzija
42c9a82363

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationLogController.java Parādīt failu

@@ -65,7 +65,7 @@ public class CaseApplicationLogController {
65 65
         if(vo.getCaseId()==null || vo.getVersion()==null){
66 66
             return AjaxResult.error("参数校验错误");
67 67
         }
68
-        // todo 需确定
68
+
69 69
         return caseApplicationLogService.revoke(vo);
70 70
     }
71 71
 

+ 0
- 3
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java Parādīt failu

@@ -141,7 +141,6 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
141 141
     @Override
142 142
     @Transactional
143 143
     public AjaxResult createDocument(CaseApplication caseApplicationReq) {
144
-        // todo 生成裁决书单独出接口,即确定审理结果接口,提交按钮只改变案件状态和生成签名链接
145 144
         String templatePath = "";
146 145
         String templateName = "";
147 146
 
@@ -348,7 +347,6 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
348 347
             hearDateStr = sdf.format(hearDate);
349 348
             datas.put("审理日期", hearDateStr);
350 349
         }
351
-        // todo 线上仲裁/线下仲裁方式未选择
352 350
         //线上开庭时+线上仲裁
353 351
         if (arbitratMethod != null && arbitratMethod == 1) {
354 352
             String replace = onLine.replace(onLineDate, Optional.of(hearDateStr).orElse(""));
@@ -1344,7 +1342,6 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
1344 1342
     @Transactional
1345 1343
     @Override
1346 1344
     public AjaxResult batchDocument(List<Long> ids) {
1347
-        // todo 多线程生成裁决书
1348 1345
 //       List<MultipleThreadListParam> execList=new ArrayList<>();
1349 1346
 //       if(CollectionUtil.isNotEmpty(columnValueList)) {
1350 1347
 //           setExecList(execList, columnValueList);

+ 0
- 5
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Parādīt failu

@@ -223,7 +223,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
223 223
      */
224 224
     @Override
225 225
     public List<CaseApplication> selectCaseApplicationListByRole(CaseApplication caseApplication) {
226
-        // todo 案件列表查询Bug修复,需要看见已办案件
227 226
         // 获取登录用户
228 227
         LoginUser loginUser = getLoginUser();
229 228
         SysUser user = loginUser.getUser();
@@ -386,7 +385,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
386 385
      */
387 386
     public List<CaseApplication> page(CaseApplication caseApplication) {
388 387
         List<CaseApplication> caseApplications= new ArrayList<>();
389
-        // todo 案件列表查询Bug修复,需要看见已办案件
390 388
         // 获取登录用户
391 389
         LoginUser loginUser = getLoginUser();
392 390
         SysUser user = loginUser.getUser();
@@ -1707,7 +1705,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
1707 1705
                     for (String baseColumn : baseColumns) {
1708 1706
                        if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseApplication, baseColumn))){
1709 1707
                            errorMsg.append(baseColumn).append("不能为空,");
1710
-                           // todo 暂抛出异常,后边改为提示具体的字段
1711 1708
                            throw new ServiceException("必填字段未填写,请完善案件信息!");
1712 1709
                        }
1713 1710
                     }
@@ -1721,7 +1718,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
1721 1718
                                     for (String applicAffiliateColumn : applicAffiliateColumns) {
1722 1719
                                         if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseAffiliate, applicAffiliateColumn))){
1723 1720
                                             errorMsg.append(applicAffiliateColumn).append("不能为空,");
1724
-                                            // todo 暂抛出异常,后边改为提示具体的字段
1725 1721
                                             throw new ServiceException("必填字段未填写,请完善案件信息!");
1726 1722
                                         }
1727 1723
                                     }
@@ -1731,7 +1727,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
1731 1727
                                     for (String applicAffiliateColumn : dectborAffiliateColumns) {
1732 1728
                                         if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseAffiliate, applicAffiliateColumn))){
1733 1729
                                             errorMsg.append(applicAffiliateColumn).append("不能为空,");
1734
-                                            // todo 暂抛出异常,后边改为提示具体的字段
1735 1730
                                             throw new ServiceException("必填字段未填写,请完善案件信息!");
1736 1731
                                         }
1737 1732
                                     }

+ 0
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java Parādīt failu

@@ -481,7 +481,6 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
481 481
 
482 482
     private List<CaseEvidenceVO> getCaseEvidenceVOList(String identityNum, List<Integer> caseStatusList, Integer identityType) {
483 483
         List<CaseEvidenceVO> caseListByRespondent = caseEvidenceMapper.getCaseListByRespondent(identityNum, caseStatusList, identityType,null,SecurityUtils.getUsername());
484
-       // todo 返回房间号和开庭时间
485 484
         if (caseListByRespondent != null && caseListByRespondent.size() > 0) {
486 485
             for (CaseEvidenceVO caseEvidenceVO : caseListByRespondent) {
487 486
                 //根据案件id查询姓名
@@ -502,7 +501,6 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
502 501
     }
503 502
     private List<CaseEvidenceVO> getCaseEvidenceVOListByPhone(String phone, List<Integer> caseStatusList, Integer identityType) {
504 503
         List<CaseEvidenceVO> caseListByRespondent = caseEvidenceMapper.getCaseListByRespondent(null, caseStatusList, identityType,phone,SecurityUtils.getUsername());
505
-        // todo 返回房间号和开庭时间
506 504
         if (caseListByRespondent != null && caseListByRespondent.size() > 0) {
507 505
             for (CaseEvidenceVO caseEvidenceVO : caseListByRespondent) {
508 506
                 //根据案件id查询姓名

+ 0
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java Parādīt failu

@@ -692,7 +692,6 @@ public class CaseZipImportImpl {
692 692
                         try {
693 693
                             BigDecimal bigDecimal = new BigDecimal(caseSubjectAmount);
694 694
                             caseApplication.setCaseSubjectAmount(bigDecimal);
695
-                            // todo 案件标的名字要改,字典配置中也要改
696 695
                                 //todo 暂时设置计费比率为0.01
697 696
                                 BigDecimal feeRate = new BigDecimal(0.01);
698 697
                                 BigDecimal feePayable = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2, BigDecimal.ROUND_HALF_UP);

+ 3
- 3
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml Parādīt failu

@@ -35,9 +35,9 @@
35 35
         when 3 then '缴费确认' when 4 then '案件质证' when 5 then '组庭审核'
36 36
         when 6 then '组庭确定' when 7 then '审核仲裁方式' when 8 then '开庭审理'
37 37
         when 9 then '书面审理'
38
-        when 11 then '法律顾问核验裁决书'
39
-        when 18 then '仲裁员审核裁决书'
40
-        when 12 then '部门长审核裁决书' when 13 then '裁决书签名' when 14 then '裁决书用印'
38
+        when 11 then '核验裁决书'
39
+        when 18 then '审核裁决书'
40
+        when 12 then '审核裁决书' when 13 then '裁决书签名' when 14 then '裁决书用印'
41 41
         when 15 then '决书送达' when 16 then '案件归档' when 17 then '已归档'
42 42
         when 26 then '证据确认成功'
43 43
         when 31 then '修改开庭时间'