Commit 85dd3014 authored by wanglong's avatar wanglong

增加资料提交的保存

parent be4daecb
......@@ -178,7 +178,8 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
projectResource.setResourceId(Long.valueOf(select));
BeanUtils.copyProperties(projectResource, Resource);
boolean save = this.save(projectResource);
if (save || type.equals(设备资源.getName())) {
//判断
if (save && type.equals(设备资源.getName())) {
LambdaQueryWrapper<Equipment> wrapperEquipment = new LambdaQueryWrapper<>();
wrapperEquipment.eq(BaseEntity::getSequenceNbr, select);
Equipment equipment = new Equipment();
......
......@@ -214,9 +214,11 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
install=true;
}
}
if(design && install){
projectInitiationService.execute(project.getInstanceId(),projectDto,"1");
String type = jsonObject.getString("type");
if (type != null) {
if (design && install) {
projectInitiationService.execute(project.getInstanceId(), projectDto, "1");
}
}
return "ok";
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment