SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit was merged in pull request #267.
This commit is contained in:
hejinbo
2023-11-30 20:00:55 +08:00
committed by Gitea
parent f71c07ab6a 62e5467e5f
commit c083e3711c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+2 -2
View File
@@ -1316,7 +1316,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
if(caseAffiliate.getIdentityType()==1){ if(caseAffiliate.getIdentityType()==1){
// 校验申请人 // 校验申请人
for (String applicAffiliateColumn : applicAffiliateColumns) { for (String applicAffiliateColumn : applicAffiliateColumns) {
if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseApplication, applicAffiliateColumn))){ if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseAffiliate, applicAffiliateColumn))){
errorMsg.append(applicAffiliateColumn).append("不能为空，"); errorMsg.append(applicAffiliateColumn).append("不能为空，");
// todo 暂抛出异常，后边改为提示具体的字段 // todo 暂抛出异常，后边改为提示具体的字段
throw new ServiceException("必填字段未填写，请完善案件信息！"); throw new ServiceException("必填字段未填写，请完善案件信息！");
@@ -1326,7 +1326,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
// 校验被申请人 // 校验被申请人
// 校验申请人 // 校验申请人
for (String applicAffiliateColumn : dectborAffiliateColumns) { for (String applicAffiliateColumn : dectborAffiliateColumns) {
if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseApplication, applicAffiliateColumn))){ if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseAffiliate, applicAffiliateColumn))){
errorMsg.append(applicAffiliateColumn).append("不能为空，"); errorMsg.append(applicAffiliateColumn).append("不能为空，");
// todo 暂抛出异常，后边改为提示具体的字段 // todo 暂抛出异常，后边改为提示具体的字段
throw new ServiceException("必填字段未填写，请完善案件信息！"); throw new ServiceException("必填字段未填写，请完善案件信息！");
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+1 -1
View File
@@ -1535,7 +1535,7 @@
order by c.create_time desc limit 1 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 ,c.case_name,
CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理' CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
ELSE '无审理方式' ELSE '无审理方式'
END arbitratMethodName, END arbitratMethodName,