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

This commit was merged in pull request #164.
This commit is contained in:
2023-10-31 15:19:39 +08:00
committed by Gitea
2 changed files with 10 additions and 3 deletions
@@ -1197,7 +1197,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseApplicationListinsert.add(caseApplication); caseApplicationListinsert.add(caseApplication);
}else { }else {
// 拼接错误信息 // 拼接错误信息
failureMsg.append("<br/>").append("第").append(i+2).append("行:").append(caseApplication.getErrorMsg().toString()); failureMsg.append("<br/>").append("第").append(i+2).append("行:").append(caseApplication.getErrorMsg().toString());
} }
}else { }else {
@@ -1463,6 +1463,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
if( caseApplication.getLoanEndDate()== null){ if( caseApplication.getLoanEndDate()== null){
failureMsg.append("【借款结束日期】字段不合法;"); failureMsg.append("【借款结束日期】字段不合法;");
} }
if( caseApplication.getLoanStartDate()!= null && caseApplication.getLoanEndDate()!= null && caseApplication.getLoanStartDate().after(caseApplication.getLoanEndDate()) ){
failureMsg.append("【借款结束日期】不能早于【借款开始日期】;");
}
if( StrUtil.isEmpty(caseApplication.getContractNumber())){ if( StrUtil.isEmpty(caseApplication.getContractNumber())){
failureMsg.append("【合同编号】字段不能为空;"); failureMsg.append("【合同编号】字段不能为空;");
}else if(caseApplication.getContractNumber().length()>50){ }else if(caseApplication.getContractNumber().length()>50){
@@ -1502,9 +1505,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
} }
} }
if( StrUtil.isEmpty(caseApplication.getArbitratClaims())){ if( StrUtil.isEmpty(caseApplication.getArbitratClaims())){
failureMsg.append("【申请人仲裁诉求】字段不能为空;"); failureMsg.append("【申请人仲裁请求及事实和理由】字段不能为空;");
}else if(caseApplication.getArbitratClaims().length()>10000){ }else if(caseApplication.getArbitratClaims().length()>10000){
failureMsg.append("【申请人仲裁诉求】字段超出指定长度,最大长度为10000;"); failureMsg.append("【申请人仲裁请求及事实和理由】字段超出指定长度,最大长度为10000;");
}
if(StrUtil.isNotEmpty(caseApplication.getArbitratClaims())&&caseApplication.getArbitratClaims().length()>10000){
failureMsg.append("【申请人请求仲裁庭裁决】字段超出指定长度,最大长度为10000;");
} }
} }
@@ -539,6 +539,7 @@
AND c.id = #{id} AND c.id = #{id}
</if> </if>
</where> </where>
order by c.create_time desc limit 1
</select> </select>
<select id="listCaseApplicationByIds" resultMap="CaseApplicationResult"> <select id="listCaseApplicationByIds" resultMap="CaseApplicationResult">
select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method , select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,