Merge branch 'develop_3' into 'develop_master'

企标库 ,代替标准号

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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java

@@ -124,6 +124,11 @@ public class SarBussionessStand extends BaseEntity {
     @TableField(exist = false)
     private String newStandSn;
 
+    /**
+     * 代替企标标准号
+     */
+    @TableField(exist = false)
+    private String DTQBBHBUSS;
 
     @TableField(exist = false)
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -22,6 +22,7 @@
         <result column="stand_year" property="standYear" />
         <result column="text_status_buss" property="textStatusBuss" />
         <result column="text_status_buss_show" property="textStatusBussShow"/>
+        <result column="DTQBBHBUSS" property="DTQBBHBUSS"/>
     </resultMap>
 
     <resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
@@ -672,7 +673,7 @@
         select * from
         (select tmp_tb.*  from
         (select
-        dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,
+        dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,SAR_BUSS_STAND_ATTR_INFO.DTQBBHBUSS,
         <include refid="Base_Column_List_show" />
         from SAR_BUSSIONESS_STAND
         <include refid="SarBussionInfo_Where_Clause"/>