Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -916,12 +916,6 @@
                 AND date_format(wlesa.create_date,'%y-%m')=date_format(date_sub(curdate(), interval 1
                 month),'%y-%m') <!--上月-->
             </if>
-
-            <if test='dto.startDate != null and dto.startDate != "" and dto.endDate  != null and dto.endDate != ""'>
-                AND DATE_FORMAT(wlesa.create_date, '%Y-%m-%d' ) <![CDATA[>=]]>  DATE_FORMAT(#{dto.startDate}, '%Y-%m-%d' )
-                AND DATE_FORMAT(wlesa.create_date, '%Y-%m-%d' ) <![CDATA[<=]]>  DATE_FORMAT(#{dto.endDate}, '%Y-%m-%d' )
-            </if>
-
             <if test="dto.isFirm == 'yes'">
                 and wlesal.confirm_type <![CDATA[<>]]> ''
             </if>
@@ -954,6 +948,9 @@
             <if test="dto.fireEquipmentCode != null">
                 and d.fireEquipmentCode like CONCAT('%', #{dto.fireEquipmentCode}, '%' )
             </if>
+            <if test='dto.startDate != null and dto.startDate != "" and dto.endDate  != null and dto.endDate != ""'>
+                DATE_FORMAT(d.createDate, '%Y-%m-%d' ) BETWEEN DATE_FORMAT(#{dto.startDate}, '%Y-%m-%d' ) and DATE_FORMAT(#{dto.endDate}, '%Y-%m-%d' )
+            </if>
         </where>
         ORDER BY
         d.createDate DESC