在开关阀时刷卡记录中添加用户余额;修改刷卡记录中的刷卡时间格式;刷卡记录倒序

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgCardSwipeRecords.java

@@ -54,8 +54,8 @@ public class NgCardSwipeRecords extends BaseEntity
     private Long deptId;
 
     /** 刷卡时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
-    @Excel(name = "刷卡时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "刷卡时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("刷卡时间")
     private Date cardSwipeTime;
 

fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/NgCardSwipeRecordsMapper.xml

@@ -40,6 +40,7 @@
             <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
         </where>
+        ORDER BY card_swipe_time DESC
     </select>
 
     <select id="selectNgCardSwipeRecordsUserList" parameterType="NgCardSwipeRecords" resultMap="NgCardSwipeRecordsResult">