|
|
@@ -144,11 +144,12 @@ public class ProjectChangeStopHelper { |
|
|
|
.eq(ProjectChangeHistory::getProjectCode, projectCode) |
|
|
|
.orderByDesc(ProjectChangeHistory::getCreateOn) |
|
|
|
.last(BizConst.LIMIT_1); |
|
|
|
ProjectChangeHistory changeHistory = projectChangeHistoryService.getOne(changeHistoryWrapper); |
|
|
|
changeHistory.setStatus(buildBizStatus(projEvent).getCode()); |
|
|
|
projectChangeHistoryService.updateById(changeHistory); |
|
|
|
ProjectChangeHistory history = projectChangeHistoryService.getOne(changeHistoryWrapper); |
|
|
|
history.setStatus(buildBizStatus(projEvent).getCode()); |
|
|
|
projectChangeHistoryService.updateById(history); |
|
|
|
if (projEvent.equals(ProjectStateChangeEvent.CHANGE_APPLY_PASS)) { |
|
|
|
projectEditRewrite(JSONUtil.toBean(changeHistory.getChangeContent(), EditProjectDetailDTO.class)); |
|
|
|
EditProjectDetailDTO editProjectDetail = JSONUtil.toBean(history.getChangeContent(), EditProjectDetailDTO.class); |
|
|
|
projectEditRewrite(projectCode, editProjectDetail); |
|
|
|
} |
|
|
|
} |
|
|
|
ProjectStatusChange change = projectStatusChangeService.getLastOne(projBeforeEvent, projectId); |
|
|
@@ -222,7 +223,7 @@ public class ProjectChangeStopHelper { |
|
|
|
return bizStatus; |
|
|
|
} |
|
|
|
|
|
|
|
private void projectEditRewrite(EditProjectDetailDTO projectEdit) { |
|
|
|
private void projectEditRewrite(String projectCode, EditProjectDetailDTO projectEdit) { |
|
|
|
List<FieldDiff> projectDiffs = projectEdit.getProjectDiffs(); |
|
|
|
if (CollUtil.isNotEmpty(projectDiffs)) { |
|
|
|
EditProjectDTO projectDetail = projectEdit.getProject(); |
|
|
@@ -230,7 +231,7 @@ public class ProjectChangeStopHelper { |
|
|
|
w -> w.getFieldName().equals(EditProjectDTO.SYSTEM_REPLACE_INFOS)); |
|
|
|
if (systemReplaceInfos != null) { |
|
|
|
projectLibManage.saveGovSystemReplaceInfos(projectDetail.getId(), |
|
|
|
projectDetail.getProjectCode(), projectDetail.getSystemReplaceInfos()); |
|
|
|
projectCode, projectDetail.getSystemReplaceInfos()); |
|
|
|
} |
|
|
|
UpdateWrapper<Project> wrapper = buildWrapper(projectDiffs, Project.class); |
|
|
|
if (wrapper != null) { |
|
|
|