|
|
@@ -92,7 +92,7 @@ public class WbsParamController {
|
|
|
/*应该检查接触关联的参数公式还是否存在引用，不存在的情况也要删去*/
|
|
|
}
|
|
|
if (CollectionUtil.isNotEmpty(wps)) {
|
|
|
- Map<Boolean, List<WbsParamBean>> map = wps.stream().collect(Collectors.partitioningBy(e -> e.getId() != null));
|
|
|
+ Map<Boolean, List<WbsParamBean>> map = wps.stream().peek(w-> w.setType(pb.getType())).collect(Collectors.partitioningBy(e -> e.getId() != null));
|
|
|
List<WbsParamBean> saveList = map.get(false);
|
|
|
List<WbsParamBean> updateList = map.get(true);
|
|
|
if (CollectionUtil.isNotEmpty(saveList)) {
|
|
|
@@ -238,7 +238,7 @@ public class WbsParamController {
|
|
|
@GetMapping("/list")
|
|
|
public R<List<WbsParamBean>> list3(@ApiParam(value = "wbs节点id", required = true) Long wbsId) {
|
|
|
List<WbsParam> data = this.service.list(Wrappers.<WbsParam>lambdaQuery()
|
|
|
- .select(WbsParam::getId, WbsParam::getName, WbsParam::getK, WbsParam::getV, WbsParam::getRemark, WbsParam::getNodeId, WbsParam::getProjectId,WbsParam::getType)
|
|
|
+ .select(WbsParam::getId, WbsParam::getName, WbsParam::getK, WbsParam::getV, WbsParam::getRemark, WbsParam::getNodeId, WbsParam::getProjectId)
|
|
|
.eq(WbsParam::getNodeId, wbsId)
|
|
|
.eq(WbsParam::getType, 1));
|
|
|
if (data.size() > 0) {
|
yangyj