Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/resources/mapper/maintenance/MaintenanceRecordMapper.xml

@@ -144,10 +144,10 @@
             AND <![CDATA[ date_format(mr.work_date, '%Y-%m-%d') = #{request.currentTime}]]>
         </if>
         <if test="request.beginTime!=null">
-            AND <![CDATA[ mr.work_date >= #{request.beginTime}]]>
+            AND <![CDATA[ date_format(mr.work_date, '%Y-%m-%d') >= #{request.beginTime}]]>
         </if>
         <if test="request.endTime!=null">
-            AND <![CDATA[ mr.work_date <= #{request.endTime}]]>
+            AND <![CDATA[ date_format(mr.work_date, '%Y-%m-%d') <= #{request.endTime}]]>
         </if>
 	</select>
 
@@ -179,10 +179,10 @@
             <otherwise/>
         </choose>
         <if test="request.beginTime!=null">
-            AND <![CDATA[ mr.work_date >= #{request.beginTime}]]>
+            AND <![CDATA[ date_format(mr.work_date, '%Y-%m-%d') >= #{request.beginTime}]]>
         </if>
         <if test="request.endTime!=null">
-            AND <![CDATA[ mr.work_date <= #{request.endTime}]]>
+            AND <![CDATA[ date_format(mr.work_date, '%Y-%m-%d') <= #{request.endTime}]]>
         </if>
         GROUP BY planDate,
         status