截止9.18开发更新提交

2023-09-18 19:50:04 +08:00
parent 5311b1dc3d 14075b3f3f
commit 1a4ffa5bee
10 changed files with 302 additions and 7 deletions
@@ -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;
    }
@@ -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;
+    }
+}
@@ -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<CaseLogRecord> selectCaseLogRecordList(CaseLogRecord caseLogRecord);
+
+    int insertCaseLogRecord(CaseLogRecord caseLogRecord);
+}
@@ -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<CaseLogRecord> selectCaseLogRecordList(CaseLogRecord caseLogRecord);
+
+
+
+
+
+}
@@ -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("暂无需要提交仲裁结果的案件");
@@ -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<CaseLogRecord> selectCaseLogRecordList(CaseLogRecord caseLogRecord) {
+        return caseLogRecordMapper.selectCaseLogRecordList(caseLogRecord);
+    }
+
+
+
+
+
+}