Просмотр исходного кода

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

wangqiong123 2 лет назад
Родитель
Сommit
a21acab67d

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

1197
                         caseApplicationListinsert.add(caseApplication);
1197
                         caseApplicationListinsert.add(caseApplication);
1198
                     }else {
1198
                     }else {
1199
                         // 拼接错误信息
1199
                         // 拼接错误信息
1200
-                        failureMsg.append("<br/>").append("第").append(i+2).append("行:").append(caseApplication.getErrorMsg().toString());
1200
+                         failureMsg.append("<br/>").append("第").append(i+2).append("行:").append(caseApplication.getErrorMsg().toString());
1201
 
1201
 
1202
                     }
1202
                     }
1203
                 }else {
1203
                 }else {
1463
         if( caseApplication.getLoanEndDate()== null){
1463
         if( caseApplication.getLoanEndDate()== null){
1464
             failureMsg.append("【借款结束日期】字段不合法;");
1464
             failureMsg.append("【借款结束日期】字段不合法;");
1465
         }
1465
         }
1466
+        if( caseApplication.getLoanStartDate()!= null && caseApplication.getLoanEndDate()!= null && caseApplication.getLoanStartDate().after(caseApplication.getLoanEndDate()) ){
1467
+            failureMsg.append("【借款结束日期】不能早于【借款开始日期】;");
1468
+        }
1466
         if( StrUtil.isEmpty(caseApplication.getContractNumber())){
1469
         if( StrUtil.isEmpty(caseApplication.getContractNumber())){
1467
             failureMsg.append("【合同编号】字段不能为空;");
1470
             failureMsg.append("【合同编号】字段不能为空;");
1468
         }else if(caseApplication.getContractNumber().length()>50){
1471
         }else if(caseApplication.getContractNumber().length()>50){
1502
             }
1505
             }
1503
         }
1506
         }
1504
         if( StrUtil.isEmpty(caseApplication.getArbitratClaims())){
1507
         if( StrUtil.isEmpty(caseApplication.getArbitratClaims())){
1505
-            failureMsg.append("【申请人仲裁诉求】字段不能为空;");
1508
+            failureMsg.append("【申请人仲裁请求及事实和理由】字段不能为空;");
1506
         }else if(caseApplication.getArbitratClaims().length()>10000){
1509
         }else if(caseApplication.getArbitratClaims().length()>10000){
1507
-            failureMsg.append("【申请人仲裁诉求】字段超出指定长度,最大长度为10000;");
1510
+            failureMsg.append("【申请人仲裁请求及事实和理由】字段超出指定长度,最大长度为10000;");
1511
+        }
1512
+        if(StrUtil.isNotEmpty(caseApplication.getArbitratClaims())&&caseApplication.getArbitratClaims().length()>10000){
1513
+            failureMsg.append("【申请人请求仲裁庭裁决】字段超出指定长度,最大长度为10000;");
1508
         }
1514
         }
1509
     }
1515
     }
1510
 
1516
 

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

539
                 AND c.id = #{id}
539
                 AND c.id = #{id}
540
             </if>
540
             </if>
541
         </where>
541
         </where>
542
+order by c.create_time desc limit 1
542
     </select>
543
     </select>
543
     <select id="listCaseApplicationByIds" resultMap="CaseApplicationResult">
544
     <select id="listCaseApplicationByIds" resultMap="CaseApplicationResult">
544
         select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
545
         select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,