From 44ba80e050dc42d8673d30e9320ed9e2c97c5554 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 16 Sep 2021 10:48:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6,=E6=9D=A1=E6=AC=BE=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E6=98=BE=E7=A4=BA=E4=B8=BAnull?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/sarStandWarning/SarStandardItem.xml      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml
index a6a1d552..18a45507 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml
@@ -8,13 +8,15 @@
         <result column="STAND_ID" property="standId"/>
         <result column="ITEMS_NAME" property="itemsName"/>
         <result column="ITEMS_NUM" property="itemsNum"/>
-        <result column="STAND_NUMBER" property="standCode"/>
+        <result column="STAND_NUMBER" property="standNum"/>
         <result column="STAND_NAME" property="standName"/>
         <result column="XCXSSRQ" property="XCXSSRQ"/>
         <result column="ZCCSSRQ" property="ZCCSSRQ"/>
         <result column="CLLX" property="applyType"/>
         <result column="STAND_TYPE" property="standType"/>
         <result column="DUTY_ENGINEER" property="dutyEngineer"/>
+        <result column="STAND_SORT" property="standSort"/>
+        <result column="STAND_YEAR" property="standYear"/>
     </resultMap>
     <!-- 查询条件 -->
     <select id="selectWithinTerm" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
@@ -25,6 +27,8 @@
             items.TERMS_CONDITIONS,
             items.DUTY_ENGINEER,
             items.STAND_ID,
+            info.STAND_SORT,
+            info.STAND_YEAR,
             info.STAND_NAME,
             info.STAND_TYPE,
             info.STAND_NUMBER,