统计修改

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyDmStatsDao.xml

@@ -78,17 +78,19 @@
         SELECT l.user_id AS uid, l.user_name AS uname, 1 AS leave_app, 0 AS leave_approve, 0 AS borrow_app, 0 AS inbound_cnt, COALESCE(l.duration,0) AS leave_duration
         FROM jl_key_dm_leave_application l
         <where>
+            AND l.is_used = 1 AND l.STATUS != 0
             <if test="start != null and start != ''">
-                    AND l.create_time &gt; #{start}
+                AND l.start_time &gt; #{start}
             </if>
             <if test="end != null and end != ''">
-                    AND l.create_time &lt; #{end}
+                AND l.start_time &lt; #{end}
             </if>
         </where>
         UNION ALL
         SELECT r.approver_id AS uid, r.approver_name AS uname, 0, CASE WHEN r.approver_result = 1 THEN 1 ELSE 0 END, 0, 0, 0
         FROM jl_key_dm_leave_approval_record r
         <where>
+            AND r.is_used = 1 AND r.STATUS = 2
             <if test="start != null and start != ''">
                 AND r.approver_time &gt; #{start}
             </if>
@@ -100,22 +102,24 @@
         SELECT b.applicant_id AS uid, b.applicant_name AS uname, 0, 0, 1, 0, 0
         FROM jl_key_dm_borrow_application b
         <where>
+            AND b.is_used = 1 AND b.approval_status != 0
             <if test="start != null and start != ''">
-                    AND b.create_time &gt; #{start}
+                AND b.submit_time &gt; #{start}
             </if>
             <if test="end != null and end != ''">
-                    AND b.create_time &lt; #{end}
+                AND b.submit_time &lt; #{end}
             </if>
         </where>
         UNION ALL
-            SELECT o.receiver_id AS uid, o.receiver_name AS uname, 0, 0, 0, 1, 0
-            FROM jl_key_dm_outbound_record o
+        SELECT ir.create_by AS uid, du.`name` AS uname, 0, 0, 0, 1, 0
+        FROM jl_key_dm_inbound_record ir LEFT JOIN jl_key_dm_user du on ir.create_by = du.id
         <where>
+            AND ir.is_used = 1
             <if test="start != null and start != ''">
-                    AND o.create_time &gt; #{start}
+                AND ir.create_time &gt; #{start}
             </if>
             <if test="end != null and end != ''">
-                    AND o.create_time &lt; #{end}
+                AND ir.create_time &lt; #{end}
             </if>
         </where>
         ) t
@@ -127,9 +131,9 @@
     <select id="selectWorkloadDetails" parameterType="map" resultType="map">
         <choose>
             <when test="type == 'leave'">
-                SELECT id, user_id, user_name, start_time, end_time, duration, reason FROM jl_key_dm_leave_application
+                SELECT id, user_id, user_name, start_time, end_time, duration, reason, `status` FROM jl_key_dm_leave_application
                 <where>
-                    AND user_id = #{user_id}
+                    AND user_id = #{user_id} AND STATUS != 0
                     <if test="start != null and start != ''">
                         AND create_time &gt; #{start}
                     </if>
@@ -140,19 +144,19 @@
                 ORDER BY create_time DESC
             </when>
             <when test="type == 'inventory'">
-                SELECT b.application_no, b.applicant_id, b.applicant_name, d.material_name, d.apply_quantity
+                SELECT b.application_no, b.applicant_id, b.applicant_name, d.material_name, b.approval_status, d.apply_quantity, d.returned_quantity,b.submit_time
                 FROM jl_key_dm_borrow_application_detail d
                 LEFT JOIN jl_key_dm_borrow_application b ON b.id = d.application_id
                 <where>
-                    b.applicant_id = #{user_id}
+                    AND b.is_used = 1 AND b.approval_status != 0 AND b.applicant_id = #{user_id}
                     <if test="start != null and start != ''">
-                        AND b.create_time &gt; #{start}
+                        AND b.submit_time &gt; #{start}
                     </if>
                     <if test="end != null and end != ''">
-                        AND b.create_time &lt; #{end}
+                        AND b.submit_time &lt; #{end}
                     </if>
                 </where>
-                ORDER BY b.create_time DESC
+                ORDER BY b.submit_time DESC
             </when>
             <otherwise>
                 SELECT 1 AS dummy