Explorar el Código

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz

qitz hace 2 años
padre
commit
3fb9bf8f90

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java Ver fichero

39
             //选择仲裁方式
39
             //选择仲裁方式
40
             caseApplication.setArbitratMethod(arbitratMethod);
40
             caseApplication.setArbitratMethod(arbitratMethod);
41
             //修改案件状态为待开庭
41
             //修改案件状态为待开庭
42
-            caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT);
42
+            caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
43
             int i = caseApplicationMapper.submitCaseApplication(caseApplication);
43
             int i = caseApplicationMapper.submitCaseApplication(caseApplication);
44
             if (i > 0) {
44
             if (i > 0) {
45
                 //发送短信通知
45
                 //发送短信通知

+ 12
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java Ver fichero

24
 import java.time.LocalDate;
24
 import java.time.LocalDate;
25
 import java.time.LocalDateTime;
25
 import java.time.LocalDateTime;
26
 import java.time.format.DateTimeFormatter;
26
 import java.time.format.DateTimeFormatter;
27
+import java.util.ArrayList;
27
 import java.util.Arrays;
28
 import java.util.Arrays;
28
 import java.util.List;
29
 import java.util.List;
29
 
30
 
63
                 }
64
                 }
64
                 //根据案件id查询案件证据材料
65
                 //根据案件id查询案件证据材料
65
                 List<CaseAttach> evidenceMaterialList = caseAttachMapper.queryAnnexPathByCaseId(id);
66
                 List<CaseAttach> evidenceMaterialList = caseAttachMapper.queryAnnexPathByCaseId(id);
67
+                if (evidenceMaterialList!=null&&evidenceMaterialList.size()>0){
68
+                    for (CaseAttach caseAttach : evidenceMaterialList) {
69
+                        String path =caseAttach.getAnnexName();
70
+                        String prefix = "/profile";
71
+                        int startIndex = path.indexOf(prefix);
72
+                        startIndex += prefix.length();
73
+                        String extractedPath = "/uploadPath"+path.substring(startIndex);
74
+                        caseAttach.setAnnexPath(extractedPath);
75
+                    }
76
+                }
66
                 caseDetailVO.setEvidenceMaterialList(evidenceMaterialList);
77
                 caseDetailVO.setEvidenceMaterialList(evidenceMaterialList);
67
             }
78
             }
68
             return AjaxResult.success(caseDetailVO);
79
             return AjaxResult.success(caseDetailVO);
114
 
125
 
115
     @Override
126
     @Override
116
     public AjaxResult evidenceConfirmation(CaseApplication caseApplication) {
127
     public AjaxResult evidenceConfirmation(CaseApplication caseApplication) {
117
-        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_APPOINT_ARBOTRATAR);
128
+        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_TRIAL);
118
         int i = caseApplicationMapper.submitCaseApplication(caseApplication);
129
         int i = caseApplicationMapper.submitCaseApplication(caseApplication);
119
         if (i>0){
130
         if (i>0){
120
             return AjaxResult.success("证据确认成功");
131
             return AjaxResult.success("证据确认成功");

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CasePaymentServiceImpl.java Ver fichero

91
     @Override
91
     @Override
92
     @Transactional
92
     @Transactional
93
     public AjaxResult confirmPayment(CaseApplication caseApplication) {
93
     public AjaxResult confirmPayment(CaseApplication caseApplication) {
94
-        caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_RESPOND);
94
+        caseApplication.setCaseStatus(CaseApplicationConstants.CASE_CROSSEXAMI);
95
         int i = caseApplicationMapper.submitCaseApplication(caseApplication);
95
         int i = caseApplicationMapper.submitCaseApplication(caseApplication);
96
         if (i > 0) {
96
         if (i > 0) {
97
             //发送短信通知
97
             //发送短信通知