|
@@ -179,11 +179,14 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
|
|
|
* @description 保存项目信息
|
|
|
* @date 2020/1/14 4:12 下午
|
|
|
*/
|
|
|
- public boolean saveProject(Project project) {
|
|
|
+ public Project saveProject(Project project) {
|
|
|
//按当前日期时间戳自动生成项目编号
|
|
|
String projectCode = DateUtils.generateCode();
|
|
|
project.setProjectCode("XM" + projectCode);
|
|
|
- return save(project);
|
|
|
+ project.setProjectStatus(project.getStartDate().isAfter(LocalDate.now()) ? "1" : "2");
|
|
|
+ boolean result = save(project);
|
|
|
+ if (result) return project;
|
|
|
+ return null;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -194,14 +197,8 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
|
|
|
*/
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public RestResponse add(ProjectExtensionRequest request) {
|
|
|
- Project project = request.getProject();
|
|
|
- if (project.getStartDate().isAfter(LocalDate.now())) {
|
|
|
- project.setProjectStatus("1");
|
|
|
- } else {
|
|
|
- project.setProjectStatus("2");
|
|
|
- }
|
|
|
- boolean ret = saveProject(project);
|
|
|
- if (!ret) {
|
|
|
+ Project project = saveProject(request.getProject());
|
|
|
+ if (ObjectUtil.isEmpty(project)) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return RestResponse.fail(MessageUtils.get("msg.add.fail"));
|
|
|
}
|