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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java

+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<CaseLogRecord> list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord);
+        return getDataTable(list);
+    }
+
+
+
+
+
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

     /** 仲裁员名称 */
     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;
     }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseLogRecord.java

+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 String 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 String getCaseNode() {
+        return caseNode;
+    }
+
+    public void setCaseNode(String 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;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseLogRecordMapper.java

+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);
+}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseLogRecordService.java

+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);
+
+
+
+
+
+}

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

+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);
+
+    }
+
+
+
+
+
+}

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

             <if test="onlineVideoPerson != null  and onlineVideoPerson != ''">online_video_person = #{onlineVideoPerson},</if>
 
             <if test="contractNumber != null  and contractNumber != ''">contract_number = #{contractNumber},</if>
+
+            <if test="caseName != null  and caseName != ''">case_name = #{caseName},</if>
+            <if test="caseDescribe != null  and caseDescribe != ''">case_describe = #{caseDescribe},</if>
+            <if test="caseResult != null  and caseResult != ''">case_result = #{caseResult},</if>
+            <if test="caseStatus != null">case_status = #{caseStatus},</if>
+
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
         </set>
             <if test="arbitratorId != null and arbitratorId != ''">arbitrator_id = #{arbitratorId},</if>
             <if test="arbitratorName != null and arbitratorName != ''">arbitrator_name = #{arbitratorName},</if>
             <if test="pendingAppointArbotrar != null ">pending_appoint_arbotrar = #{pendingAppointArbotrar},</if>
+            <if test="caseName != null  and caseName != ''">case_name = #{caseName},</if>
+            <if test="caseDescribe != null  and caseDescribe != ''">case_describe = #{caseDescribe},</if>
+            <if test="caseResult != null  and caseResult != ''">case_result = #{caseResult},</if>
         </set>
         where id = #{id}
     </update>

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.wisdomarbitrate.mapper.CaseLogRecordMapper">
+    <resultMap type="CaseLogRecord" id="CaseLogRecordResult">
+        <id     property="id"       column="id"      />
+        <result property="caseAppliId"       column="case_appli_id"      />
+        <result property="caseNode"     column="case_node"    />
+        <result property="caseNodeTime"     column="case_node_time"    />
+        <result property="notes"        column="notes"        />
+        <result property="caseNum"        column="case_num"        />
+
+    </resultMap>
+
+    <insert id="insertCaseLogRecord">
+        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()
+        )
+    </insert>
+
+    <select id="selectCaseLogRecordList" parameterType="CaseLogRecord" resultMap="CaseLogRecordResult">
+        select cl.case_node ,cl.case_node_time ,cl.notes ,c.case_num ,cl.id ,cl.case_appli_id
+        from case_log_record cl left join case_application c on cl.case_appli_id  = c.id
+        <where>
+            <if test="caseNum != null and caseNum != ''">
+                AND c.case_num = #{caseNum}
+            </if>
+        </where>
+    </select>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</mapper>