diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java index 355ee58..134caf8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java @@ -16,6 +16,9 @@ public class CaseApplication extends BaseEntity { /** ID */ private Long id; + /** 案件名称 */ + @Excel(name = "案件名称") + private String caseName; /** 案件编号 */ // @Excel(name = "案件编号") private String caseNum; @@ -127,8 +130,7 @@ public class CaseApplication extends BaseEntity { /** 仲裁员名称 */ private String arbitratorName; - /** 案件名称 */ - private String caseName; + /** 案件描述 */ private String caseDescribe; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java index 3e371b6..6d09066 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java @@ -582,7 +582,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { for (CaseAttach caseAttach : caseAttachList) { if (caseAttach.getAnnexType() == 3) { String annexName = caseAttach.getAnnexName(); - String prefix = "/profile/upload/"; + String prefix = "/profile/upload"; int startIndex = prefix.length(); String path = caseAttach.getAnnexPath() + annexName.substring(startIndex); file = new File(path); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index cad7a7e..b70f2ad 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -1472,6 +1472,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { * @param failureMsg */ private void validBaseColumn(CaseApplication caseApplication, StringBuilder failureMsg) { + if( StrUtil.isEmpty(caseApplication.getCaseName())){ + failureMsg.append("【案件名称】字段不能为空;"); + }else if(caseApplication.getCaseName().length()>50){ + failureMsg.append("【案件名称】字段超出指定长度,最大长度为50;"); + } BigDecimal caseSubjectAmount = caseApplication.getCaseSubjectAmount(); if(null== caseSubjectAmount){ failureMsg.append("【案件标的】字段不合法;"); @@ -2391,6 +2396,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { private void copyCaseApplication(CaseApplication caseApplicationinsertDiffer, CaseApplication caseApplicationNew) { caseApplicationNew.setArbitratClaims(caseApplicationinsertDiffer.getArbitratClaims()); caseApplicationNew.setCaseNum(caseApplicationinsertDiffer.getCaseNum()); + caseApplicationNew.setCaseName(caseApplicationinsertDiffer.getCaseName()); caseApplicationNew.setCaseSubjectAmount(caseApplicationinsertDiffer.getCaseSubjectAmount()); caseApplicationNew.setLoanStartDate(caseApplicationinsertDiffer.getLoanStartDate()); caseApplicationNew.setLoanEndDate(caseApplicationinsertDiffer.getLoanEndDate()); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 7bd95db..de4523e 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -372,7 +372,7 @@ insert into case_application( - + case_name , case_num, case_subject_amount, register_date, @@ -400,6 +400,7 @@ import_flag, create_time )values( + #{caseName}, #{caseNum}, #{caseSubjectAmount}, sysdate(), diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml index a4404e2..7b8ad5c 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml @@ -34,6 +34,9 @@ AND d.dept_id = #{deptId} + + AND d.user_id = #{userId} + diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml index d1e75d9..f6c3d23 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml @@ -25,6 +25,7 @@ AND c.case_num = #{caseNum} + order by s.send_time desc