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

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

Browse Source
This commit is contained in:
hejinbo
2023-11-03 11:47:46 +08:00
parent 876d0807c7 664aa6b3f0
commit 5b7b839395
6 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+4 -2
View File
@@ -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;
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
+1 -1
View File
@@ -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);
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+6
View File
@@ -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());