diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java index 018734d..059fbc5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java @@ -247,7 +247,11 @@ public class ProjectRecord extends BaseEntity implements Serializable { @ApiModelProperty(value = "业务状态") private Integer status; - + /** + * 业务模块 + */ + @ApiModelProperty(value = "业务模块") + private Integer businessModule; /** * 系统标识:0-采购 1-工作台 2-工作台合并 */ diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 79c79de..c057a01 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -258,17 +258,17 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("status", ProjectCommonUtil.PROJECT_STATUS_1); updateWrapper.eq("id",id); updateWrapper.set("status",ProjectCommonUtil.PROJECT_STATUS_2); - + updateWrapper.set("business_mode", businessModule); boolean result = this.update(updateWrapper); CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValid(!result); - int businessModule = isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2:ProjectCommonUtil.BUSINESS_MODULE_7; //修改标段信息 UpdateWrapper sectionUpdateWrapper = new UpdateWrapper<>(); sectionUpdateWrapper.eq("project_id", id); @@ -696,8 +696,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl sectionQueryWrapper = Wrappers.lambdaQuery(); @@ -645,6 +684,10 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl sectionIds, int businessMode) { + if (!sectionIds.isEmpty()) { + ProjectRecord project = recordService.getById(sectionIds.stream().findFirst().get()); + if (Objects.isNull(project.getBusinessModule()) || project.getBusinessModule() < businessMode) { + boolean b = recordService.updateById(new ProjectRecord().setId(project.getId()).setBusinessModule(businessMode)); + ProjectExceptionEnum.FRAME_EXCEPTION_NOTIFICATION_MESSAGE.customValidName("项目阶段更新失败", !b); + } + } + } + + private void updateProjectBusinessMode(String sectionId, int businessMode) { + this.updateProjectBusinessMode(Collections.singletonList(sectionId), businessMode); + } }