FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into 'FOTON'

Browse Source 
Develop master

See merge request LiuChao/foton-slrs-system-rest!326
This commit is contained in:
王夏晖
2021-12-27 16:14:57 +08:00
parent 6f455ea0f1 c41a19a1ab
commit 575a50a399
5 changed files with 75 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
+5 -5
View File
@@ -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<EsMatingRelation> esMatingRelations;
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+8
View File
@@ -77,6 +77,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
return "企标名称不能重复,请更换新的企标名称";
}else {
esRevisePlanDao.insertOne(esRevisePlan);
esRevisePlan.getEsMatingRelations().forEach(esMatingRelation -> {
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 "操作成功";
adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java
+4
View File
@@ -40,6 +40,10 @@ public class EsStandRelation extends BaseEntity {
@TableField("use_level")
private String useLevel;
@ApiModelProperty(value = "采用程度名称")
@TableField(exist = false)
private String useLevelName;
@ApiModelProperty(value = "简述技术指标依据")
@TableField("technologic")
private String technologic;