Explorar el Código

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

hejinbo hace 2 años
padre
commit
5a17ed48ae

+ 13
- 0
ruoyi-common/src/main/java/com/ruoyi/common/utils/EsignApplicaConfig.java Ver fichero

1
+package com.ruoyi.common.utils;
2
+
3
+public class EsignApplicaConfig {
4
+
5
+    // 应用ID
6
+    public static final String EsignAppId = "7438987614";
7
+    // 应用密钥
8
+    public static final String EsignAppSecret = "9d7844f13830931037772b9d20cf1529";
9
+    // e签宝接口调用域名(模拟环境)
10
+    public static final String EsignHost = "https://smlopenapi.esign.cn";
11
+    // e签宝接口调用域名(正式环境)
12
+    // public static final String EsignHost = "https://openapi.esign.cn";
13
+}

+ 360
- 0
ruoyi-common/src/main/java/com/ruoyi/common/utils/SignAward.java Ver fichero

1
+package com.ruoyi.common.utils;
2
+
3
+import com.google.gson.Gson;
4
+import com.google.gson.JsonArray;
5
+import com.google.gson.JsonObject;
6
+import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
7
+import com.ruoyi.common.enums.EsignRequestType;
8
+import com.ruoyi.common.exception.EsignDemoException;
9
+import com.ruoyi.common.utils.bean.SealSignRecord;
10
+
11
+import java.util.Map;
12
+
13
+public class SignAward {
14
+
15
+    private static String eSignHost= EsignApplicaConfig.EsignHost;
16
+    private static String eSignAppId= EsignApplicaConfig.EsignAppId;
17
+    private static String eSignAppSecret= EsignApplicaConfig.EsignAppSecret;
18
+//    public static String fileId = "95d0c307d91e4985bdb8874f6f84daa5";
19
+    public static String fileId = "a0c2ad21065f48ff8b872412c39d5d3a";
20
+
21
+
22
+
23
+    public static void main(String[] args) throws EsignDemoException {
24
+        Gson gson = new Gson();
25
+
26
+        SealSignRecord sealSignRecord = new SealSignRecord();
27
+
28
+        sealSignRecord.setFileid("a808f1f39a744357a2f018e4ab34c55d");
29
+        sealSignRecord.setFilename("23893bfd3f2249ffa5c82850c11c482e.pdf");
30
+        sealSignRecord.setSignFlowid("41e6732b48c54c63a91b2379c352212d");
31
+
32
+
33
+        sealSignRecord.setPensonAccount("18209231185");
34
+        sealSignRecord.setPensonName("秦桃则");
35
+        sealSignRecord.setOrgnizeName("西安云美电子科技有限公司");
36
+        sealSignRecord.setOrgnizeNamePsnAccount("17691338406");
37
+        sealSignRecord.setOrgnizeNamepsnName("韩超勃");
38
+        sealSignRecord.setPositionPagepsn("2");
39
+
40
+        sealSignRecord.setPositionXpsn(279+20);
41
+        sealSignRecord.setPositionYpsn(216.336-20);
42
+
43
+        sealSignRecord.setPositionPageorg("2");
44
+
45
+        sealSignRecord.setPositionXorg(342+30);
46
+        sealSignRecord.setPositionYorg(185.136);
47
+
48
+
49
+
50
+
51
+        /* 发起签署*/
52
+//        EsignHttpResponse createByFile = createByFile(sealSignRecord);
53
+//        JsonObject createByFileJsonObject = gson.fromJson(createByFile.getBody(), JsonObject.class);
54
+//        JsonObject createByFileData = createByFileJsonObject.getAsJsonObject("data");
55
+//        String signFlowId = createByFileData.get("signFlowId").getAsString();
56
+//        System.err.println("流程id:"+signFlowId);
57
+
58
+        /* 获取文件签名印章位置*/
59
+        EsignHttpResponse positions = getPositions(sealSignRecord);
60
+        JsonObject positionsJsonObject = gson.fromJson(positions.getBody(), JsonObject.class);
61
+        JsonObject positionsData = positionsJsonObject.getAsJsonObject("data");
62
+        JsonArray keywordPositions = positionsData.get("keywordPositions").getAsJsonArray();
63
+        System.out.println("获取文件签名印章位置:" +keywordPositions.toString());
64
+
65
+//        String signFlowId = "c9955453716344f9971d308abdc13464";
66
+        //获取合同文件签名链接
67
+//        EsignHttpResponse signUrl = signUrl(sealSignRecord);
68
+//        JsonObject signUrlJsonObject = gson.fromJson(signUrl.getBody(), JsonObject.class);
69
+//        JsonObject signUrlData = signUrlJsonObject.getAsJsonObject("data");
70
+//        String shortUrl = signUrlData.get("shortUrl").getAsString();
71
+//        String url = signUrlData.get("url").getAsString();
72
+//        System.out.println("签署短链接:" +shortUrl);
73
+//        System.out.println("签署长链接:"+url);
74
+
75
+        //获取合同文件用印链接
76
+//        EsignHttpResponse usesealUrl = usesealUrl(sealSignRecord);
77
+//        JsonObject usesealUrlJsonObject = gson.fromJson(usesealUrl.getBody(), JsonObject.class);
78
+//        JsonObject usesealUrlData = usesealUrlJsonObject.getAsJsonObject("data");
79
+//        String shortusesealUrl = usesealUrlData.get("shortUrl").getAsString();
80
+//        String sealUrl = usesealUrlData.get("url").getAsString();
81
+//        System.out.println("签署长链接:" +shortusesealUrl);
82
+//        System.out.println("签署短链接:"+sealUrl);
83
+
84
+        //查询签署流程详情
85
+//        EsignHttpResponse signFlowDetail = signFlowDetail(sealSignRecord);
86
+//        JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class);
87
+//        System.out.println(signFlowDetailJsonObject);
88
+
89
+
90
+    }
91
+
92
+    /**
93
+     * 查询签署流程详情
94
+     * @return
95
+     */
96
+    public static EsignHttpResponse signFlowDetail(SealSignRecord sealSignRecord) throws EsignDemoException {
97
+        String signFlowId = sealSignRecord.getSignFlowid();
98
+        String apiaddr= "/v3/sign-flow/"+ signFlowId + "/detail";
99
+        String jsonParm = null;
100
+        //请求方法
101
+        EsignRequestType requestType = EsignRequestType.GET;
102
+        //生成签名鉴权方式的的header
103
+        Map<String, String> header = EsignHttpHelper.signAndBuildSignAndJsonHeader(eSignAppId,eSignAppSecret,jsonParm,requestType.name(),apiaddr,true);
104
+        //发起接口请求
105
+        return EsignHttpHelper.doCommHttp(eSignHost, apiaddr,requestType , jsonParm, header,true);
106
+    }
107
+
108
+
109
+    /**
110
+     * 发起签署
111
+     * @return
112
+     * @throws EsignDemoException
113
+     */
114
+    public static EsignHttpResponse createByFile(SealSignRecord sealSignRecord) throws EsignDemoException {
115
+        String apiaddr = "/v3/sign-flow/create-by-file";
116
+
117
+        String fileId = sealSignRecord.getFileid();
118
+        String fileName = sealSignRecord.getFilename();
119
+
120
+        String psnAccount = sealSignRecord.getPensonAccount();
121
+        String psnName = sealSignRecord.getPensonName();
122
+
123
+        String orgName = sealSignRecord.getOrgnizeName();
124
+        String orgNamePsnAccount = sealSignRecord.getOrgnizeNamePsnAccount();
125
+        String orgNamepsnName = sealSignRecord.getOrgnizeNamepsnName();
126
+
127
+        String positionPagepsn = sealSignRecord.getPositionPagepsn();
128
+        double positionXpsn = sealSignRecord.getPositionXpsn();
129
+        double positionYpsn = sealSignRecord.getPositionYpsn();
130
+
131
+        String positionPageorg = sealSignRecord.getPositionPageorg();
132
+        double positionXorg = sealSignRecord.getPositionXorg();
133
+        double positionYorg = sealSignRecord.getPositionYorg();
134
+
135
+
136
+        String jsonParm = "{\n" +
137
+                "    \"docs\": [\n" +
138
+                "        {\n" +
139
+
140
+//                "            \"fileId\": \"5bd34a81e8084acaab3287c019e82fe8\",\n" +
141
+                "            \"fileId\": \"" + fileId +  "\",\n" +
142
+
143
+//                "            \"fileName\": \"477470a7741b4536a200c792b6ddf966.pdf\"\n" +
144
+                "            \"fileName\": \"" + fileName +  "\"\n" +
145
+
146
+                "        }\n" +
147
+                "    ],\n" +
148
+                "    \"signFlowConfig\": {\n" +
149
+                "        \"signFlowTitle\": \"测试合同\",\n" +
150
+                "        \"autoStart\": true,\n" +
151
+                "       \"authConfig\": {\n" +
152
+                "           \"willingnessAuthModes\": [\n" +
153
+                "               \"CODE_SMS\"\n" +
154
+                "           ],\n" +
155
+                "           \"psnAvailableAuthModes\": [\n" +
156
+                "               \"PSN_MOBILE3\"\n" +
157
+                "           ],\n" +
158
+                "           \"orgAvailableAuthModes\": [\n" +
159
+                "               \"ORG_LEGALREP\"\n" +
160
+                "           ]\n" +
161
+                "       },\n" +
162
+                "        \"autoFinish\": true\n" +
163
+                "    },\n" +
164
+
165
+                "    \"signers\": [\n" +
166
+
167
+                "          {\n" +
168
+
169
+                "            \"psnSignerInfo\": {\n" +
170
+
171
+//                "                \"psnAccount\": \"18209231185\",\n" +
172
+                "                \"psnAccount\": \"" + psnAccount +  "\",\n" +
173
+
174
+                "                \"psnInfo\": {\n" +
175
+
176
+//                "                            \"psnName\": \"秦桃则\"\n" +
177
+                "                            \"psnName\": \"" + psnName +  "\"\n" +
178
+                "                        }\n" +
179
+
180
+
181
+                "            },\n" +
182
+
183
+
184
+                "            \"signFields\": [\n" +
185
+                "                {\n" +
186
+
187
+//                "                    \"fileId\": \"5bd34a81e8084acaab3287c019e82fe8\",\n" +
188
+                "                    \"fileId\": \"" + fileId +  "\",\n" +
189
+
190
+                "                    \"normalSignFieldConfig\": {\n" +
191
+                "                        \"autoSign\": false,\n" +
192
+                "                        \"freeMode\": false,\n" +
193
+                "                        \"movableSignField\": false,\n" +
194
+                "                        \"signFieldPosition\": {\n" +
195
+
196
+//                "                            \"positionPage\": \"2\",\n" +
197
+                "                            \"positionPage\": \"" + positionPagepsn +  "\",\n" +
198
+
199
+//                "                            \"positionX\": 310.0,\n" +
200
+                "                            \"positionX\": " + positionXpsn +  ",\n" +
201
+
202
+//                "                            \"positionY\": 247.536\n" +
203
+                "                            \"positionY\": " + positionYpsn +  "\n" +
204
+
205
+                "                        },\n" +
206
+                "                        \"signFieldStyle\": 1\n" +
207
+                "                    },\n" +
208
+                "                    \"signFieldType\": 0\n" +
209
+                "                }\n" +
210
+                "            ],\n" +
211
+                "            \"signerType\": 0\n" +
212
+                "        },\n" +
213
+
214
+
215
+                "        {\n" +
216
+                "            \"orgSignerInfo\": {\n" +
217
+
218
+//                "                \"orgName\": \"西安云美电子科技有限公司\",\n" +
219
+                "                \"orgName\": \"" + orgName +  "\",\n" +
220
+
221
+                "                \"transactorInfo\": {\n" +
222
+
223
+
224
+//                "                \"psnAccount\": \"17691338406\",\n" +
225
+                "                \"psnAccount\": \"" + orgNamePsnAccount +  "\",\n" +
226
+
227
+                "                \"psnInfo\": {\n" +
228
+
229
+//                "                            \"psnName\": \"韩超勃\"\n" +
230
+                "                            \"psnName\": \"" + orgNamepsnName +  "\"\n" +
231
+                "                        }\n" +
232
+
233
+                "                }\n" +
234
+                "            },\n" +
235
+
236
+                "            \"signFields\": [\n" +
237
+                "                {\n" +
238
+
239
+//                "                    \"fileId\": \"5bd34a81e8084acaab3287c019e82fe8\",\n" +
240
+                "                    \"fileId\": \"" + fileId +  "\",\n" +
241
+
242
+                "                    \"normalSignFieldConfig\": {\n" +
243
+                "                        \"autoSign\": false,\n" +
244
+                "                        \"freeMode\": false,\n" +
245
+
246
+                "                        \"signFieldPosition\": {\n" +
247
+
248
+//                "                            \"positionPage\": \"2\",\n" +
249
+                "                            \"positionPage\": \"" + positionPageorg +  "\",\n" +
250
+
251
+//                "                            \"positionX\": 340.0,\n" +
252
+                "                            \"positionX\": " + positionXorg +  ",\n" +
253
+
254
+//                "                            \"positionY\": 340.736\n" +
255
+                "                            \"positionY\": " + positionYorg +  "\n" +
256
+                "                        },\n" +
257
+                "                        \"signFieldStyle\": 1\n" +
258
+                "                    },\n" +
259
+                "                    \"signFieldType\": 0\n" +
260
+                "                }\n" +
261
+                "            ],\n" +
262
+                "            \"signerType\": 1\n" +
263
+                "        }\n" +
264
+
265
+                "    ]\n" +
266
+                "}";
267
+
268
+        //请求方法
269
+        EsignRequestType requestType = EsignRequestType.POST;
270
+        //生成请求签名鉴权方式的Header
271
+        Map<String, String> header = EsignHttpHelper.signAndBuildSignAndJsonHeader(eSignAppId, eSignAppSecret, jsonParm, requestType.name(), apiaddr, true);
272
+        //发起接口请求
273
+        return EsignHttpHelper.doCommHttp(eSignHost, apiaddr, requestType, jsonParm, header, true);
274
+    }
275
+
276
+    /**
277
+     * 获取合同文件签名链接
278
+     * @return
279
+     * @throws EsignDemoException
280
+     */
281
+    public static EsignHttpResponse signUrl(SealSignRecord sealSignRecord) throws EsignDemoException {
282
+
283
+        String signFlowId = sealSignRecord.getSignFlowid();
284
+        String psnAccount = sealSignRecord.getPensonAccount();
285
+
286
+        String apiaddr = "/v3/sign-flow/" + signFlowId + "/sign-url";
287
+        String jsonParm = "{\n" +
288
+                "    \"operator\": {\n" +
289
+//                "        \"psnAccount\":\"18209231185\"\n" +
290
+                "        \"psnAccount\": \"" + psnAccount +  "\"\n" +
291
+                "    }\n" +
292
+                "}";
293
+        //请求方法
294
+        EsignRequestType requestType = EsignRequestType.POST;
295
+        //生成请求签名鉴权方式的Header
296
+        Map<String, String> header = EsignHttpHelper.signAndBuildSignAndJsonHeader(eSignAppId, eSignAppSecret, jsonParm, requestType.name(), apiaddr, true);
297
+        //发起接口请求
298
+        return EsignHttpHelper.doCommHttp(eSignHost, apiaddr, requestType, jsonParm, header, true);
299
+    }
300
+
301
+    /**
302
+     * 获取合同文件用印链接
303
+     * @return
304
+     * @throws EsignDemoException
305
+     */
306
+    public static EsignHttpResponse usesealUrl(SealSignRecord sealSignRecord) throws EsignDemoException {
307
+        String signFlowId = sealSignRecord.getSignFlowid();
308
+        String apiaddr = "/v3/sign-flow/" + signFlowId + "/sign-url";
309
+
310
+        String psnAccount = sealSignRecord.getOrgnizeNamePsnAccount();
311
+        String orgName = sealSignRecord.getOrgnizeName();
312
+
313
+        String jsonParm = "{\n" +
314
+//                "    \"needLogin\": true,\n" +
315
+                "    \"operator\": {\n" +
316
+
317
+//                "        \"psnAccount\":\"17691338406\"\n" +
318
+                "        \"psnAccount\": \"" + psnAccount +  "\"\n" +
319
+                "    },\n" +
320
+                "    \"organization\": {\n" +
321
+
322
+//                "        \"orgName\": \"西安云美电子科技有限公司\"\n" +
323
+                "        \"orgName\": \"" + orgName +  "\"\n" +
324
+
325
+                "    }\n" +
326
+                "}";
327
+        //请求方法
328
+        EsignRequestType requestType = EsignRequestType.POST;
329
+        //生成请求签名鉴权方式的Header
330
+        Map<String, String> header = EsignHttpHelper.signAndBuildSignAndJsonHeader(eSignAppId, eSignAppSecret, jsonParm, requestType.name(), apiaddr, true);
331
+        //发起接口请求
332
+        return EsignHttpHelper.doCommHttp(eSignHost, apiaddr, requestType, jsonParm, header, true);
333
+    }
334
+
335
+    /**
336
+     * 获取文件签名印章位置
337
+     * @return
338
+     * @throws EsignDemoException
339
+     */
340
+    public static EsignHttpResponse getPositions(SealSignRecord sealSignRecord) throws EsignDemoException {
341
+        String fileId = sealSignRecord.getFileid();
342
+        String apiaddr = "/v3/files/" + fileId + "/keyword-positions";
343
+        String jsonParm = "{\n" +
344
+                "    \"keywords\": [\n" +
345
+                "        \"仲裁员:\",\n" +
346
+                "        \"(仲裁委员会盖章)\"\n" +
347
+                "    ]\n" +
348
+                "}";
349
+        //请求方法
350
+        EsignRequestType requestType = EsignRequestType.POST;
351
+        //生成请求签名鉴权方式的Header
352
+        Map<String, String> header = EsignHttpHelper.signAndBuildSignAndJsonHeader(eSignAppId, eSignAppSecret, jsonParm, requestType.name(), apiaddr, true);
353
+        //发起接口请求
354
+        return EsignHttpHelper.doCommHttp(eSignHost, apiaddr, requestType, jsonParm, header, true);
355
+    }
356
+
357
+
358
+
359
+
360
+}

