SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #12.
This commit is contained in:
hejinbo
2023-09-19 11:47:53 +08:00
committed by Gitea
parent c74f16a418 4135d1096c
commit 0611cac92f
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
//选择仲裁方式 //选择仲裁方式
caseApplication.setArbitratMethod(arbitratMethod); caseApplication.setArbitratMethod(arbitratMethod);
//修改案件状态为待开庭 //修改案件状态为待开庭
caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT); caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
int i = caseApplicationMapper.submitCaseApplication(caseApplication); int i = caseApplicationMapper.submitCaseApplication(caseApplication);
if (i > 0) { if (i > 0) {
//发送短信通知 //发送短信通知
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java
+12 -1
View File
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@@ -63,6 +64,16 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
} }
//根据案件id查询案件证据材料 //根据案件id查询案件证据材料
List<CaseAttach> evidenceMaterialList = caseAttachMapper.queryAnnexPathByCaseId(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); caseDetailVO.setEvidenceMaterialList(evidenceMaterialList);
} }
return AjaxResult.success(caseDetailVO); return AjaxResult.success(caseDetailVO);
@@ -114,7 +125,7 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
@Override @Override
public AjaxResult evidenceConfirmation(CaseApplication caseApplication) { public AjaxResult evidenceConfirmation(CaseApplication caseApplication) {
caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_APPOINT_ARBOTRATAR); caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_TRIAL);
int i = caseApplicationMapper.submitCaseApplication(caseApplication); int i = caseApplicationMapper.submitCaseApplication(caseApplication);
if (i>0){ if (i>0){
return AjaxResult.success("证据确认成功"); return AjaxResult.success("证据确认成功");
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CasePaymentServiceImpl.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
@Override @Override
@Transactional @Transactional
public AjaxResult confirmPayment(CaseApplication caseApplication) { public AjaxResult confirmPayment(CaseApplication caseApplication) {
caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_RESPOND); caseApplication.setCaseStatus(CaseApplicationConstants.CASE_CROSSEXAMI);
int i = caseApplicationMapper.submitCaseApplication(caseApplication); int i = caseApplicationMapper.submitCaseApplication(caseApplication);
if (i > 0) { if (i > 0) {
//发送短信通知 //发送短信通知