通过表单id及流程名获取当前流程节点信息

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

         if (user.getDeptId() != null && user.getDeptId() == 101L) {
             list.addAll(postService.selectDsSecretary(user));
         }
+        if (user.getDeptId() != null && user.getDeptId() == 102L) {
+            list.addAll(postService.selectJyLeader(user));
+        }
         if (user.getDeptId() != null && user.getDeptId() == 103L) {
             list = postService.selectGmAssistant(user);
         }

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowTaskController.java

         return flowTaskService.flowXmlAndNodeByFormIdAndName(formId, name);
     }
 
+    /**
+     * 通过表单id及流程名获取当前流程节点信息
+     *
+     * @param formId 表单id
+     * @return
+     */
+    @GetMapping("/currentNodeByFormId")
+    public AjaxResult currentNodeByFormIdAndName(String formId, String name) {
+        return flowTaskService.currentNodeByFormIdAndName(formId, name);
+    }
+
     /**
      * 流程节点表单
      *

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowTaskService.java

      */
     AjaxResult flowXmlAndNodeByFormIdAndName(String formId, String name);
 
+    /**
+     * 通过表单id及流程名获取当前流程节点信息
+     * @param formId
+     * @return
+     */
+    AjaxResult currentNodeByFormIdAndName(String formId, String name);
+
     /**
      * 流程节点表单
      * @param taskId 流程任务编号

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

         }
     }
 
+    /**
+     * 通过表单id及流程名获取当前流程节点信息
+     *
+     * @param formId
+     * @return
+     */
+    @Override
+    public AjaxResult currentNodeByFormIdAndName(String formId, String name) {
+        try {
+            List<FlowVarInst> flowVarInst = flowVarInstMapper.selectProcInstByVar(formId);
+            String taskName = "";
+            for (FlowVarInst varInst : flowVarInst) {
+                List<HistoricTaskInstance> historicTaskInstanceList = historyService.createHistoricTaskInstanceQuery()
+                        .processInstanceId(varInst.getProcInstId())
+                        .orderByHistoricTaskInstanceStartTime().desc().list();
+                String processDefinitionId = historicTaskInstanceList.get(historicTaskInstanceList.size() - 1).getProcessDefinitionId();
+                if (name.equals(String.valueOf(Integer.parseInt(processDefinitionId.split(":")[2]) - 3)))
+                    taskName = historicTaskInstanceList.get(0).getName();
+            }
+            return AjaxResult.success(taskName);
+        }
+        catch (Exception e) {
+            return AjaxResult.error("无流程历史记录");
+        }
+    }
+
     /**
      * 流程节点表单
      *

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

         sysUser.setDeptId(dept.getDeptId());
         SysUserMapper userMapper = SpringUtils.getBean(SysUserMapper.class);
         List<SysUser> list = userMapper.selectUserServingList(sysUser);
-        if (dept.getDeptId() == 101) {
-            SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
-            list.addAll(userPostMapper.selectDsSecretary(new SysUser()));
+        SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
+        SysUser dsSecretary = new SysUser();
+        dsSecretary.setStatus("0");
+        List<SysUser> dsSecretaryList = userPostMapper.selectDsSecretary(dsSecretary);
+        SysUser jyLeader = new SysUser();
+        jyLeader.setStatus("0");
+        List<SysUser> jyLeaderList = userPostMapper.selectJyLeader(jyLeader);
+        SysUser gmAssistant = new SysUser();
+        gmAssistant.setStatus("0");
+        List<SysUser> gmAssistantList = userPostMapper.selectGmAssistant(gmAssistant);
+        if (dept.getDeptId() == 101L) {
+            list.addAll(dsSecretaryList);
         }
-        if (dept.getDeptId() == 103) {
-            SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
-            list = userPostMapper.selectGmAssistant(new SysUser());
+        if (dept.getDeptId() == 102L) {
+            list.addAll(jyLeaderList);
+        }
+        if (dept.getDeptId() == 103L) {
+            list = gmAssistantList;
         }
         String count = "(" + (list == null ? 0 : list.size()) + ")";
         this.label = dept.getDeptName() + count;

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java

      */
     public List<SysUser> selectGmAssistant(SysUser user);
 
