学习记录时长统计加上参培时长

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcStudyMapper.xml

@@ -56,17 +56,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectCmcStudyStatistic" parameterType="CmcStudy" resultMap="CmcStudyResult">
-        select * from
-        (select  u.user_id, u.dept_id, u.nick_name, d.dept_name, sum(s.get_hours) as get_hours, u.status, s.last_time from sys_user as u
+        select t.user_id, t.dept_id, t.nick_name, t.dept_name, sum(t.get_hours) as get_hours, t.status, t.last_time from
+        (select t1.* from (select  u.user_id, u.dept_id, u.nick_name, d.dept_name, sum(s.get_hours) as get_hours, u.status, s.last_time as last_time from sys_user as u
         left join cmc_study as s on u.user_id = s.user_id
         left join sys_dept as d on d.dept_id = u.dept_id
-        group by u.user_id) as t
         <where>
-            t.status = '0' and t.user_id != 1
-            <if test="deptId != null "> and t.dept_id = #{deptId}</if>
-            <if test="lastTime != null "> and YEAR(t.last_time) = YEAR(#{lastTime})</if>
+            u.status = '0' and u.user_id != 1
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            <if test="lastTime != null "> and YEAR(s.last_time) = YEAR(#{lastTime})</if>
+        </where>
+        group by u.user_id) as t1
+        union
+        select t2.* from (select u.user_id, u.dept_id, u.nick_name, d.dept_name, sum(ta.hours) as get_hours, u.status, ta.dept_time as last_time from sys_user as u
+        left join cmc_train_approval as ta on ta.user_id = u.user_id
+        left join sys_dept as d on d.dept_id = u.dept_id
+        <where>
+            u.status = '0' and u.user_id != 1 and ta.dept_time is not null
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            <if test="lastTime != null "> and YEAR(ta.dept_time) = YEAR(#{lastTime})</if>
         </where>
-        order by t.get_hours desc, user_id
+        group by u.user_id) as t2) as t
+        group by t.user_id
+        order by get_hours desc, user_id
     </select>
 
     <select id="selectCmcStudyByStudyId" parameterType="Integer" resultMap="CmcStudyResult">

oa-ui/src/views/flowable/form/oa/carForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-04-15 10:27:30
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-06-23 09:35:51
 -->
 
 <template>
@@ -212,7 +212,7 @@
               <el-form-item label="车牌号：" prop="cars">
                 <el-checkbox-group v-model="form.cars" :disabled="taskName != '安排用车'">
                   <el-checkbox :disabled="item.status == 1 ? false : true" :label="item.carId" v-for="item in carList"
-                    :key="item.carId" :value="item.carId" v-if="item.remark == null">
+                    :key="item.carId" :value="item.carId">
                     {{ item.licensePlate + (item.brand ? item.brand : '') + (item.series ? item.series : '') }}
                   </el-checkbox>
                 </el-checkbox-group>