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 qtz5

Browse Source
This commit is contained in:
qitz
2023-12-29 17:24:05 +08:00
parent 7a38c4e8a5 66d66e5156
commit 53c64c36da
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+1 -1
View File
@@ -407,7 +407,7 @@ public class CaseApplication extends BaseEntity {
/** /**
* 批号 * 批号
*/ */
private String batchNumber; private Integer batchNumber;
/** /**
* 自定义字段 * 自定义字段
*/ */
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+3 -8
View File
@@ -987,14 +987,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
String caseNum = generateCaseNum(); String caseNum = generateCaseNum();
caseApplication.setCaseNum(caseNum); caseApplication.setCaseNum(caseNum);
// 设置批号 // 设置批号
if(StrUtil.isEmpty(caseApplication.getBatchNumber())){
Integer maxBatchNumber = caseApplicationMapper.selectBatchNumberLike(); caseApplication.setBatchNumber(0);
if(maxBatchNumber==null){
caseApplication.setBatchNumber("1");
}else {
caseApplication.setBatchNumber(maxBatchNumber+1+"");
}
}
caseApplication.setCreateBy(getUsername()); caseApplication.setCreateBy(getUsername());
caseApplication.setVersion(1); caseApplication.setVersion(1);
caseApplication.setId(IdWorkerUtil.getId()); caseApplication.setId(IdWorkerUtil.getId());
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java
+3 -3
View File
@@ -248,14 +248,14 @@ public class CaseZipImportImpl {
caseApplication.setCaseAppliId(caseApplication.getId()); caseApplication.setCaseAppliId(caseApplication.getId());
// 设置批号 // 设置批号
if (StrUtil.isEmpty(caseApplication.getBatchNumber())) { if (caseApplication.getBatchNumber()==null) {
maxBatchNumber = caseApplicationMapper.selectBatchNumberLike(); maxBatchNumber = caseApplicationMapper.selectBatchNumberLike();
if (maxBatchNumber == null) { if (maxBatchNumber == null) {
maxBatchNumber = 1; maxBatchNumber = 1;
caseApplication.setBatchNumber(maxBatchNumber.toString()); caseApplication.setBatchNumber(maxBatchNumber);
} else { } else {
maxBatchNumber = maxBatchNumber + 1; maxBatchNumber = maxBatchNumber + 1;
caseApplication.setBatchNumber(maxBatchNumber.toString()); caseApplication.setBatchNumber(maxBatchNumber);
} }
} }
// 设置编号 // 设置编号