Browse Source

学习时长统计排序跨页重复

lamphua 3 months ago
parent
commit
fcf3de9d0c

+ 1
- 1
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcStudyMapper.xml View File

66
             <if test="deptId != null "> and t.dept_id = #{deptId}</if>
66
             <if test="deptId != null "> and t.dept_id = #{deptId}</if>
67
             <if test="lastTime != null "> and YEAR(t.last_time) = YEAR(#{lastTime})</if>
67
             <if test="lastTime != null "> and YEAR(t.last_time) = YEAR(#{lastTime})</if>
68
         </where>
68
         </where>
69
-        order by t.get_hours desc
69
+        order by t.get_hours desc, user_id
70
     </select>
70
     </select>
71
 
71
 
72
     <select id="selectCmcStudyByStudyId" parameterType="Integer" resultMap="CmcStudyResult">
72
     <select id="selectCmcStudyByStudyId" parameterType="Integer" resultMap="CmcStudyResult">

+ 3
- 3
oa-ui/src/views/flowable/task/myProcess/index.vue View File

1
 <!--
1
 <!--
2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-01-03 09:23:11
3
  * @Date: 2024-01-03 09:23:11
4
- * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2025-05-14 15:41:49
4
+ * @LastEditors: wrh
5
+ * @LastEditTime: 2025-05-21 14:27:45
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="app-container">
8
   <div class="app-container">
306
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
306
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
307
       getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
307
       getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
308
         let data = res.data;
308
         let data = res.data;
309
-        debugger
309
+        // debugger
310
         if (data.dataType === 'dynamic' && row.name != '项目预算') {
310
         if (data.dataType === 'dynamic' && row.name != '项目预算') {
311
           if (data.type === 'assignee') { // 指定人员
311
           if (data.type === 'assignee') { // 指定人员
312
             this.checkSendUser = true;
312
             this.checkSendUser = true;

Loading…
Cancel
Save