diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 26f8a511..6c95316b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -82,19 +82,19 @@ public class EsRevisePlan extends BasePage { // private String ptJson; @ApiModelProperty(value = "引入企业标准json(标准id)") private String rqbJson; - @ApiModelProperty(value = "引入企业标准json(标准id)") + @ApiModelProperty(value = "引入企业标准json(标准名称)") private String rqbName; - @ApiModelProperty(value = "引入企业标准json(标准id)") + @ApiModelProperty(value = "引入企业标准json(标准编号)") private String rqbCode; - @ApiModelProperty(value = "体系结构树(找到表直接json处理掉,存储方式是逗号拼接)") + @ApiModelProperty(value = "体系结构树(id存储方式是逗号拼接)") private String tsJson; - @ApiModelProperty(value = "体系结构树(找到表直接json处理掉,存储方式是逗号拼接)") + @ApiModelProperty(value = "体系结构树(名称逗号拼接展示)") private String tsJsonName; @ApiModelProperty(value = "标准范围") private String area; @ApiModelProperty(value = "标准范围") private String areaName; - @ApiModelProperty(value = "标准范围") + @ApiModelProperty(value = "企标类别") private String qblb; private List esMatingRelations; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index fe2f8367..68e545c5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -77,6 +77,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl { + esMatingRelation.setEsId(UUIDUtils.randomUUID(32)); + esMatingRelation.setEsId(esRevisePlan.getId()); + }); + esRevisePlan.getEsStandRelations().forEach(esStandRelation -> { + esStandRelation.setEsId(esRevisePlan.getId()); + esStandRelation.setId(UUIDUtils.randomUUID(32)); + }); esMatingRelationService.saveBatch(esRevisePlan.getEsMatingRelations()); esStandRelationService.saveBatch(esRevisePlan.getEsStandRelations()); return "操作成功";