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 b5bfea4..069c72e 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 @@ -1,5 +1,6 @@ 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.CaseApplication; import com.ruoyi.wisdomarbitrate.service.ICaseArbitrateService; @@ -9,7 +10,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/arbitrate") -public class CaseArbitrateController { +public class CaseArbitrateController extends BaseController { @Autowired private ICaseArbitrateService caseArbitrateService; @@ -20,12 +21,21 @@ public class CaseArbitrateController { * @return */ @PutMapping("/method") - public AjaxResult chooseArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication,Integer arbitratMethod){ + public AjaxResult chooseArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication + ,Integer arbitratMethod){ return caseArbitrateService.chooseArbitrateMethod(caseApplication,arbitratMethod); } + /** + * 书面审理 + * @param caseApplication + * @param accidentDescription + * @param arbitrationResult + * @return + */ @PostMapping("/writtenHear") - public AjaxResult writtenHear(@Validated @RequestBody CaseApplication caseApplication,String accidentDescription , String arbitrationResult){ + public AjaxResult writtenHear(@Validated @RequestBody CaseApplication caseApplication + ,String accidentDescription , String arbitrationResult){ return caseArbitrateService.writtenHear(caseApplication,accidentDescription,arbitrationResult); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java new file mode 100644 index 0000000..dc733c1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java @@ -0,0 +1,40 @@ +package com.ruoyi.web.controller.wisdomarbitrate; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.wisdomarbitrate.domain.CaseApplication; +import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; +import com.ruoyi.wisdomarbitrate.service.ICaseLogRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/caseLogRecord") +public class CaseLogRecordController extends BaseController { + @Autowired + private ICaseLogRecordService caseLogRecordService; + + /** + * 查询案件日志列表 + */ + @PreAuthorize("@ss.hasPermi('caseLogRecord:list')") + @GetMapping("/list") + public TableDataInfo list(CaseLogRecord caseLogRecord) + { + startPage(); + List list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord); + return getDataTable(list); + } + + + + + + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java index 3ffa1c6..2090c65 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java @@ -2,7 +2,6 @@ package com.ruoyi.wisdomarbitrate.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excels; import com.ruoyi.common.core.domain.BaseEntity; import java.math.BigDecimal; import java.util.Date; @@ -68,6 +67,41 @@ public class CaseApplication extends BaseEntity { /** 仲裁员名称 */ private String arbitratorName; + /** 案件名称 */ + private String caseName; + + /** 案件描述 */ + private String caseDescribe; + + public String getCaseName() { + return caseName; + } + + public void setCaseName(String caseName) { + this.caseName = caseName; + } + + public String getCaseDescribe() { + return caseDescribe; + } + + public void setCaseDescribe(String caseDescribe) { + this.caseDescribe = caseDescribe; + } + + public String getCaseResult() { + return caseResult; + } + + public void setCaseResult(String caseResult) { + this.caseResult = caseResult; + } + + /** 仲裁结果 */ + private String caseResult; + + + public String getArbitratorName() { return arbitratorName; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseLogRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseLogRecord.java new file mode 100644 index 0000000..4a47bd4 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseLogRecord.java @@ -0,0 +1,76 @@ +package com.ruoyi.wisdomarbitrate.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +import java.util.Date; + +public class CaseLogRecord extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** ID */ + private Long id; + /** 案件申请id */ + private Long caseAppliId; + /** 案件节点 */ + private Integer caseNode; + + /** 案件节点时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date caseNodeTime; + + /** 备注 */ + private String notes; + + /** 案件编号 */ + private String caseNum; + + public String getCaseNum() { + return caseNum; + } + + public void setCaseNum(String caseNum) { + this.caseNum = caseNum; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getCaseAppliId() { + return caseAppliId; + } + + public void setCaseAppliId(Long caseAppliId) { + this.caseAppliId = caseAppliId; + } + + public int getCaseNode() { + return caseNode; + } + + public void setCaseNode(int caseNode) { + this.caseNode = caseNode; + } + + public Date getCaseNodeTime() { + return caseNodeTime; + } + + public void setCaseNodeTime(Date caseNodeTime) { + this.caseNodeTime = caseNodeTime; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseLogRecordMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseLogRecordMapper.java new file mode 100644 index 0000000..9dd368e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseLogRecordMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.wisdomarbitrate.mapper; + +import com.ruoyi.wisdomarbitrate.domain.CaseApplication; +import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; + +import java.util.List; + +public interface CaseLogRecordMapper { + + + List selectCaseLogRecordList(CaseLogRecord caseLogRecord); + + int insertCaseLogRecord(CaseLogRecord caseLogRecord); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseLogRecordService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseLogRecordService.java new file mode 100644 index 0000000..f4fcf77 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseLogRecordService.java @@ -0,0 +1,17 @@ +package com.ruoyi.wisdomarbitrate.service; + +import com.ruoyi.wisdomarbitrate.domain.CaseApplication; +import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; + +import java.util.List; + +public interface ICaseLogRecordService { + + + List selectCaseLogRecordList(CaseLogRecord caseLogRecord); + + + + + +} 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 4d670a0..2a5c68b 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 @@ -5,8 +5,10 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.SmsUtils; import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; +import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; import com.ruoyi.wisdomarbitrate.mapper.CaseAffiliateMapper; import com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper; +import com.ruoyi.wisdomarbitrate.mapper.CaseLogRecordMapper; import com.ruoyi.wisdomarbitrate.service.ICaseArbitrateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,6 +22,8 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { private CaseApplicationMapper caseApplicationMapper; @Autowired private CaseAffiliateMapper caseAffiliateMapper; + @Autowired + private CaseLogRecordMapper caseLogRecordMapper; @Override @Transactional @@ -74,10 +78,23 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { @Override public AjaxResult writtenHear(CaseApplication caseApplication, String accidentDescription, String arbitrationResult) { //提交仲裁结果 - // caseApplication.set(accidentDescription); //案情描述 - // caseApplication.set(arbitrationResult); //仲裁结果 - int i = caseApplicationMapper.updataCaseApplication(caseApplication); + CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication); + caseApplication1.setCaseDescribe(accidentDescription); //案情描述 + caseApplication1.setCaseResult(arbitrationResult); //仲裁结果 + int i = caseApplicationMapper.updataCaseApplication(caseApplication1); 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); + } + caseLogRecordMapper.insertCaseLogRecord(caseLogRecord); + //修改案件状态 + caseApplication.setCaseStatus(CaseApplicationConstants.GENERATED_ARBITRATION); + caseApplicationMapper.submitCaseApplication(caseApplication); return AjaxResult.success("提交成功"); } return AjaxResult.error("暂无需要提交仲裁结果的案件"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java new file mode 100644 index 0000000..de484db --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java @@ -0,0 +1,26 @@ +package com.ruoyi.wisdomarbitrate.service.impl; + +import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; +import com.ruoyi.wisdomarbitrate.mapper.CaseLogRecordMapper; +import com.ruoyi.wisdomarbitrate.service.ICaseLogRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class CaseLogRecordServiceImpl implements ICaseLogRecordService { + @Autowired + private CaseLogRecordMapper caseLogRecordMapper; + + + @Override + public List selectCaseLogRecordList(CaseLogRecord caseLogRecord) { + return caseLogRecordMapper.selectCaseLogRecordList(caseLogRecord); + } + + + + + +} diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 58230e8..5a13565 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -126,6 +126,12 @@ online_video_person = #{onlineVideoPerson}, contract_number = #{contractNumber}, + + case_name = #{caseName}, + case_describe = #{caseDescribe}, + case_result = #{caseResult}, + case_status = #{caseStatus}, + update_by = #{updateBy}, update_time = sysdate() @@ -140,6 +146,9 @@ arbitrator_name = #{arbitratorName}, pending_appoint_arbotrar = #{pendingAppointArbotrar}, arbitrat_method = #{arbitratMethod}, + case_name = #{caseName}, + case_describe = #{caseDescribe}, + case_result = #{caseResult}, where id = #{id} diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml new file mode 100644 index 0000000..88d4288 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + insert into case_log_record(case_appli_id, case_node,case_node_time,notes,create_by,create_time ) values( + #{caseAppliId},#{caseNode},sysdate(),#{notes},#{createBy},sysdate() + ) + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file