3.20优化

ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml

@@ -143,6 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             a.entry_time,
             a.leave_time,
+            a.id as recruitApplyId,
             b.*,
             c.task_name,
             c.task_address,

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

@@ -50,6 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="req.types != 2">
                 a.status = #{req.types} and
             </if>
+            <if test="req.recruitId != null and req.recruitId != 0">
+                a.recruit_id = #{req.recruitId} and
+            </if>
             a.del_flag = 0
         ORDER BY
             a.id DESC

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

@@ -34,8 +34,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             wgz_leave a
                 LEFT JOIN bgt_user b ON (a.auditor_user_id = b.user_id and b.del_flag = 0)
-        WHERE
-            a.del_flag = 0
+        <where>
+            a.user_id = #{req.userId}
+            and a.del_flag = 0
+            <if test="req.recruitId != null and req.recruitId != 0">
+                and a.recruit_id = #{req.recruitId}
+            </if>
+            <if test="req.rq != null">
+                and DATE_FORMAT(a.create_time,'%Y-%m-%d') = #{req.rq}
+            </if>
+        </where>
         ORDER BY
             a.id DESC
     </select>

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

@@ -118,19 +118,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             wgz_pay_calculation_files f ON w.id = f.calculation_id
         <where>
             <choose>
-                <when test="page.auditorType != null and taskId != '' and auditorType == '0'">
+                <when test="req.auditorType != null and req.auditorType == 0">
                     AND w.auditor_type in ('0', '1') and
                 </when>
-                <when test="page.auditorType != null and taskId != '' and auditorType == '1'">
+                <when test="req.auditorType != null and req.auditorType == 1">
                     AND w.auditor_type = '2' and
                 </when>
-                <when test="page.auditorType != null and taskId != '' and auditorType == '2'">
+                <when test="req.auditorType != null and req.auditorType == 2">
                     AND w.auditor_type = '3' and
                 </when>
-                <when test="page.auditorType != null and taskId != '' and auditorType == '2'">
-                    AND w.auditor_type = in ('0', '1','3') and
-                </when>
             </choose>
+            w.user_id = #{req.userId} and
             w.del_flag = 0
         </where>
     </select>