发版合并 #363

Merged
wangqiong123 merged 129 commits from dev into pro 2024-06-03 02:26:01 +00:00
3 changed files with 7 additions and 12 deletions
Showing only changes of commit 20517eaaaa - Show all commits
@@ -407,7 +407,7 @@ public class CaseApplication extends BaseEntity {
/**
* 批号
*/
private String batchNumber;
private Integer batchNumber;
/**
* 自定义字段
*/
@@ -987,14 +987,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
String caseNum = generateCaseNum();
caseApplication.setCaseNum(caseNum);
// 设置批号
if(StrUtil.isEmpty(caseApplication.getBatchNumber())){
Integer maxBatchNumber = caseApplicationMapper.selectBatchNumberLike();
if(maxBatchNumber==null){
caseApplication.setBatchNumber("1");
}else {
caseApplication.setBatchNumber(maxBatchNumber+1+"");
}
}
caseApplication.setBatchNumber(0);
caseApplication.setCreateBy(getUsername());
caseApplication.setVersion(1);
caseApplication.setId(IdWorkerUtil.getId());
@@ -248,14 +248,14 @@ public class CaseZipImportImpl {
caseApplication.setCaseAppliId(caseApplication.getId());
// 设置批号
if (StrUtil.isEmpty(caseApplication.getBatchNumber())) {
if (caseApplication.getBatchNumber()==null) {
maxBatchNumber = caseApplicationMapper.selectBatchNumberLike();
if (maxBatchNumber == null) {
maxBatchNumber = 1;
caseApplication.setBatchNumber(maxBatchNumber.toString());
caseApplication.setBatchNumber(maxBatchNumber);
} else {
maxBatchNumber = maxBatchNumber + 1;
caseApplication.setBatchNumber(maxBatchNumber.toString());
caseApplication.setBatchNumber(maxBatchNumber);
}
}
// 设置编号