对实施日期进行预警.更新对条款的预警,加入使用车型和责任工程师

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml

@@ -11,6 +11,7 @@
         <result column="STAND_YEAR" property="standYear"/>
         <result column="XCXSSRQ" property="XCXSSRQ"/>
         <result column="ZCCSSRQ" property="ZCCSSRQ"/>
+        <result column="SSRQ"  property="SSRQ"/>
         <result column="CLLX" property="applyType" />
         <result column="STAND_TYPE" property="standType" />
         <result column="ZRGCS" property="dutyEngineer" />
@@ -27,6 +28,7 @@
         info.STAND_TYPE,
         attrInfo.CLLX,
         attrInfo.ZRGCS,
+        attrInfo.SSRQ,
         attrInfo.${str}
         FROM
         sar_standards_info AS info
@@ -35,9 +37,11 @@
             1=1
             <if test="date!=null">
                 and
+                attrInfo.SSRQ
+                BETWEEN #{date.startDate} and  #{date.endDate}
+                or
                 attrInfo.${str}
-                BETWEEN DATE_FORMAT( #{date.startDate},'%Y-%m-%d %H:%i:%s')
-                and DATE_FORMAT( #{date.endDate},'%Y-%m-%d %H:%i:%s')
+                BETWEEN #{date.startDate} and  #{date.endDate}
             </if>
         </where>
 

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml

@@ -20,22 +20,23 @@
     <select id="selectWithinTerm" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
         SELECT
             items.ID,
-            STAND_ID,
-            ITEMS_NUM,
-            ITEMS_NAME,
-            TERMS_CONDITIONS,
-            DUTY_ENGINEER,
-            APPLY_ARCTIC,
+            items.ITEMS_NUM,
+            items.ITEMS_NAME,
+            items.TERMS_CONDITIONS,
+            items.DUTY_ENGINEER,
+            items.STAND_ID,
             info.STAND_TYPE,
             info.STAND_NUMBER,
-
-            ${str}
+            attrInfo.CLLX,
+            attrInfo.ZRGCS,
+            items.${str}
         FROM
 	        sar_stand_items AS items
         JOIN sar_standards_info AS info ON items.STAND_ID=info.ID
+        JOIN sar_stand_attr_info AS attrInfo ON info.id = attrinfo.stand_id
 
             WHERE
-              ${str} BETWEEN #{date.startDate} and  #{date.endDate}
+               items.${str} BETWEEN #{date.startDate} and  #{date.endDate}
     </select>
 
 </mapper>