+ 161
- 0
ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/SealSignRecord.java Ver fichero

1
+package com.ruoyi.common.utils.bean;
2
+
3
+import com.ruoyi.common.core.domain.BaseEntity;
4
+
5
+public class SealSignRecord extends BaseEntity {
6
+    private static final long serialVersionUID = 1L;
7
+
8
+    /** ID */
9
+    private Long id;
10
+    /** 文件id */
11
+    private String fileid;
12
+    /** 文件名称 */
13
+    private String filename;
14
+    /** 流程id */
15
+    private String signFlowid;
16
+    /** 签名人账户 */
17
+    private String pensonAccount;
18
+    /** 签名人姓名 */
19
+    private String pensonName;
20
+    /** 机构名称 */
21
+    private String orgnizeName;
22
+    /** 机构经办人 */
23
+    private String orgnizeNamePsnAccount;
24
+    /** 机构经办人名称 */
25
+    private String orgnizeNamepsnName;
26
+
27
+    public String getFileid() {
28
+        return fileid;
29
+    }
30
+
31
+    public void setFileid(String fileid) {
32
+        this.fileid = fileid;
33
+    }
34
+
35
+    public String getFilename() {
36
+        return filename;
37
+    }
38
+
39
+    public void setFilename(String filename) {
40
+        this.filename = filename;
41
+    }
42
+
43
+    public String getSignFlowid() {
44
+        return signFlowid;
45
+    }
46
+
47
+    public void setSignFlowid(String signFlowid) {
48
+        this.signFlowid = signFlowid;
49
+    }
50
+
51
+    public String getPensonAccount() {
52
+        return pensonAccount;
53
+    }
54
+
55
+    public void setPensonAccount(String pensonAccount) {
56
+        this.pensonAccount = pensonAccount;
57
+    }
58
+
59
+    public String getPensonName() {
60
+        return pensonName;
61
+    }
62
+
63
+    public void setPensonName(String pensonName) {
64
+        this.pensonName = pensonName;
65
+    }
66
+
67
+    public String getOrgnizeName() {
68
+        return orgnizeName;
69
+    }
70
+
71
+    public void setOrgnizeName(String orgnizeName) {
72
+        this.orgnizeName = orgnizeName;
73
+    }
74
+
75
+    public String getOrgnizeNamePsnAccount() {
76
+        return orgnizeNamePsnAccount;
77
+    }
78
+
79
+    public void setOrgnizeNamePsnAccount(String orgnizeNamePsnAccount) {
80
+        this.orgnizeNamePsnAccount = orgnizeNamePsnAccount;
81
+    }
82
+
83
+    public String getOrgnizeNamepsnName() {
84
+        return orgnizeNamepsnName;
85
+    }
86
+
87
+    public void setOrgnizeNamepsnName(String orgnizeNamepsnName) {
88
+        this.orgnizeNamepsnName = orgnizeNamepsnName;
89
+    }
90
+
91
+    public String getPositionPagepsn() {
92
+        return positionPagepsn;
93
+    }
94
+
95
+    public void setPositionPagepsn(String positionPagepsn) {
96
+        this.positionPagepsn = positionPagepsn;
97
+    }
98
+
99
+    public double getPositionXpsn() {
100
+        return positionXpsn;
101
+    }
102
+
103
+    public void setPositionXpsn(double positionXpsn) {
104
+        this.positionXpsn = positionXpsn;
105
+    }
106
+
107
+    public double getPositionYpsn() {
108
+        return positionYpsn;
109
+    }
110
+
111
+    public void setPositionYpsn(double positionYpsn) {
112
+        this.positionYpsn = positionYpsn;
113
+    }
114
+
115
+    public String getPositionPageorg() {
116
+        return positionPageorg;
117
+    }
118
+
119
+    public void setPositionPageorg(String positionPageorg) {
120
+        this.positionPageorg = positionPageorg;
121
+    }
122
+
123
+    public double getPositionXorg() {
124
+        return positionXorg;
125
+    }
126
+
127
+    public void setPositionXorg(double positionXorg) {
128
+        this.positionXorg = positionXorg;
129
+    }
130
+
131
+    public double getPositionYorg() {
132
+        return positionYorg;
133
+    }
134
+
135
+    public void setPositionYorg(double positionYorg) {
136
+        this.positionYorg = positionYorg;
137
+    }
138
+
139
+    /** 签名位置页数 */
140
+    private String positionPagepsn;
141
+    /** 签名位置x坐标 */
142
+    private double positionXpsn;
143
+    /** 签名位置y坐标 */
144
+    private double positionYpsn;
145
+    /** 印章位置页数 */
146
+    private String positionPageorg;
147
+    /** 印章位置x坐标 */
148
+    private double positionXorg;
149
+    /** 印章位置y坐标 */
150
+    private double positionYorg;
151
+
152
+    public Long getId() {
153
+        return id;
154
+    }
155
+
156
+    public void setId(Long id) {
157
+        this.id = id;
158
+    }
159
+
160
+
161
+}

