网页端：修改我的学习页面，新增添加参培记录和查看参培记录；修改借款的最大借款额；

移动端：修改我的流程里查看表单信息

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcResource.java

@@ -59,7 +59,7 @@ public class CmcResource extends BaseEntity
 
     /** 学习时长 */
     @Excel(name = "学习时长")
-    private Long hours;
+    private Double hours;
 
     public void setResourceId(Integer resourceId) 
     {
@@ -142,12 +142,12 @@ public class CmcResource extends BaseEntity
     {
         return uploadTime;
     }
-    public void setHours(Long hours) 
+    public void setHours(Double hours)
     {
         this.hours = hours;
     }
 
-    public Long getHours() 
+    public Double getHours()
     {
         return hours;
     }

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

@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="userId != null "> and ta.user_id = #{userId}</if>
             <if test="deptId != null "> and ta.dept_id = #{deptId}</if>
-            <if test="reportTime != null "> and ta.report_time = #{reportTime}</if>
+            <if test="reportTime != null "> and YEAR(ta.report_time) = YEAR(#{reportTime})</if>
             <if test="trainName != null  and trainName != ''"> and ta.train_name like concat('%', #{trainName}, '%')</if>
             <if test="content != null  and content != ''"> and ta.content = #{content}</if>
             <if test="document != null  and document != ''"> and ta.document = #{document}</if>

oa-ui-app/pages/components/flowable/FlowRecord.vue

@@ -1,16 +1,8 @@
 <template>
   <view class="box">
-    <!-- <uni-steps :options="flowRecordList" active-color="#007AFF" :active="active" direction="column">
-      <uni-card>
-        <text>这是一个基础卡片示例，内容较少，此示例展示了一个没有任何属性不带阴影的卡片。</text>
-      </uni-card>
-    </uni-steps> -->
     <scroll-view scroll-y="true" class="scroll-box">
-      <uv-steps :current="active" direction="column">
+      <uv-steps :current="activeStep" direction="column">
         <uv-steps-item v-for="item, index in flowRecordList" :key="'f' + index" :title="item.taskName">
-          <!-- <template v-slot:icon>
-            <uv-icon name="checkmark-circle-fill" color="#53c21d"></uv-icon>
-          </template> -->
           <template v-slot:desc>
             <view class="desc">
               <view class="desc-item">
@@ -61,7 +53,7 @@ export default {
     return {
       flowRecordList: [], // 流程流转数据
       flowList: [],
-      active: 0,
+      activeStep: 0,
     }
   },
   methods: {
@@ -86,16 +78,18 @@ export default {
     },
     /** 流程流转记录 */
     getFlowRecordList() {
+      this.activeStep = 0;
       const params = { procInsId: this.rows.procInsId, deployId: this.rows.deployId }
       flowRecord(params).then(res => {
         this.flowRecordList = res.data.flowList.reverse();
-        console.log(this.flowRecordList);
-        this.active = this.flowRecordList[i].length - 1
         for (let i = 0; i < this.flowRecordList.length; i++) {
           if (!this.flowRecordList[i].finishTime) {
-            this.active = i
+            this.activeStep = i
           }
         }
+        if (this.activeStep == 0) {
+          this.activeStep = this.flowRecordList.length
+        }
       }).catch(res => {
 
       })

oa-ui-app/pages/form/borrow/borrow.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-02-20 10:20:22
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-19 14:19:17
+ * @LastEditTime: 2025-03-26 16:08:38
 -->
 <template>
   <view class="form-container">
@@ -13,15 +13,15 @@
     </view>
     <!-- 表单内容 -->
     <uni-forms ref="form" :modelValue="form" :rules="rules" label-position="top" label-width="150" class="custom-form">
-      <flow-note :taskForm="taskForm"></flow-note>
+      <flow-note :taskForm="taskForm" v-if="taskName"></flow-note>
       <!-- 当前节点 -->
-      <uni-forms-item label="当前节点" class="form-item">
+      <uni-forms-item label="当前节点" class="form-item" v-if="taskName">
         <uni-tag :inverted="true" type="primary" :text="taskName"></uni-tag>
       </uni-forms-item>
 
       <!-- 流程发起人 -->
       <uni-forms-item label="填报人" class="form-item">
-        <b style="font-size:35rpx;">{{ startUserName }}</b>
+        <b style="font-size:35rpx;">{{ applierUserName }}</b>
       </uni-forms-item>
 
       <!-- 填报日期 -->
@@ -176,6 +176,7 @@ export default {
   created() {
     this.form.borrowId = this.taskForm.formId;
     this.deptId = this.$store.getters.deptId;
+    this.applierUserName = this.startUserName;
     this.initForm();
     this.initRules();
     uni.setNavigationBarTitle({
@@ -192,6 +193,7 @@ export default {
   },
   data() {
     return {
+      applierUserName:'',
       form: {
         submitTime: '',
         borrowUsage: '0',
@@ -300,6 +302,9 @@ export default {
         if (res.data) {
           this.formTotal = 1;
           this.form = res.data;
+          if (!this.applierUserName) {
+            this.applierUserName = this.form.applierUser.nickName;
+          }
           this.hanldeChangeType();
           if (this.form.projectId) {
             getProject(this.form.projectId).then(res => {

oa-ui-app/pages/message/myProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-02-19 15:36:34
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-20 15:27:00
+ * @LastEditTime: 2025-03-26 15:35:31
 -->
 <template>
   <view class="page-container">
@@ -177,7 +177,22 @@ export default {
       this.active = 'record';
       this.$refs.drawer.open();
     },
-    handleFlowNote(row) { /* ... */ },
+    handleFlowNote(row) {
+      console.log(row);
+      const query = {
+        procInsId: row.procInsId,
+        executionId: row.executionId,
+        deployId: row.deployId,
+        taskId: row.taskId,
+        taskName: '',
+        startUserName: row.startUserName,
+        procDefName: row.procDefName
+      }
+      const encodedParams = encodeURIComponent(JSON.stringify(query));
+      uni.navigateTo({
+        url: `/pages/message/apply/detail?params=${encodedParams}`
+      })
+    },
     handleDelete(row) { /* ... */ },
     beDeleted(row) { /* ... */ },
   },

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

@@ -566,7 +566,7 @@ export default {
       let budgetData = await listBudget({ projectId: this.form.projectId })
       if (budgetData.total == 1) {
         let budget = budgetData.rows[0];
-        this.totalBudget = budget.settleExpense
+        this.totalBudget = Number(budget.settleExpense) + Number(budget.otherExpense) +  Number(budget.rentExpense)
       }
       if (budgetData.total == 0) {
         this.totalBudget = 0

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

@@ -46,7 +46,7 @@
       </el-table-column>
       <el-table-column label="培训名称" align="center" prop="trainName" />
       <el-table-column label="主要内容" align="center" prop="content" />
-      <el-table-column label="时长" align="center" prop="hours" />
+      <el-table-column label="学时" align="center" prop="hours" />
       <el-table-column label="部门审核人" align="center" prop="deptUser.nickName" />
       <el-table-column label="部门审核时间" align="center" prop="deptTime" width="180">
         <template slot-scope="scope">

oa-ui/src/views/oa/study/components/studyHead.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-03-05 14:19:02
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-11 17:00:41
+ * @LastEditTime: 2025-03-27 13:57:08
 -->
 <template>
   <div class="head-bg">
@@ -32,6 +32,7 @@
 
 <script>
 import { listStudy, getStudy, delStudy, addStudy, updateStudy } from "@/api/oa/study/myStudy";
+import { listTrainApproval, getTrainApproval, delTrainApproval, addTrainApproval, updateTrainApproval } from "@/api/oa/study/trainApproval";
 
 export default {
   data() {
@@ -43,15 +44,25 @@ export default {
     this.getYearHours();
   },
   methods: {
-    getYearHours() {
-      let lastTime = new Date().getFullYear() + '-01-01'
-      listStudy({ userId: this.$store.getters.userId, lastTime: lastTime }).then(res => {
-        console.log(res);
-        if (res.total > 0) {
-          this.hours = res.rows.reduce((sum, item) => sum + Number(item.getHours), 0)
-        }
-
-      })
+    async getYearHours() {
+      let lastTime = new Date().getFullYear() + '-01-01';
+      let studyHours = 0, approvalHours = 0;
+      let studyRes = await listStudy({ userId: this.$store.getters.userId, lastTime: lastTime })
+      if (studyRes.total > 0) {
+        studyHours = studyRes.rows.reduce((sum, item) => sum + Number(item.getHours), 0)
+      }
+      let approvalRes = await listTrainApproval({ userId: this.$store.getters.userId, reportTime: lastTime })
+      if (approvalRes.total > 0) {
+        approvalHours = approvalRes.rows.reduce((sum, item) => {
+          if (item.deptTime) {
+            return sum + Number(item.hours)
+          } else {
+            return sum + 0
+          }
+        }, 0)
+      }
+      console.log(approvalHours);
+      this.hours = studyHours + approvalHours;
     }
   },
 }

oa-ui/src/views/oa/study/components/studyLeft.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-03-05 15:01:52
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-13 16:09:55
+ * @LastEditTime: 2025-03-27 13:37:00
 -->
 <template>
   <div>
@@ -21,7 +21,9 @@
       </el-form-item>
     </el-form>
     <right-toolbar :search="false" @queryTable="getRecordsList"></right-toolbar>
-    <el-table :data="studyList" style="width: 100%" v-loading="loading">
+    <el-button type="primary" plain size="mini" icon="el-icon-plus" @click="addTrainRecord">添加参培记录</el-button>
+    <el-button type="success" plain size="mini" icon="el-icon-view" @click="trainOpen = true">查看参培记录</el-button>
+    <el-table :data="studyList" style="width: 100%" v-loading="loading" height="430px">
       <el-table-column align="center" label="序号" type="index" />
       <el-table-column align="center" label="资料名称" prop="resource.title" />
       <el-table-column align="center" label="类型" prop="resource.type"></el-table-column>
@@ -47,11 +49,39 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
       :layout="'total, prev, pager, next,jumper'" :limit.sync="queryParams.pageSize" :autoScroll="false"
       @pagination="getRecordsList" />
+    <el-dialog title="个人参培记录" :visible.sync="trainOpen" width="60%" append-to-body>
+      <el-table :data="trainList" style="width: 100%" v-loading="loading" height="430px">
+        <el-table-column label="序号" type="index" />
+        <el-table-column label="上报人" align="center" prop="reportUser.nickName" />
+        <el-table-column label="上报日期" align="center" prop="reportTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="培训名称" align="center" prop="trainName" />
+        <el-table-column label="主要内容" align="center" prop="content" />
+        <el-table-column label="学时" align="center" prop="hours" />
+        <el-table-column label="部门审核人" align="center" prop="deptUser.nickName" />
+        <el-table-column label="部门审核时间" align="center" prop="deptTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="部门审核意见" align="center" prop="deptComment" />
+      </el-table>
+      <pagination v-show="trainTotal > 0" :total="trainTotal" :page.sync="trainQueryParams.pageNum"
+        :layout="'total, prev, pager, next,jumper'" :limit.sync="trainQueryParams.pageSize" :autoScroll="false"
+        @pagination="getTrainList" />
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listStudy, getStudy, delStudy, addStudy, updateStudy } from "@/api/oa/study/myStudy";
+import { listTrainApproval, getTrainApproval, delTrainApproval, addTrainApproval, updateTrainApproval } from "@/api/oa/study/trainApproval";
+import { Snowflake } from '@/utils/snowFlake.js';
+import { listDefinition, definitionStart } from "@/api/flowable/definition";
+import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
 
 export default {
   data() {
@@ -62,11 +92,21 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10
+      },
+      trainOpen: false,
+      trainLoading: true,
+      trainList: [],
+      trainTotal: 0,
+      trainQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: this.$store.getters.userId
       }
     }
   },
   created() {
     this.getRecordsList();
+    this.getTrainList();
   },
   methods: {
     getRecordsList() {
@@ -78,6 +118,15 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询参培审核列表 */
+    getTrainList() {
+      this.trainLoading = true;
+      listTrainApproval(this.trainQueryParams).then(response => {
+        this.trainList = response.rows;
+        this.trainTotal = response.total;
+        this.trainLoading = false;
+      });
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -120,6 +169,78 @@ export default {
         return 'success'
       }
     },
+    async addTrainRecord() {
+      let response = await listDefinition({
+        pageNum: 1,
+        pageSize: 9999,
+        name: "参培审核",
+        category: "assess",
+      })
+      console.log(response);
+      if (response.data.total == 1) {
+        let obj = response.data.records[0]
+        this.$confirm("是否发起参培审核？", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.handleStartProcess(obj)
+        }).catch(() => { });
+      }
+    },
+    handleStartProcess(row) {
+      let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
+      getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
+        let data = res.data;
+        const variables = {};
+        const formData = {};
+        formData.disabled = true;
+        formData.formBtns = false;
+        formData.formId = formId
+        if (row.id) {
+          variables.variables = formData;
+          let routePath = this.getRoutePath(row);
+          definitionStart(row.id, JSON.stringify(variables)).then(res => {
+            this.$modal.msgSuccess(res.msg);
+            let procInstanceId = res.data;
+            todoList({
+              pageNum: 1,
+              pageSize: 99999999, processInsId: procInstanceId
+            }).then(toDoRes => {
+              let records = toDoRes.data.records;
+              if (records.length == 1) {
+                records = records[0]
+              }
+              this.$router.push({
+                path: routePath,
+                query: {
+                  procInsId: records.procInsId,
+                  executionId: records.executionId,
+                  deployId: records.deployId,
+                  taskId: records.taskId,
+                  taskName: records.taskName,
+                  startUser: records.startUserName + '-' + records.startDeptName,
+                  formId: formData.formId,
+                  procDefName: records.procDefName
+                }
+              })
+            })
+          })
+        }
+      })
+    },
+    getRoutePath(row) {
+      let path;
+      for (let p of this.publicData.pathRoute) {
+        if (p.name == row.name) {
+          path = p.path
+          break
+        } else {
+          path = '/flowable/task/todo/detail/index'
+        }
+      }
+      return path
+    },
   },
 }
 </script>

oa-ui/src/views/oa/study/components/studyRight.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-03-05 15:36:17
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-25 16:50:59
+ * @LastEditTime: 2025-03-26 09:12:56
 -->
 <template>
   <div>
@@ -23,6 +23,7 @@
         <el-table :data="videoList" style="width: 100%">
           <el-table-column align="center" label="序号" type="index" />
           <el-table-column align="center" label="名称" prop="title" />
+          <el-table-column align="center" label="类型" prop="type" />
           <el-table-column align="center" label="学时" prop="hours" />
           <el-table-column align="center" label="操作">
             <template slot-scope="{row}">

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-03-05 14:00:18
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-25 14:12:17
+ * @LastEditTime: 2025-03-27 09:16:49
 -->
 <template>
   <div>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-03-05 09:15:54
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-25 13:59:38
+ * @LastEditTime: 2025-03-27 10:08:59
 -->
 <template>
   <div class="app-container">
@@ -155,7 +155,7 @@
               </el-tree>
             </el-form-item>
             <el-form-item label="学时" prop="hours">
-              <el-input-number v-model="form.hours" :min="0" :precision="1" />
+              <el-input-number v-model="form.hours" :min="0" :precision="1"/>
             </el-form-item>
             <el-form-item label="上传人" prop="uploader">
               {{ getUserName(form.uploader) }}