From 2d3f27bf17eafa9920738b3e229494b302b908e5 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Mon, 18 Jul 2022 15:48:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=2056519?=
 =?UTF-8?q?=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92-=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E5=BC=95=E7=94=A8=E6=A0=87=E5=87=86=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?null=20=E5=88=A0=E9=99=A4=E5=90=8E=E6=8F=90=E4=BA=A4=20?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E7=82=B9=E5=87=BB=E8=BF=98=E6=98=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esRevisePlan/entity/EsRevisePlan.java     | 11 ++++++
 .../service/impl/EsRevisePlanServiceImpl.java |  2 +-
 .../esRevisePlan/EsRevisePlanMapper.xml       | 36 +++++++++----------
 3 files changed, 30 insertions(+), 19 deletions(-)

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 ServiceImpl<EsRevisePlanDao, EsRevi
         if (esRevisePlans.size()>0){
             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 id="updateOne" parameterType="com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan">
         update es_revise_plan
         <set>
-            <if test="id != null and id != ''">
+            <if test="id != null">
                 id = #{id},
             </if>
-            <if test="esName != null and esName != ''">
+            <if test="esName != null">
                 es_name = #{esName},
             </if>
-            <if test="planStatus != null and planStatus != ''">
+            <if test="planStatus != null">
                 plan_status = #{planStatus},
             </if>
-            <if test="reviseStatus != null and reviseStatus != ''">
+            <if test="reviseStatus != null">
                 revise_status = #{reviseStatus},
             </if>
-            <if test="drafter != null and drafter != ''">
+            <if test="drafter != null">
                 drafter = #{drafter},
             </if>
-            <if test="resPerson != null and resPerson != ''">
+            <if test="resPerson != null">
                 res_person = #{resPerson},
             </if>
-            <if test="wgLeader != null and wgLeader != ''">
+            <if test="wgLeader != null">
                 wg_leader = #{wgLeader},
             </if>
             <if test="draftTime != null">
@@ -331,37 +331,37 @@
             <if test="releaseTime != null">
                 release_time = #{releaseTime},
             </if>
-            <if test="unit != null and unit != ''">
+            <if test="unit != null">
                 unit = #{unit},
             </if>
-            <if test="rqbJson != null and rqbJson != ''">
+            <if test="rqbJson != null">
                 rqb_json=#{rqbJson},
             </if>
-            <if test="tsJson != null and tsJson != ''">
+            <if test="tsJson != null">
                 ts_json=#{tsJson},
             </if>
-            <if test="area != null and area != ''">
+            <if test="area != null">
                 area=#{area},
             </if>
-            <if test="esMatingRelations != null and esMatingRelations != ''">
+            <if test="esMatingRelations != null">
                 es_mating_relations=#{esMatingRelations},
             </if>
-            <if test="esStandRelations != null and esStandRelations != ''">
+            <if test="esStandRelations != null">
                 es_stand_relations=#{esStandRelations},
             </if>
-            <if test="isRelate != null and isRelate != ''">
+            <if test="isRelate != null">
                 is_relate=#{isRelate},
             </if>
-            <if test="useLevel != null and useLevel != ''">
+            <if test="useLevel != null">
                 use_level=#{useLevel},
             </if>
-            <if test="technologic != null and technologic != ''">
+            <if test="technologic != null">
                 technologic=#{technologic},
             </if>
-            <if test="bussSort != null and bussSort != ''">
+            <if test="bussSort != null">
                 buss_sort=#{bussSort},
             </if>
-            <if test="lxd != null and lxd != ''">
+            <if test="lxd != null">
                 LXD=#{lxd},
             </if>
         </set>