Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, plan lxd

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

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

@@ -122,5 +122,7 @@ public class EsRevisePlan extends BasePage {
     @TableField(exist = false)
     private List<String> planStatusList;
 
-
+    @ApiModelProperty(value = "立项单")
+    @TableField("LXD")
+    private String lxd;
 }

adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml

@@ -75,6 +75,7 @@
         <result property="useLevel" column="use_level"/>
         <result property="technologic" column="technologic"/>
         <result property="bussSort" column="buss_sort"/>
+        <result property="lxd" column="LXD"/>
     </resultMap>
     <!--    查询条件-->
     <sql id="Conditions">
@@ -140,6 +141,7 @@
         es_revise_plan.use_level,
         es_revise_plan.technologic,
         es_revise_plan.buss_sort,
+        es_revise_plan.LXD,
         sar_bussioness_stand.STAND_CODE as rqbName,
         sar_bussioness_stand.STAND_SORT as standType,
         (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,
@@ -208,6 +210,7 @@
         es_revise_plan.use_level,
         es_revise_plan.technologic,
         es_revise_plan.buss_sort,
+        es_revise_plan.LXD,
         sar_bussioness_stand.STAND_CODE as rqbName,
         sar_bussioness_stand.STAND_SORT as standType,
         sar_bussioness_stand.stand_number as standNum,
@@ -280,6 +283,7 @@
         es_revise_plan.use_level,
         es_revise_plan.technologic,
         es_revise_plan.buss_sort,
+        es_revise_plan.LXD,
         sar_bussioness_stand.STAND_CODE as rqbName,
         sar_bussioness_stand.STAND_SORT as standType,
         (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,
@@ -354,6 +358,9 @@
             <if test="bussSort != null and bussSort != ''">
                 buss_sort=#{bussSort},
             </if>
+            <if test="lxd != null and lxd != ''">
+                LXD=#{lxd},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -418,6 +425,9 @@
             <if test="bussSort != null and bussSort != ''">
                 buss_sort,
             </if>
+            <if test="lxd != null and lxd != ''">
+                LXD,
+            </if>
         </trim>
         values
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -478,6 +488,9 @@
             <if test="bussSort != null and bussSort != ''">
                 #{bussSort},
             </if>
+            <if test="lxd != null and lxd != ''">
+                #{lxd},
+            </if>
         </trim>
     </insert>
     <!--    删除-->
@@ -513,6 +526,7 @@
         es_revise_plan.use_level,
         es_revise_plan.technologic,
         es_revise_plan.buss_sort,
+        es_revise_plan.LXD,
         sar_bussioness_stand.STAND_CODE as rqbName,
         sar_bussioness_stand.STAND_SORT as standType,
         (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,