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 2fc4e1fa..b5be3788 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 @@ -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 = "简述技术指标依据") 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 4ba8b212..6e8a7fe7 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 @@ -75,7 +75,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl0){ return "企标名称不能重复,请更换新的企标名称。"; }else { - esRevisePlanDao.updateOne(esRevisePlan); + esRevisePlanDao.updateById(esRevisePlan); return "操作成功"; } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index c7c95620..c19e6985 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -304,25 +304,25 @@ update es_revise_plan - + id = #{id}, - + es_name = #{esName}, - + plan_status = #{planStatus}, - + revise_status = #{reviseStatus}, - + drafter = #{drafter}, - + res_person = #{resPerson}, - + wg_leader = #{wgLeader}, @@ -331,37 +331,37 @@ release_time = #{releaseTime}, - + unit = #{unit}, - + rqb_json=#{rqbJson}, - + ts_json=#{tsJson}, - + area=#{area}, - + es_mating_relations=#{esMatingRelations}, - + es_stand_relations=#{esStandRelations}, - + is_relate=#{isRelate}, - + use_level=#{useLevel}, - + technologic=#{technologic}, - + buss_sort=#{bussSort}, - + LXD=#{lxd},