+ 2
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Ver fichero

655
     @Override
655
     @Override
656
     @Transactional
656
     @Transactional
657
     public int pendTralCheck(CaseApplication caseApplication) {
657
     public int pendTralCheck(CaseApplication caseApplication) {
658
-        int isAgreePendTral = caseApplication.getIsAgreePendTral();
658
+        Integer isAgreePendTral = caseApplication.getIsAgreePendTral();
659
         caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
659
         caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
660
         int rows = 0;
660
         int rows = 0;
661
         //同意组庭
661
         //同意组庭
662
-        if(isAgreePendTral==1){
662
+        if(isAgreePendTral!=null&&isAgreePendTral==1){
663
             rows = caseApplicationMapper.submitCaseApplication(caseApplication);
663
             rows = caseApplicationMapper.submitCaseApplication(caseApplication);
664
         }else {
664
         }else {
665
             List<Arbitrator> arbitrators = caseApplication.getArbitrators();
665
             List<Arbitrator> arbitrators = caseApplication.getArbitrators();

+ 2
- 60
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java Ver fichero

30
                 }
30
                 }
31
 
31
 
32
                 contentBuilder.append(record.getCreateNickName()).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime);
32
                 contentBuilder.append(record.getCreateNickName()).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime);
33
-                switch(record.getCaseNode()){
34
-                  case  0:
35
-                      contentBuilder.append("创建立案申请");
36
-                      break;
37
-                    case  1:
38
-                        contentBuilder.append("提交立案申请");
39
-                        break;
40
-                    case  2:
41
-                        contentBuilder.append("立案审查");
42
-                        break;
43
-                    case  3:
44
-                        contentBuilder.append("支付成功");
45
-                        break;
46
-                    case  4:
47
-                        contentBuilder.append("缴费确认");
48
-                        break;
49
-                    case  5:
50
-                        contentBuilder.append("案件质证");
51
-                        break;
52
-                    case  6:
53
-                        contentBuilder.append("组庭审核");
54
-                        break;
55
-                    case  7:
56
-                        contentBuilder.append("组庭确认");
57
-                        break;
58
-                    case  8:
59
-                        contentBuilder.append("待开庭审理");
60
-                        break;
61
-                    case  9:
62
-                        contentBuilder.append("待书面审理");
63
-                        break;
64
-                    case  10:
65
-                        contentBuilder.append("书面审理");
66
-                        break;
67
-                    case  11:
68
-                        contentBuilder.append("审核裁决书,拒绝");
69
-                        break;
70
-                    case  12:
71
-                        contentBuilder.append("核验裁决书");
72
-                        break;
73
-                    case  13:
74
-                        contentBuilder.append("审核裁决书,同意");
75
-                        break;
76
-                    case  14:
77
-                        contentBuilder.append("签名成功");
78
-                        break;
79
-                    case  15:
80
-                        contentBuilder.append("用印成功");
81
-                        break;
82
-                    case  16:
83
-                        contentBuilder.append("送达仲裁文书");
84
-                        break;
85
-                    case  17:
86
-                        contentBuilder.append("案件归档");
87
-                        break;
88
-                    case  26:
89
-                        contentBuilder.append("证据确认成功");
90
-                        break;
91
-                    default:break;
33
+                if(StrUtil.isNotEmpty(record.getContent())){
34
+                    contentBuilder.append(record.getContent());
92
                 }
35
                 }
