Merge remote-tracking branch 'origin/master'

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

@@ -568,7 +568,7 @@
             m.material_name,
             SUM(bd.apply_quantity) as total_quantity
         FROM jl_key_dm_material m
-        LEFT JOIN jl_key_dm_borrow_detail bd ON bd.material_id = m.id
+        LEFT JOIN jl_key_dm_borrow_application_detail bd ON bd.material_id = m.id
         LEFT JOIN jl_key_dm_borrow_application ba ON ba.id = bd.application_id AND ba.is_used = 1
             AND DATE_FORMAT(ba.create_time, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m')
         WHERE m.is_used = 1
@@ -791,7 +791,7 @@
 
     <!-- 工作量统计：合并多表数据后按人员统计 -->
     <select id="selectWorkloadStats" parameterType="map" resultType="map">
-        SELECT uid AS user_id, uname AS user_name,
+        SELECT uid AS user_id, uname AS user_name, o.name AS depName, o.grade,
         SUM(leave_app) AS leave_applications,
         SUM(leave_approve) AS leave_approvals,
         SUM(borrow_app) AS borrow_applications,
@@ -845,9 +845,9 @@
                 AND ir.create_time &lt; #{end}
             </if>
         </where>
-        ) t
-        GROUP BY uid, uname
-        ORDER BY leave_applications DESC, borrow_applications DESC
+        ) t LEFT JOIN jl_key_dm_user u on t.uid=u.id LEFT JOIN sys_office o on u.office_id=o.id
+        GROUP BY t.uid, t.uname, o.name, o.grade, o.sort
+        ORDER BY o.grade, o.sort, leave_applications DESC, borrow_applications DESC
     </select>
 
     <!-- 工作量明细：按类型返回对应明细 -->

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

@@ -223,6 +223,9 @@
             <if test="params.round == '1'.toString()">
                 AND (u.office_id = #{params.parentId} or o.area_id = #{params.areaId} or o.parent_ids LIKE CONCAT(#{params.parentIds}, '%') )
             </if>
+            <if test="params.round == '1'.toString() and params.curId != '' and params.curPids != ''">
+                AND (o.area_id = #{params.curId} or o.parent_ids LIKE CONCAT(#{params.curPids}, '%') )
+            </if>
             <if test="params.round == '2'.toString()">
                 AND o.area_id = #{params.areaId}
             </if>