修改学习记录，新增学习情况和排行模块；

修改借款表单里远程访问借款项目

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

@@ -57,13 +57,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <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 from sys_user as u
+        (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
         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'
+            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>
         </where>
         order by t.get_hours desc
     </select>

oa-ui/src/api/oa/study/myStudy.js

@@ -1,8 +1,8 @@
 /*
  * @Author: ysh
  * @Date: 2025-03-06 15:40:47
- * @LastEditors: 
- * @LastEditTime: 2025-03-06 15:40:53
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-03-13 17:09:09
  */
 import request from '@/utils/request'
 
@@ -14,6 +14,14 @@ export function listStudy(query) {
     params: query
   })
 }
+// 查询cmc学习记录统计
+export function getStudyStatistic(query) {
+  return request({
+    url: '/oa/study/statistic',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询cmc学习记录详细
 export function getStudy(studyId) {

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -46,17 +46,17 @@
             <el-button type="primary" size="mini" @click="openProject = true" v-if="taskName == '借款申请'">选择项目</el-button>
             <el-descriptions border v-if="isSelect" style="margin-top: .125rem;" :column="1">
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
                 chooseProject.projectLeaderUser.nickName : ''
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">
                 <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
               </el-descriptions-item>
               <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <!-- <el-form-item label="借款明细"> -->
@@ -80,7 +80,9 @@
                 {{ index + 1 }}
               </td>
               <td>
-                <el-input v-model="detail.borrowItem" type="textarea" :disabled="taskName != '借款申请'"></el-input>
+                <!-- <el-input v-model="detail.borrowItem" type="textarea" :disabled="taskName != '借款申请'"></el-input> -->
+                <el-autocomplete v-model="detail.borrowItem" :fetch-suggestions="querySearchAsync" placeholder="请输入内容"
+                  :disabled="taskName != '借款申请'"></el-autocomplete>
               </td>
               <td>
                 <el-input v-model="detail.unit" :disabled="taskName != '借款申请'"></el-input>
@@ -128,7 +130,7 @@
               <el-form-item label="申请金额" prop="applyAmount">
                 <el-input v-model="form.applyAmount" placeholder="请输入申请金额" :disabled="taskName != '借款申请'" />
                 <span style="color:#E74C3C" v-if="exceed && form.borrowUsage == 0">超过预算金额：{{ getMoreAmount('0')
-                  }}</span>
+                }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12" :xs="24">
@@ -419,6 +421,7 @@ export default {
       printOpen: false,
       showAlter: true,
       returnOpen: false,
+      borrowItemList: []
     };
   },
   created() {
@@ -471,9 +474,6 @@ export default {
     this.initForm();
   },
   methods: {
-    initSign() {
-
-    },
     initRules() {
       if (this.taskName == '借款申请') {
         this.rules = {
@@ -528,6 +528,14 @@ export default {
           this.detailList = res.rows
         }
       });
+      listBorrowDetail({ pageSize: 9999 }).then(res => {
+        let oArray = res.rows.map(item => item.borrowItem).filter(item => item != null);
+        let originalArray = [...new Set(oArray)]
+        this.borrowItemList = originalArray.map((item) => ({
+          value: item,      // 去除字符串前后空格
+          label: item, // 转大写
+        }));
+      })
       getBorrow(this.taskForm.formId).then(res => {
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
@@ -959,6 +967,16 @@ export default {
       } else if (this.taskName == '财务处理') {
         return this.form.cwComment
       }
+    },
+    querySearchAsync(queryString, cb) {
+      let borrowItemList = this.borrowItemList;
+      let results = queryString ? borrowItemList.filter(this.createFilter(queryString)) : borrowItemList;
+      cb(results)
+    },
+    createFilter(queryString) {
+      return (borrowItem) => {
+        return (borrowItem.value.indexOf(queryString) === 0);
+      };
     }
   }
 };

oa-ui/src/views/oa/study/record.vue

@@ -2,61 +2,49 @@
  * @Author: ysh
  * @Date: 2025-03-12 10:06:03
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-13 16:20:48
+ * @LastEditTime: 2025-03-14 15:36:05
 -->
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="资料名称" prop="title">
-        <el-input v-model="queryParams.title" placeholder="请输入资料名称" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="类型" prop="title">
-        <el-select v-model="queryParams.type" @change="handleQuery" clearable>
-          <el-option label="视频" value="视频"></el-option>
-          <el-option label="文档" value="文档"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="姓名" prop="userId">
-        <el-select v-model="queryParams.userId" clearable filterable placeholder="请输入姓名" style="width: 160px"
-          @change="handleQuery">
-          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
-            :value="item.userId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="学习年份" prop="lastTime" label-width="100px">
-        <el-date-picker clearable v-model="queryParams.lastTime" type="year" value-format="yyyy-MM-dd"
-          placeholder="请选择学习年份" @change="handleQuery">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['oa:study:add']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['oa:study:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['oa:study:remove']">删除</el-button>
-      </el-col> -->
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['oa:study:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
     <el-row>
-      <el-col :span="14" class="left">
-        <el-table v-loading="loading" :data="studyList" @selection-change="handleSelectionChange">
+      <el-col :span="12">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="68px">
+          <el-form-item label="资料名称" prop="title">
+            <el-input v-model="queryParams.title" placeholder="请输入资料名称" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="类型" prop="title">
+            <el-select v-model="queryParams.type" @change="handleQuery" clearable>
+              <el-option label="视频" value="视频"></el-option>
+              <el-option label="文档" value="文档"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="姓名" prop="userId">
+            <el-select v-model="queryParams.userId" clearable filterable placeholder="请输入姓名" style="width: 160px"
+              @change="handleQuery">
+              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+                :value="item.userId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="学习年份" prop="lastTime">
+            <el-date-picker clearable v-model="queryParams.lastTime" type="year" value-format="yyyy-MM-dd"
+              placeholder="请选择学习年份" @change="handleQuery">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+              v-hasPermi="['oa:study:export']">导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-table v-loading="loading" :data="studyList">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column type="index" label="序号" width="55" align="center" />
           <!-- <el-table-column label="学习id" align="center" prop="studyId" /> -->
@@ -75,56 +63,60 @@
             </template>
           </el-table-column>
           <el-table-column label="已获学时" align="center" prop="getHours" />
-          <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                v-hasPermi="['oa:study:edit']">修改</el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['oa:study:remove']">删除</el-button>
-            </template>
-          </el-table-column> -->
         </el-table>
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" />
       </el-col>
-      <el-col :span="10">
-        
+      <el-col :span="12">
+        <div>
+          <el-row>
+            <el-col :span="12" class=" left">
+              <h2 class="text-center">部门学习情况</h2>
+              <el-tree :data="deptTree" :props="treeProps" node-key="$treeNodeId" :expand-on-click-node="false">
+                <div slot-scope="{ node, data }" class="custom-tree-node">
+                  <!-- 部门节点 -->
+                  <span v-if="data.type === 'department'">
+                    <!-- <i class="el-icon-office-building"></i> -->
+                    {{ data.deptName }}
+                    <span class="total-hours">(总学时：{{ data.totalHours }}h)</span>
+                  </span>
+                  <!-- 人员节点 -->
+                  <span v-else class="user-node">
+                    <i class="el-icon-user"></i>
+                    {{ `${data.user.nickName} (学时：${data.getHours}h)` }}
+                  </span>
+                </div>
+              </el-tree>
+            </el-col>
+            <el-col :span="12" class="left">
+              <div class="text-right">
+                <el-date-picker clearable v-model="rankParams.lastTime" type="year" value-format="yyyy-MM-dd"
+                  placeholder="请选择学习年份" @change="getListByYear()">
+                </el-date-picker>
+              </div>
+              <h2 class="text-center">学习排名</h2>
+              <el-table v-loading="rankLoading" :data="rankList">
+                <el-table-column prop="rankIndex" label="排名" />
+                <el-table-column prop="user.nickName" label="姓名" />
+                <el-table-column prop="getHours" label="总学时" />
+              </el-table>
+              <div class="mt20 text-right">
+                <el-pagination layout="prev, pager, next" :total="rankTotal" :current-page.sync="rankParams.pageNum"
+                  @current-change="getRankList">
+                </el-pagination>
+              </div>
+
+            </el-col>
+          </el-row>
+        </div>
       </el-col>
     </el-row>
-
-
-
-
-    <!-- 添加或修改cmc学习记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="学习资料id" prop="resourceId">
-          <el-input v-model="form.resourceId" placeholder="请输入学习资料id" />
-        </el-form-item>
-        <el-form-item label="用户id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户id" />
-        </el-form-item>
-        <el-form-item label="上次位置" prop="lastPoint">
-          <el-input v-model="form.lastPoint" placeholder="请输入上次位置" />
-        </el-form-item>
-        <el-form-item label="上次时间" prop="lastTime">
-          <el-date-picker clearable v-model="form.lastTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择上次时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="可获学时" prop="getHours">
-          <el-input v-model="form.getHours" placeholder="请输入可获学时" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listStudy, getStudy, delStudy, addStudy, updateStudy } from "@/api/oa/study/myStudy";
+import { listStudy, getStudy, delStudy, addStudy, updateStudy, getStudyStatistic } from "@/api/oa/study/myStudy";
+import { listDept } from '@/api/system/dept'
 
 export default {
   name: "Study",
@@ -132,22 +124,12 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
       total: 0,
       // cmc学习记录表格数据
       studyList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -162,11 +144,32 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      rankList: [], //排行列表
+      rankLoading: true,
+      rankTotal: 0,
+      rankParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      deptRankList: [], //部门排行列表
+      deptRankLoading: true,
+      deptRankTotal: 0,
+      deptRankParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      deptTree: [],
+      treeProps: {
+        children: 'children',
+        label: 'deptName' // 默认label字段，实际使用插槽自定义
+      },
     };
   },
   created() {
     this.getList();
+    this.getRankList();
+    this.getDeptRankList();
   },
   methods: {
     /** 查询cmc学习记录列表 */
@@ -178,10 +181,35 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
+    getRankList() {
+      this.rankLoading = true;
+      getStudyStatistic(this.rankParams).then(res => {
+        this.rankList = res.rows.map((item, index) => ({
+          ...item,
+          getHours: item.getHours ? item.getHours : 0,
+          rankIndex: (this.rankParams.pageNum - 1) * this.rankParams.pageSize + index + 1
+        }));
+        this.rankTotal = res.total;
+        this.rankLoading = false;
+      })
+    },
+    async getDeptRankList() {
+      this.deptRankParams.pageSize = 300
+      this.deptRankParams.lastTime = this.rankParams.lastTime
+      let res = await getStudyStatistic(this.deptRankParams)
+      let userList = res.rows.map((item, index) => ({
+        ...item,
+        getHours: item.getHours ? item.getHours : 0,
+        rankIndex: index + 1
+      }));
+      let deptRes = await listDept();
+      let deptList = deptRes.data.filter(dept => dept.deptId != 100);
+      this.deptTree = this.buildDeptTree(deptList, userList);
+      console.log(this.deptTree);
+    },
+    getListByYear() {
+      this.getRankList();
+      this.getDeptRankList();
     },
     // 表单重置
     reset() {
@@ -205,65 +233,12 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.studyId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc学习记录";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const studyId = row.studyId || this.ids
-      getStudy(studyId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc学习记录";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.studyId != null) {
-            updateStudy(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addStudy(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const studyIds = row.studyId || this.ids;
-      this.$modal.confirm('是否确认删除cmc学习记录编号为"' + studyIds + '"的数据项？').then(function () {
-        return delStudy(studyIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('oa/study/export', {
         ...this.queryParams
       }, `study_${new Date().getTime()}.xlsx`)
     },
-
     formatStatus(row) {
       if (!row) {
         row = 0
@@ -279,6 +254,36 @@ export default {
         return 'success'
       }
     },
+    buildDeptTree(deptObjList, recordList) {
+      // 1. 创建部门映射表（使用Map提高查询效率）
+      const deptMap = new Map();
+      // 初始化部门节点并存入Map
+      deptObjList.forEach(dept => {
+        deptMap.set(dept.deptId, {
+          ...dept,                  // 展开原有属性
+          children: [],             // 存放子节点（人员）
+          totalHours: 0,            // 学习时长合计
+          type: 'department'        // 添加类型标识（可选）
+        });
+      });
+      // 2. 处理学习记录
+      recordList.forEach(record => {
+        const dept = deptMap.get(record.deptId);
+        if (dept) {
+          // 构造人员节点
+          const userNode = {
+            ...record,              // 展开记录属性
+            type: 'user'            // 添加类型标识（可选）
+          };
+          // 添加人员到部门子节点
+          dept.children.push(userNode);
+          // 累加学习时长
+          dept.totalHours += record.getHours || 0;
+        }
+      });
+      // 3. 将Map转换为数组
+      return Array.from(deptMap.values());
+    }
   }
 };
 </script>
@@ -287,4 +292,42 @@ export default {
   padding: 10px;
   border-right: 1px solid #ececec;
 }
+
+.dept-tree-container {
+  padding: 10px;
+}
+
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  padding: 2px 0;
+
+  .el-icon-office-building {
+    color: #409EFF;
+    margin-right: 5px;
+  }
+
+  .el-icon-user {
+    color: #67C23A;
+    margin-right: 5px;
+  }
+
+  .total-hours {
+    color: #909399;
+    font-size: 12px;
+    margin-left: 10px;
+  }
+
+  .user-node {
+    color: #606266;
+  }
+}
+
+/* 调整树节点缩进 */
+::v-deep .el-tree-node__content {
+  height: auto;
+  padding: 2px 0;
+}
 </style>