93
-
94
                 record.setContent(contentBuilder.toString());
36
                 record.setContent(contentBuilder.toString());
95
 
37
 
96
             });
38
             });

+ 4
- 4
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Ver fichero

49
                             when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
49
                             when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
50
                             when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
50
                             when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
51
                             when 12 then '待审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
51
                             when 12 then '待审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
52
-                            when 15 then '待仲裁文书送达' when 16 then '待案件归档'
52
+                            when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
53
                             ELSE '无案件状态'
53
                             ELSE '无案件状态'
54
                             END caseStatusName,
54
                             END caseStatusName,
55
         c.hear_date ,c.arbitrat_claims ,
55
         c.hear_date ,c.arbitrat_claims ,
56
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
56
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
57
         c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
57
         c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
58
-        c.update_by ,c.update_time , c.arbitrator_name,d.dept_name as applicantName
58
+        c.update_by ,c.update_time , c.arbitrator_name,d.dept_name as applicantName,c.register_date
59
         from case_application c
59
         from case_application c
60
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1
60
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1
61
         LEFT JOIN sys_dept d ON ca.NAME = d.dept_id and ca.name=d.dept_id
61
         LEFT JOIN sys_dept d ON ca.NAME = d.dept_id and ca.name=d.dept_id
93
 
93
 
