diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java index 069c72e..aed5bb0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.wisdomarbitrate; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; import com.ruoyi.wisdomarbitrate.service.ICaseArbitrateService; import org.springframework.beans.factory.annotation.Autowired; @@ -34,8 +35,7 @@ public class CaseArbitrateController extends BaseController { * @return */ @PostMapping("/writtenHear") - public AjaxResult writtenHear(@Validated @RequestBody CaseApplication caseApplication - ,String accidentDescription , String arbitrationResult){ - return caseArbitrateService.writtenHear(caseApplication,accidentDescription,arbitrationResult); + public AjaxResult writtenHear(@Validated @RequestBody ArbitrateRecord arbitrateRecord){ + return caseArbitrateService.writtenHear(arbitrateRecord); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java index 231ae50..1f02239 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java @@ -1,10 +1,11 @@ package com.ruoyi.wisdomarbitrate.service; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; public interface ICaseArbitrateService { AjaxResult chooseArbitrateMethod(CaseApplication caseApplication,Integer arbitratMethod); - AjaxResult writtenHear(CaseApplication caseApplication, String accidentDescription, String arbitrationResult); + AjaxResult writtenHear(ArbitrateRecord arbitrateRecord); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java index dcfedd8..49bdea6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java @@ -3,9 +3,11 @@ package com.ruoyi.wisdomarbitrate.service.impl; import com.ruoyi.common.constant.CaseApplicationConstants; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.SmsUtils; +import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord; import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; +import com.ruoyi.wisdomarbitrate.mapper.ArbitrateRecordMapper; import com.ruoyi.wisdomarbitrate.mapper.CaseAffiliateMapper; import com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper; import com.ruoyi.wisdomarbitrate.mapper.CaseLogRecordMapper; @@ -24,6 +26,8 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { private CaseAffiliateMapper caseAffiliateMapper; @Autowired private CaseLogRecordMapper caseLogRecordMapper; + @Autowired + private ArbitrateRecordMapper arbitrateRecordMapper; @Override @Transactional @@ -76,18 +80,22 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { } @Override - public AjaxResult writtenHear(CaseApplication caseApplication, String accidentDescription, String arbitrationResult) { - //提交仲裁结果 + public AjaxResult writtenHear(ArbitrateRecord arbitrateRecord) { + //查询案件详情 + CaseApplication caseApplication = new CaseApplication(); + caseApplication.setId(arbitrateRecord.getCaseAppliId()); CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication); - caseApplication1.setCaseDescribe(accidentDescription); //案情描述 - caseApplication1.setCaseResult(arbitrationResult); //仲裁结果 - int i = caseApplicationMapper.updataCaseApplication(caseApplication1); + String createBy = caseApplication1.getCreateBy(); + if (createBy!=null){ + arbitrateRecord.setCreateBy(createBy); + } + //提交仲裁结果 + int i = arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecord); if (i>0){ //案件日志表里添加数据 CaseLogRecord caseLogRecord = new CaseLogRecord(); caseLogRecord.setCaseAppliId(caseApplication1.getId()); caseLogRecord.setCaseNode(caseApplication1.getCaseStatus()); - String createBy = caseApplication1.getCreateBy(); if (createBy!=null){ caseLogRecord.setCreateBy(createBy); } 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 e220bcc..0a37156 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 @@ -115,7 +115,7 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService { @Override public List getCaseListAll(String identityNum) { - List caseStatusList = Arrays.asList(3, 4, 5, 9); + List caseStatusList = Arrays.asList(CaseApplicationConstants.CASE_CROSSEXAMI); return getCaseEvidenceVOList(identityNum, caseStatusList, null); }