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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java

@@ -39,7 +39,7 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
             //选择仲裁方式
             caseApplication.setArbitratMethod(arbitratMethod);
             //修改案件状态为待开庭
-            caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT);
+            caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
             int i = caseApplicationMapper.submitCaseApplication(caseApplication);
             if (i > 0) {
                 //发送短信通知

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java

@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -63,6 +64,16 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
                 }
                 //根据案件id查询案件证据材料
                 List<CaseAttach> evidenceMaterialList = caseAttachMapper.queryAnnexPathByCaseId(id);
+                if (evidenceMaterialList!=null&&evidenceMaterialList.size()>0){
+                    for (CaseAttach caseAttach : evidenceMaterialList) {
+                        String path =caseAttach.getAnnexName();
+                        String prefix = "/profile";
+                        int startIndex = path.indexOf(prefix);
+                        startIndex += prefix.length();
+                        String extractedPath = "/uploadPath"+path.substring(startIndex);
+                        caseAttach.setAnnexPath(extractedPath);
+                    }
+                }
                 caseDetailVO.setEvidenceMaterialList(evidenceMaterialList);
             }
             return AjaxResult.success(caseDetailVO);
@@ -114,7 +125,7 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
 
     @Override
     public AjaxResult evidenceConfirmation(CaseApplication caseApplication) {
-        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_APPOINT_ARBOTRATAR);
+        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_TRIAL);
         int i = caseApplicationMapper.submitCaseApplication(caseApplication);
         if (i>0){
             return AjaxResult.success("证据确认成功");

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CasePaymentServiceImpl.java

@@ -91,7 +91,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
     @Override
     @Transactional
     public AjaxResult confirmPayment(CaseApplication caseApplication) {
-        caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_RESPOND);
+        caseApplication.setCaseStatus(CaseApplicationConstants.CASE_CROSSEXAMI);
         int i = caseApplicationMapper.submitCaseApplication(caseApplication);
         if (i > 0) {
             //发送短信通知