qitz 2 лет назад
Родитель
Сommit
49d611b971

+ 27
- 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java Просмотреть файл

@@ -1,12 +1,39 @@
1 1
 package com.ruoyi.web.controller.wisdomarbitrate;
2 2
 
3 3
 import com.ruoyi.common.core.controller.BaseController;
4
+import com.ruoyi.common.core.page.TableDataInfo;
5
+import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
6
+import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord;
7
+import com.ruoyi.wisdomarbitrate.service.ICaseLogRecordService;
8
+import org.springframework.beans.factory.annotation.Autowired;
9
+import org.springframework.security.access.prepost.PreAuthorize;
10
+import org.springframework.web.bind.annotation.GetMapping;
4 11
 import org.springframework.web.bind.annotation.RequestMapping;
5 12
 import org.springframework.web.bind.annotation.RestController;
6 13
 
14
+import java.util.List;
15
+
7 16
 @RestController
8 17
 @RequestMapping("/caseLogRecord")
9 18
 public class CaseLogRecordController   extends BaseController {
19
+    @Autowired
20
+    private ICaseLogRecordService caseLogRecordService;
21
+
22
+    /**
23
+     * 查询案件日志列表
24
+     */
25
+    @PreAuthorize("@ss.hasPermi('caseLogRecord:list')")
26
+    @GetMapping("/list")
27
+    public TableDataInfo list(CaseLogRecord caseLogRecord)
28
+    {
29
+        startPage();
30
+        List<CaseLogRecord> list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord);
31
+        return getDataTable(list);
32
+    }
33
+
34
+
35
+
36
+
10 37
 
11 38
 
12 39
 

+ 35
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java Просмотреть файл

@@ -68,6 +68,41 @@ public class CaseApplication  extends BaseEntity {
68 68
     /** 仲裁员名称 */
69 69
     private String arbitratorName;
70 70
 
71
+    /** 案件名称 */
72
+    private String caseName;
73
+
74
+    /** 案件描述 */
75
+    private String caseDescribe;
76
+
77
+    public String getCaseName() {
78
+        return caseName;
79
+    }
80
+
81
+    public void setCaseName(String caseName) {
82
+        this.caseName = caseName;
83
+    }
84
+
85
+    public String getCaseDescribe() {
86
+        return caseDescribe;
87
+    }
88
+
89
+    public void setCaseDescribe(String caseDescribe) {
90
+        this.caseDescribe = caseDescribe;
91
+    }
92
+
93
+    public String getCaseResult() {
94
+        return caseResult;
95
+    }
96
+
97
+    public void setCaseResult(String caseResult) {
98
+        this.caseResult = caseResult;
99
+    }
100
+
101
+    /** 仲裁结果 */
102
+    private String caseResult;
103
+
104
+
105
+
71 106
     public String getArbitratorName() {
72 107
         return arbitratorName;
73 108
     }

+ 8
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseLogRecordMapper.java Просмотреть файл

@@ -1,6 +1,14 @@
1 1
 package com.ruoyi.wisdomarbitrate.mapper;
2 2
 
3
+import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
4
+import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord;
5
+
6
+import java.util.List;
7
+
3 8
 public interface CaseLogRecordMapper {
4 9
 
5 10
 
11
+    List<CaseLogRecord> selectCaseLogRecordList(CaseLogRecord caseLogRecord);
12
+
13
+    int insertCaseLogRecord(CaseLogRecord caseLogRecord);
6 14
 }

+ 11
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseLogRecordService.java Просмотреть файл

@@ -1,6 +1,17 @@
1 1
 package com.ruoyi.wisdomarbitrate.service;
2 2
 
3
+import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
4
+import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord;
5
+
6
+import java.util.List;
7
+
3 8
 public interface ICaseLogRecordService {
4 9
 
5 10
 
11
+    List<CaseLogRecord> selectCaseLogRecordList(CaseLogRecord caseLogRecord);
12
+
13
+
14
+
15
+
16
+
6 17
 }

+ 15
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java Просмотреть файл

@@ -1,10 +1,25 @@
1 1
 package com.ruoyi.wisdomarbitrate.service.impl;
2 2
 
3
+import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord;
4
+import com.ruoyi.wisdomarbitrate.mapper.CaseLogRecordMapper;
3 5
 import com.ruoyi.wisdomarbitrate.service.ICaseLogRecordService;
6
+import org.springframework.beans.factory.annotation.Autowired;
4 7
 import org.springframework.stereotype.Service;
5 8
 
9
+import java.util.List;
10
+
6 11
 @Service
7 12
 public class CaseLogRecordServiceImpl  implements ICaseLogRecordService {
13
+    @Autowired
14
+    private CaseLogRecordMapper caseLogRecordMapper;
15
+
16
+
17
+    @Override
18
+    public List<CaseLogRecord> selectCaseLogRecordList(CaseLogRecord caseLogRecord) {
19
+        return caseLogRecordMapper.selectCaseLogRecordList(caseLogRecord);
20
+
21
+    }
22
+
8 23
 
9 24
 
10 25
 

+ 9
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Просмотреть файл

@@ -126,6 +126,12 @@
126 126
             <if test="onlineVideoPerson != null  and onlineVideoPerson != ''">online_video_person = #{onlineVideoPerson},</if>
127 127
 
128 128
             <if test="contractNumber != null  and contractNumber != ''">contract_number = #{contractNumber},</if>
129
+
130
+            <if test="caseName != null  and caseName != ''">case_name = #{caseName},</if>
131
+            <if test="caseDescribe != null  and caseDescribe != ''">case_describe = #{caseDescribe},</if>
132
+            <if test="caseResult != null  and caseResult != ''">case_result = #{caseResult},</if>
133
+            <if test="caseStatus != null">case_status = #{caseStatus},</if>
134
+
129 135
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
130 136
             update_time = sysdate()
131 137
         </set>
@@ -139,6 +145,9 @@
139 145
             <if test="arbitratorId != null and arbitratorId != ''">arbitrator_id = #{arbitratorId},</if>
140 146
             <if test="arbitratorName != null and arbitratorName != ''">arbitrator_name = #{arbitratorName},</if>
141 147
             <if test="pendingAppointArbotrar != null ">pending_appoint_arbotrar = #{pendingAppointArbotrar},</if>
148
+            <if test="caseName != null  and caseName != ''">case_name = #{caseName},</if>
149
+            <if test="caseDescribe != null  and caseDescribe != ''">case_describe = #{caseDescribe},</if>
150
+            <if test="caseResult != null  and caseResult != ''">case_result = #{caseResult},</if>
142 151
         </set>
143 152
         where id = #{id}
144 153
     </update>

+ 2
- 1
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml Просмотреть файл

@@ -9,6 +9,7 @@
9 9
         <result property="caseNode"     column="case_node"    />
10 10
         <result property="caseNodeTime"     column="case_node_time"    />
11 11
         <result property="notes"        column="notes"        />
12
+        <result property="caseNum"        column="case_num"        />
12 13
 
13 14
     </resultMap>
14 15
 
@@ -19,7 +20,7 @@
19 20
     </insert>
20 21
 
21 22
     <select id="selectCaseLogRecordList" parameterType="CaseLogRecord" resultMap="CaseLogRecordResult">
22
-        select cl.case_node ,cl.case_node_time ,cl.notes ,c.case_num
23
+        select cl.case_node ,cl.case_node_time ,cl.notes ,c.case_num ,cl.id ,cl.case_appli_id
23 24
         from case_log_record cl left join case_application c on cl.case_appli_id  = c.id
24 25
         <where>
25 26
             <if test="caseNum != null and caseNum != ''">