94
         <if test="caseNum != null and caseNum != ''">case_num,</if>
94
         <if test="caseNum != null and caseNum != ''">case_num,</if>
95
         <if test="caseSubjectAmount != null">case_subject_amount,</if>
95
         <if test="caseSubjectAmount != null">case_subject_amount,</if>
96
-        <if test="registerDate != null">register_date,</if>
96
+        register_date,
97
         <if test="arbitratMethod != null and arbitratMethod != ''">arbitrat_method,</if>
97
         <if test="arbitratMethod != null and arbitratMethod != ''">arbitrat_method,</if>
98
         <if test="caseStatus != null ">case_status,</if>
98
         <if test="caseStatus != null ">case_status,</if>
99
         <if test="hearDate != null ">hear_date,</if>
99
         <if test="hearDate != null ">hear_date,</if>
114
         )values(
114
         )values(
115
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
115
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
116
         <if test="caseSubjectAmount != null">#{caseSubjectAmount},</if>
116
         <if test="caseSubjectAmount != null">#{caseSubjectAmount},</if>
117
-        <if test="registerDate != null">#{registerDate},</if>
117
+       sysdate(),
118
         <if test="arbitratMethod != null and arbitratMethod != ''">#{arbitratMethod},</if>
118
         <if test="arbitratMethod != null and arbitratMethod != ''">#{arbitratMethod},</if>
119
         <if test="caseStatus != null ">#{caseStatus},</if>
119
         <if test="caseStatus != null ">#{caseStatus},</if>
120
         <if test="hearDate != null ">#{hearDate},</if>
120
         <if test="hearDate != null ">#{hearDate},</if>

+ 10
- 1
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml Ver fichero

22
     </insert>
22
     </insert>
23
     <select id="selectCaseLogRecordList" resultType="com.ruoyi.wisdomarbitrate.domain.CaseLogRecord">
23
     <select id="selectCaseLogRecordList" resultType="com.ruoyi.wisdomarbitrate.domain.CaseLogRecord">
24
             select cl.case_node caseNode ,cl.case_node_time caseNodeTime ,cl.notes  ,cl.id ,cl.case_appli_id caseAppliId,
24
             select cl.case_node caseNode ,cl.case_node_time caseNodeTime ,cl.notes  ,cl.id ,cl.case_appli_id caseAppliId,
25
-            cl.create_by createBy,cl.create_nick_name createNickName,cl.create_time createTime,cl.update_by updateBy,cl.update_time updateTime
25
+            cl.create_by createBy,cl.create_nick_name createNickName,cl.create_time createTime,cl.update_by updateBy,cl.update_time updateTime,
26
+        CASE cl.case_node when 0 then '立案申请' when 1 then '提交立案申请' when 2 then '立案审查'
27
+        when 3 then '支付成功' when 4 then '缴费确认' when 5 then '案件质证'
28
+        when 6 then '组庭审核' when 7 then '组庭确认' when 8 then '待开庭审理'
29
+        when 9 then '待书面审理' when 10 then '书面审理' when 11 then '拒绝裁决书'
30
+        when 12 then '核验裁决书' when 13 then '同意裁决书' when 14 then '签名成功'
31
+        when 15 then '用印成功' when 16 then '送达仲裁文书' when 17 then '案件归档'
32
+        when 26 then '证据确认成功'
33
+        ELSE '无案件状态'
34
+        END content
26
             from case_log_record cl
35
             from case_log_record cl
27
 
36
 
28
             <where>
37
             <where>