+    /**
+     * 查询经营主任集合
+     *
+     * @param
+     * @return 经营主任列表
+     */
+    public List<SysUser> selectJyLeader(SysUser user);
+
     /**
      * 查询董事会秘书集合
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

      */
     public List<SysUser> selectGmAssistant(SysUser user);
 
+    /**
+     * 查询经营主任集合
+     *
+     * @param
+     * @return 经营主任列表
+     */
+    public List<SysUser> selectJyLeader(SysUser user);
+
     /**
      * 查询董事会秘书集合
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

         return userPostMapper.selectGmAssistant(user);
     }
 
+    /**
+     * 查询经营主任集合
+     *
+     * @param
+     * @return 经营主任列表
+     */
+    @Override
+    public List<SysUser> selectJyLeader(SysUser user) {
+        return userPostMapper.selectJyLeader(user);
+    }
+
     /**
      * 查询董事会秘书集合
      *

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

 		</if>
 	</select>
 
+	<select id="selectJyLeader" parameterType="SysUser" resultMap="SysUserResult">
+		select u.*, d.dept_name
+		from sys_user u
+		left join sys_dept d on u.dept_id = d.dept_id
+		left join sys_user_post up on u.user_id = up.user_id
+		left join sys_post p on up.post_id = p.post_id
+		where p.post_name = "副总经理" and d.dept_name = "经营发展部"
+		<if test="userId != null and userId != 0">
+			AND u.user_id = #{userId}
+		</if>
+		<if test="userName != null and userName != ''">
+			AND u.user_name like concat('%', #{userName}, '%')
+		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</if>
+		<if test="status != null and status != ''">
+			AND u.status = #{status}
+		</if>
+		<if test="phonenumber != null and phonenumber != ''">
+			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		</if>
+		<if test="degree != null and degree != ''">
+			AND u.degree = #{degree}
+		</if>
+		<if test="titles != null and titles != ''">
+			AND find_in_set(#{titles}, u.titles)
+		</if>
+		<if test="certificates != null and certificates != ''">
+			AND find_in_set(#{certificates}, u.certificates)
+		</if>
+	</select>
+
 	<select id="selectUserListByPostName" parameterType="String" resultMap="SysUserResult">
 		select * from sys_user u
 		left join sys_user_post up on u.user_id = up.user_id
 		left join sys_post p on up.post_id = p.post_id
-		where p.post_name = #{param}
+		where p.post_name = #{param} and u.status = '0'
 	</select>
 
 	<select id="selectSubLeaderByUserId" parameterType="String" resultMap="SysUserResult">
 	<select id="selectDeptLeaderByUserId" parameterType="String" resultMap="SysUserResult">
 		select r.user_id, r.nick_name from
 		(select u1.user_id, u1.nick_name, u.dept_id from
-		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
+		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id and u1.status = '0') as r
 		left join sys_user_post as up on r.user_id = up.user_id
 		left join sys_post as p on p.post_id = up.post_id
 		where p.post_name = '主任'
 	<select id="selectDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
 		select r.user_id, r.nick_name from
 		(select user_id, nick_name, dept_id from
-		sys_user where dept_id = #{param}) as r
+		sys_user where dept_id = #{param} and status = '0') as r
 		left join sys_user_post as up on r.user_id = up.user_id
 		left join sys_post as p on p.post_id = up.post_id
 		where p.post_name = '主任'
 	<select id="selectDeptLeadersByDeptId" parameterType="String" resultMap="SysUserResult">
 		select r.user_id, r.nick_name from
 		(select user_id, nick_name, dept_id from
-		sys_user where dept_id = #{param}) as r
+		sys_user where dept_id = #{param} and status = '0') as r
 		left join sys_user_post as up on r.user_id = up.user_id
 		left join sys_post as p on p.post_id = up.post_id
 		where p.post_name = '主任'

oa-ui/src/api/flowable/definition.js

   })
 }
 
+// 通过表单id及流程名获取当前流程节点信息
+export function currentNodeByFormId(query) {
+  return request({
+    url: '/flowable/task/currentNodeByFormId',
+    method: 'get',
+    params: query
+  })
+}
+
 // 读取xml文件
 export function saveXml(data) {
   return request({

oa-ui/src/views/flowable/form/budget/adjust/adjustIndex.vue

 <!--
  * @Author: ysh
  * @Date: 2025-05-14 16:09:56
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-06-23 11:00:49
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-09-30 16:39:33
 -->
 <template>
   <div class="app-container">
         </el-form>
         <el-table v-loading="loading" :data="budgetList">
           <el-table-column label="序号" align="center" type="index" width="60" />
-          <el-table-column label="状态" align="center" width="70">
+          <el-table-column label="状态" align="center" width="90">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.disabled" type="warning">已核算</el-tag>
+              <el-tag :type="statusTypeStyle(scope.row.disabled)"> {{ statusTypeText(scope.row.disabled) }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
               {{ getUserName(scope.row.compiler) }}
             </template>
           </el-table-column>
-          <el-table-column label="审核人" align="center" prop="auditor">
+          <el-table-column label="预算当前流程节点" align="center" prop="taskName" />
+          <!-- <el-table-column label="审核人" align="center" prop="auditor">
             <template slot-scope="scope">
               {{ getUserName(scope.row.auditor) }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="操作" align="center" width="120">
             <template slot-scope="scope">
               <el-button type="primary" size="mini" @click="handleSelect(scope.row)"
-                :disabled="scope.row.disabled">选择</el-button>
+                :disabled="scope.row.disabled == '1'">选择</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" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="getList" />
       </div>
       <div v-else key="adjust">
         <div class="adjust-header" v-if="hideReturn">
 import { listBudget, getBudget } from '@/api/oa/budget/budget';
 import { listCheck, getCheck, delCheck, addCheck, updateCheck } from "@/api/oa/budget/check";
 import { listProject } from '@/api/oa/project/project';
+import { currentNodeByFormId } from "@/api/flowable/definition";
 import BudgetAdjust from './budgetAdjust.vue';
 export default {
   props: {
       queryType: '1',
       projectList: [],
       hideReturn: true,
-      isSurvey: 0
+      isSurvey: 0,
     }
   },
   created() {
         this.budgetList = res.rows;
         for (let b of this.budgetList) {
           this.isDisabled(b).then(res => {
-            if (res) {
-              this.$set(b, 'disabled', true);
-            } else {
-              this.$set(b, 'disabled', false);
+            if (!b.disabled && b.disabled != '2')
+              this.$set(b, 'disabled', res);
+          })
+          this.getCurrentTaskName(b).then(res => {
+            this.$set(b, 'taskName', res);
+            if (res != '预算批准' || res == '') {
+              this.$set(b, 'disabled', '2');
             }
           })
         }
     async isDisabled(row) {
       let res = await listCheck({ budgetId: row.budgetId })
       if (res.total > 0) {
-        return true;
+        return '1';
       } else {
-        return false;
+        return '0';
+      }
+    },
+    async getCurrentTaskName(row) {
+      let resData = await currentNodeByFormId({ formId: row.projectId, name: '3045' })
+      if (resData.code == 200) {
+        return resData.msg;
       }
+      else
+        return ''
     },
     handleBack() {
       this.projectId = '';
     },
     handleIsSurveyChange(val) {
       this.isSurvey = val;
+    },
+    statusTypeText(row) {
+      if (row == '0') {
+        return '待核算'
+      }
+      if (row == '1') {
+        return '已核算'
+      }
+      if (row == '2') {
+        return '预算未批'
+      }
+    },
+    statusTypeStyle(row) {
+      if (row == '0') {
+        return 'primary'
+      }
+      if (row == '1') {
+        return 'warning'
+      }
+      if (row == '2') {
+        return 'danger'
+      }
     }
   }
 }

oa-ui/src/views/flowable/form/budget/adjust/budgetAdjust.vue

  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: wrh
- * @LastEditTime: 2025-09-10 13:58:29
+ * @LastEditTime: 2025-09-30 16:13:13
 -->
 <template>
   <div class="main">
       <el-descriptions-item label="实际使用车辆" :span="3" v-if="taskName == '核算编制'">
         <span v-for="car in actualInfo.carList" :key="car.id">
           <el-tag :type="car.isExist ? 'primary' : 'warning'" effect="plain" style="margin-right: 10px;">{{
-            car.licensePlate }} - {{ car.series
-            }}</el-tag>
+            car.licensePlate }} - {{ car.series }}</el-tag>
         </span>
       </el-descriptions-item>
       <el-descriptions-item label="车辆成本" :span="3" v-if="taskName == '核算编制' || carList.length > 0">
           </tr>
           <tr>
             <td>人员成本</td>
-            <td style="text-align:right;">{{ isNaN(budgetForm.staffCost) ? 0 : Number(budgetForm.staffCost).toFixed(2)
-            }}</td>
+            <td style="text-align:right;">{{ isNaN(budgetForm.staffCost) ? 0 : Number(budgetForm.staffCost).toFixed(2) }}
+            </td>
             <td style="text-align:right;">{{ isNaN(checkStaffCost) ? 0 : Number(checkStaffCost).toFixed(2) }}</td>
             <td style="text-align:right;">{{ (Number(checkStaffCost) - Number(budgetForm.staffCost)).toFixed(2) }}</td>
           </tr>
             <td style="text-align:right;"><b>{{ isNaN(budgetForm.totalBudget) ? 0 : budgetForm.totalBudget }}</b></td>
             <td style="text-align:right;"><b>{{ isNaN(totalBudgetAdjust) ? 0 : totalBudgetAdjust }}</b></td>
             <td style="text-align:right;"><b>{{ (Number(totalBudgetAdjust) - Number(budgetForm.totalBudget)).toFixed(2)
-                }}</b></td>
+            }}</b></td>
           </tr>
         </table>
       </el-descriptions-item>
 import { listProjectContract } from "@/api/oa/contract/projectContract";
 import { listProjectSubcontract } from "@/api/oa/contract/projectSubcontract";
 import { getContract } from "@/api/oa/contract/contract";
+import { currentNodeByFormId } from "@/api/flowable/definition";
 import { getSubContract } from "@/api/oa/contract/subContract";
 import InnerStaffCost from './components/InnerStaffCost.vue';
 import OuterStaffCost from './components/OuterStaffCost.vue';
         if (this.budgetForm) {
           const budgetId = this.budgetForm.budgetId;
           this.budgetId = budgetId;
-          
+
           // 并发获取所有数据
           const [
             deviceRes,
       getCheck(this.taskForm.formId).then(res => {
         if (res.data) {
           this.checkForm = res.data;
+          this.getCurrentTaskName(this.checkForm.projectId).then(response => {
+            if (response != '预算批准' || response == '') {
+              this.$set(this.checkForm, 'checkComment', '新版预算暂未获批准，当前节点：' + response);
+            }
+          })
         }
         if (this.taskName == '核算编制') {
           this.checkForm.checker = this.$store.getters.userId;
         }
       })
     },
+    async getCurrentTaskName(projectId) {
+      let resData = await currentNodeByFormId({ formId: projectId, name: '3045' })
+      if (resData.code == 200) {
+        return resData.msg;
+      }
+      else
+        return ''
+    },
     async initActualInfo(project) {
       let deviceIds = [];
       let carIds = [];
     // 处理内业人员数据变化
     handleInnerStaffChange(newList) {
       this.innerStaffList = newList;
-      let innerSum =  this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
+      let innerSum = this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
       let outerSum = this.outerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
       this.checkStaffCost = (innerSum + outerSum).toFixed(2);
       this.getTotalBudgetAdjust();
     // 处理外业人员数据变化
     handleOuterStaffChange(newList) {
       this.outerStaffList = newList;
-      let innerSum =  this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
+      let innerSum = this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
       let outerSum = this.outerStaffList.reduce((sum, staff) => sum + (Number(staff.amountAdjust) || 0), 0)
       this.checkStaffCost = (innerSum + outerSum).toFixed(2);
       this.getTotalBudgetAdjust();
         amount: Number(site.amount).toFixed(2),
         amountAdjust: site.amountAdjust ? Number(site.amountAdjust).toFixed(2) : 0
       }));
-      
+
       this.budgetForm.siteSum = this.siteList.reduce((sum, site) => sum + Number(site.amount || 0), 0).toFixed(2);
       this.checkSiteCost = this.siteList.reduce((sum, site) => sum + Number(site.amountAdjust || 0), 0).toFixed(2);
     },
           projectId: this.row.projectId,
           checkId: this.taskForm.formId
         }
-        
+
         // 并发处理基础数据保存
         const savePromises = [];
-        
+
         if (!this.checkForm.checkId) {
           savePromises.push(addCheck(obj));
           this.$emit('preserve');
             delBudgetDevice(this.row.budgetId),
             delOther(this.row.budgetId)
           ];
-          
+
           await Promise.all(deletePromises);
-          
+
           // 并发处理所有新增操作
           const addPromises = [];
-          
+
           // 人员数据（保持顺序）
           const staffList = this.innerStaffList.concat(this.outerStaffList);
           staffList.forEach(staff => {
             staff.budgetId = this.row.budgetId;
             addPromises.push(addBudgetStaff(staff));
           });
-          
+
           // 车辆数据（保持顺序）
           this.carList.forEach(car => {
             car.budgetId = this.row.budgetId;
             addPromises.push(addBudgetCar(car));
           });
-          
+
           // 设备数据（保持顺序）
           this.deviceList.forEach(device => {
             device.budgetId = this.row.budgetId;
             addPromises.push(addBudgetDevice(device));
           });
-          
+
           // 预算外开销数据（保持顺序）
           this.otherList.forEach(other => {
             other.budgetId = this.row.budgetId;
             addPromises.push(addOther(other));
           });
-          
+
           // 现场开支更新（保持顺序）
           this.siteList.forEach(site => {
             addPromises.push(updateSite(site));
           });
-          
+
           // 并发执行所有新增操作
           await Promise.all(addPromises);
         }
-        
+
         // 等待基础数据保存完成
         await Promise.all(savePromises);
-        
+
         this.$message.success('保存成功');
       } catch (error) {
         console.error('保存失败:', error);
     color: #E6A23C;
     font-weight: bold;
   }
-}
-</style>
+}</style>

oa-ui/src/views/flowable/form/budget/adjust/newBudgetInfo.vue

 <!--
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-10 15:47:58
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-09-30 16:23:05
 -->
 <template>
   <div class="main" v-loading="loading">
 import { listProjectSubcontract } from "@/api/oa/contract/projectSubcontract";
 import { getContract } from "@/api/oa/contract/contract";
 import { getSubContract } from "@/api/oa/contract/subContract";
+import { currentNodeByFormId } from "@/api/flowable/definition";
 import InnerStaffCost from './components/InnerStaffCost.vue';
 import OuterStaffCost from './components/OuterStaffCost.vue';
 import CarCost from './components/CarCost.vue';
           if (totalPerformance > Number(this.budgetForm.settleExpense)) {
             this.$message.warning('内业人员绩效总额超过内业绩效总额，请检查');
           }
+          this.getCurrentTaskName(this.budgetForm.projectId).then(response => {
+            if (response != '总经理审核' && response != '预算批准') {
+              this.$set(this.budgetForm, 'managerComment', undefined);
+              this.$set(this.budgetForm, 'manager', undefined);
+              this.$set(this.budgetForm, 'managerTime', undefined);
+            }
+            if (response != '预算批准') {
+              this.$set(this.budgetForm, 'zjlComment', undefined);
+              this.$set(this.budgetForm, 'auditor', undefined);
+              this.$set(this.budgetForm, 'zjlTime', undefined);
+            }
+          })
         }
         this.loading = false;
       }).catch(() => {
         this.workContentList = res.rows;
       })
     },
+    async getCurrentTaskName(projectId) {
+      let resData = await currentNodeByFormId({ formId: projectId, name: '3045' })
+      if (resData.code == 200) {
+        return resData.msg;
+      }
+      else
+        return ''
+    },
     async preserve() {
       this.$message.warning('正在保存，请勿关闭页面');
       if (this.taskName == '分管审核') {

oa-ui/src/views/oa/staff/changeRecord.vue

  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
  * @LastEditors: wrh
- * @LastEditTime: 2025-02-25 12:17:11
+ * @LastEditTime: 2025-09-29 09:29:14
 -->
 <template>
   <div>
         row.after = row.after == null ? '' : this.selectDictLabel(this.dict.type.sys_user_operatorlevel, row.after);
       }
       else if (row.field == '政治面貌') {
-        row.before = row.before == null ? '' : this.selectDictLabel(this.dict.type.sys_user_political, row.before);
-        row.after = row.after == null ? '' : this.selectDictLabel(this.dict.type.sys_user_political, row.after);
+        row.before = row.before == null ? '' : this.selectDictLabels(this.dict.type.sys_user_political, row.before, ',');
+        row.after = row.after == null ? '' : this.selectDictLabels(this.dict.type.sys_user_political, row.after, ',');
       }
       else if (row.field == '学历') {
         row.before = row.before == null ? '' : this.selectDictLabel(this.dict.type.sys_user_degree, row.before);