|
@@ -64,7 +64,7 @@ public class GenerateProjectCodeUtil { |
|
|
.orderByDesc(GovOperationProjectBaseinfo::getBaseProjId) |
|
|
.orderByDesc(GovOperationProjectBaseinfo::getBaseProjId) |
|
|
.last(BizConst.LIMIT_1)); |
|
|
.last(BizConst.LIMIT_1)); |
|
|
if(Objects.nonNull(operationBaseMax) && StringUtils.isNotBlank(operationBaseMax.getBaseProjId())){ |
|
|
if(Objects.nonNull(operationBaseMax) && StringUtils.isNotBlank(operationBaseMax.getBaseProjId())){ |
|
|
Long operationMax = Long.valueOf(baseMax.getBaseProjId().substring(baseMax.getBaseProjId().length() - 5)); |
|
|
|
|
|
|
|
|
Long operationMax = Long.valueOf(operationBaseMax.getBaseProjId().substring(operationBaseMax.getBaseProjId().length() - 5)); |
|
|
max = Math.max(max,operationMax); |
|
|
max = Math.max(max,operationMax); |
|
|
} |
|
|
} |
|
|
Project projectMax = projectService.getOne(Wrappers.lambdaQuery(Project.class) |
|
|
Project projectMax = projectService.getOne(Wrappers.lambdaQuery(Project.class) |
|
@@ -105,7 +105,7 @@ public class GenerateProjectCodeUtil { |
|
|
.orderByDesc(GovOperationProjectBaseinfo::getBaseProjId) |
|
|
.orderByDesc(GovOperationProjectBaseinfo::getBaseProjId) |
|
|
.last(BizConst.LIMIT_1)); |
|
|
.last(BizConst.LIMIT_1)); |
|
|
if(Objects.nonNull(operationBaseMax) && StringUtils.isNotBlank(operationBaseMax.getBaseProjId())){ |
|
|
if(Objects.nonNull(operationBaseMax) && StringUtils.isNotBlank(operationBaseMax.getBaseProjId())){ |
|
|
Long operationMax = Long.valueOf(baseMax.getBaseProjId().substring(baseMax.getBaseProjId().length() - 5)); |
|
|
|
|
|
|
|
|
Long operationMax = Long.valueOf(operationBaseMax.getBaseProjId().substring(operationBaseMax.getBaseProjId().length() - 5)); |
|
|
max = Math.max(max,operationMax); |
|
|
max = Math.max(max,operationMax); |
|
|
} |
|
|
} |
|
|
Project projectMax = projectService.getOne(Wrappers.lambdaQuery(Project.class) |
|
|
Project projectMax = projectService.getOne(Wrappers.lambdaQuery(Project.class) |
|
|