From 8d7466b9d72ce8bea0fd428ddae687cd2655033a Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 12 Jan 2022 11:21:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=20=E6=9D=A1=E6=AC=BE?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slrs/sarStandWarning/entity/StandWarningEO.java   |  6 ++++++
 .../mapper/sarStandWarning/EarlyWraningEOMapper.xml   | 11 +++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java
index 26ebd22c..d073b263 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java
@@ -14,6 +14,12 @@ import java.util.Date;
 public class StandWarningEO extends EarlyWarningEO {
     private static final long serialVersionUID = 1L;
 
+    @ExcelProperty("条款内容")
+    @ApiModelProperty("条款内容")
+    private String termsConditions;
+
+
+
     @ExcelProperty("新车型实施日期")
     @ApiModelProperty("新车型实施日期")
     @DateTimeFormat(pattern = "YYYY-MM-dd")
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
index 67b70a24..c0cb29b4 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
@@ -15,6 +15,7 @@
         <result column="ITEMS_ID"        property="itemsId"></result>
         <result column="ITEMS_NUM"       property="itemsNum"></result>
         <result column="ITEMS_NAME"      property="itemsName"></result>
+        <result column="TERMS_CONDITIONS" property="termsConditions"></result>
         <result column="POLICY_ID"       property="policyId"></result>
         <result column="POLICY_NAME"     property="policyName"></result>
         <result column="MARK"            property="mark"></result>
@@ -102,7 +103,9 @@
         attr.CLLX AS APPLY_TYPE ,
         attr.ZRGCS AS DUTY_ENGINEER ,
         NULL AS ITEMS_ID ,
-        NULL AS ITEMS_NUM , NULL AS ITEMS_NAME ,
+        NULL AS ITEMS_NUM ,
+        NULL AS ITEMS_NAME ,
+        NULL AS TERMS_CONDITIONS,
         NULL AS POLICY_ID ,
         NULL AS POLICY_NAME ,
         MARK ,
@@ -140,6 +143,7 @@
         items.ID AS ITEMS_ID ,
         items.ITEMS_NUM ,
         items.ITEMS_NAME ,
+        items.TERMS_CONDITIONS,
         NULL AS POLICY_ID ,
         NULL AS POLICY_NAME ,
         MARK ,
@@ -195,7 +199,9 @@
         attr
         .ZRGCS AS DUTY_ENGINEER ,
         ITEMS_ID ,
-        NULL AS ITEMS_NUM , NULL AS ITEMS_NAME ,
+        NULL AS ITEMS_NUM ,
+        NULL AS ITEMS_NAME ,
+        NULL AS TERMS_CONDITIONS,
         NULL AS POLICY_ID ,
         NULL AS POLICY_NAME ,
         MARK ,
@@ -239,6 +245,7 @@
         	items.ID AS ITEMS_ID ,
         	items.ITEMS_NUM ,
         	items.ITEMS_NAME ,
+        	items.TERMS_CONDITIONS,
         	NULL AS POLICY_ID ,
         	NULL AS POLICY_NAME ,
         	MARK ,