Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request !105

adc-da-slrs/pom.xml

@@ -23,6 +23,12 @@
             <version>3.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.adc</groupId>
+            <artifactId>adc-da-convert</artifactId>
+            <version>3.0.0</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>net.sf.json-lib</groupId>
             <artifactId>json-lib</artifactId>

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

@@ -102,6 +102,13 @@ public class SarBussionessStand extends BaseEntity {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modifyTime;
 
+    // 新添加字段
+    @ApiModelProperty(value = "文本状态")
+    @TableField("TEXT_STATUS_BUSS")
+    private String textStatusBuss;
+
+
+    // 非表字段
     @TableField(exist = false)
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private String firstPutTime;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java

@@ -18,7 +18,6 @@ public class SarItemVO extends BaseEntity {
     @ApiModelProperty(value = "主键")
     private String id;
 
-
     @ApiModelProperty(value = "标准ID")
     private String standId;
 
@@ -28,10 +27,10 @@ public class SarItemVO extends BaseEntity {
     @ApiModelProperty(value = "条款名称")
     private String itemsName;
 
-    @ApiModelProperty(value = "条款内容")
+    @ApiModelProperty(value = "条款内容(未使用)")
     private String itemsTitle;
 
-    @ApiModelProperty(value = "解读内容--条款要求")
+    @ApiModelProperty(value = "条款内容--条款要求")
     private String termsConditions;
 
     @ApiModelProperty(value = "新车实施日期")
@@ -64,4 +63,7 @@ public class SarItemVO extends BaseEntity {
 
     @ApiModelProperty(value = "文件类型")
     private String fileType;
+
+    @ApiModelProperty(value = "解读内容--核心技术要点")
+    private String interpretationContent;
 }

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -67,6 +67,7 @@
         <result column="compliance_state" property="complianceState"/>
         <result column="COMPLIANCE_REQUIR" property="complianceRequire"/>
         <result column="FILE_TYPE" property="fileType"/>
+        <result column="core_technical_requirement" property="interpretationContent"/>
     </resultMap>