完成日报模块

ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml

@@ -20,7 +20,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="auditorType" column="auditor_type"/>
         <result property="auditorOpinion" column="auditor_opinion"/>
         <result property="auditorTime" column="auditor_time"/>
-        <result property="exceptionType" column="exception_type"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -29,5 +28,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
     </resultMap>
 
+    <select id="userDailyRecordListPage" resultType="com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes">
+        SELECT
+            a.id,
+            a.recruit_id,
+            a.user_id,
+            b.username,
+            b.avatar_name,
+            a.dily_time,
+            a.finish_today,
+            a.auditor_type
+        FROM
+            wgz_daily_clock a
+                LEFT JOIN bgt_user b ON (a.user_id = b.user_id and b.del_flag = 0)
+        WHERE
+            a.del_flag = 0
+        ORDER BY
+            a.id DESC
+    </select>
+
 
 </mapper>

ruoyi-system/src/main/resources/mapper/wgz/WgzLeaveMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             a.*,
             b.username,
-            b.avatar_name as avatarName
+            b.avatar_name
         FROM
             wgz_leave a
                 LEFT JOIN bgt_user b ON (a.auditor_user_id = b.user_id and b.del_flag = 0)