Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the,  56519 企标计划-编辑，引用标准显示null 删除后提交 再次点击还是显示null

See merge request LiuChao/foton-slrs-system-rest!557

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java

@@ -53,12 +53,15 @@ public class EsRevisePlan extends BasePage {
 
 
     @ApiModelProperty(value = "起草人姓名")
+    @TableField(exist = false)
     private String drafterName;
 
     @ApiModelProperty(value = "评审责任人姓名")
+    @TableField(exist = false)
     private String resPersonName;
 
     @ApiModelProperty(value = "工作组组长姓名")
+    @TableField(exist = false)
     private String wgLeaderName;
 
     @ApiModelProperty(value = "计划标准初稿完成时间")
@@ -75,26 +78,33 @@ public class EsRevisePlan extends BasePage {
     private String unit;
 
     @ApiModelProperty(value = "起草责任单位名称")
+    @TableField(exist = false)
     private String unitName;
 
     @ApiModelProperty(value = "引入企业标准json(标准id)")
     private String rqbJson;
     @ApiModelProperty(value = "引入企业标准json(标准名称)")
+    @TableField(exist = false)
     private String rqbName;
     @ApiModelProperty(value = "引入企业标准json(标准编号)")
+    @TableField(exist = false)
     private String rqbCode;
     @ApiModelProperty(value = "体系结构树（id存储方式是逗号拼接）")
     private String tsJson;
     @ApiModelProperty(value = "体系结构树（名称逗号拼接展示）")
+    @TableField(exist = false)
     private String tsJsonName;
     @ApiModelProperty(value = "标准范围")
     private String area;
     @ApiModelProperty(value = "标准范围")
+    @TableField(exist = false)
     private String areaName;
     //企标类别
+    @TableField(exist = false)
     private String standType;
 
     // 标准编号
+    @TableField(exist = false)
     private String standNum;
 
 
@@ -109,6 +119,7 @@ public class EsRevisePlan extends BasePage {
     @TableField("use_level")
     private String useLevel;
 
+    @TableField(exist = false)
     private String useLevelName;
 
     @ApiModelProperty(value = "简述技术指标依据")

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java

@@ -75,7 +75,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
         if (esRevisePlans.size()>0){
             return "企标名称不能重复,请更换新的企标名称。";
         }else {
-            esRevisePlanDao.updateOne(esRevisePlan);
+            esRevisePlanDao.updateById(esRevisePlan);
             return "操作成功";
         }
     }