Administrator 1 рік тому
батько
коміт
e112bfc1d0

+ 4 - 4
ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordLeave.java

@@ -25,13 +25,13 @@ public class RecordLeave extends BaseEntity
     private String type;
 
     /** 请假开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @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")
     private Date startTime;
 
     /** 请假结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @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")
     private Date endTime;
 
     /** 请假理由 */

+ 1 - 0
ruoyi-system/src/main/resources/mapper/system/RecordLeaveMapper.xml

@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="photo != null  and photo != ''"> and photo = #{photo}</if>
             <if test="submitTime != null "> and submit_time = #{submitTime}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectRecordLeaveById" parameterType="Long" resultMap="RecordLeaveResult">