From 291a72bf35e2d39b816abc0ebf085cfa9da3ee06 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 23 九月 2025 14:11:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowNodeController.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowNodeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowNodeController.java
index 25826b7..5e6fedc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowNodeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowNodeController.java
@@ -1,23 +1,23 @@
package com.ruoyi.web.controller.api;
-import com.ruoyi.common.basic.PageInfo;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.dto.SetApprovalDTO;
-import com.ruoyi.system.dto.SetDeptDTO;
-import com.ruoyi.system.model.OaApproval;
import com.ruoyi.system.model.OaApprovalFlowNode;
-import com.ruoyi.system.query.ApprovalListQuery;
+import com.ruoyi.system.query.ApprovalNodeListQuery;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.OaApprovalFlowNodeService;
-import com.ruoyi.system.service.OaApprovalService;
-import com.ruoyi.system.vo.system.ApprovalFlowNodeVO;
-import com.ruoyi.system.vo.system.ApprovalVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -28,18 +28,20 @@
* @since 2025-09-15
*/
@RestController
-@Api("审批流程")
+@Api(tags ="审批流程")
@RequestMapping("/oa-approval-flow-node")
public class OaApprovalFlowNodeController {
@Resource
private OaApprovalFlowNodeService oaApprovalFlowNodeService;
+ @Resource
+ private ISysUserService sysUserService;
/**
- * 获取部门树列表
+ * 审批流程设计列表
*/
@ApiOperation("审批流程设计列表")
- @PostMapping("/pageList")
- public R<List<OaApprovalFlowNode>> pageList(@RequestBody ApprovalListQuery query) {
+ @PostMapping("list")
+ public R<List<OaApprovalFlowNode>> list(@RequestBody ApprovalNodeListQuery query) {
return R.ok( oaApprovalFlowNodeService.pageList(query));
}
@ApiOperation(value = "启用禁用")
@@ -58,12 +60,27 @@
oaApprovalFlowNodeService.updateById(approval);
return R.ok();
}
+ @ApiOperation(value = "根据部门查询人员列表")
+ @GetMapping(value = "/listUserByDeptId")
+ public R<List<SysUser>> listUserByDeptId(Integer id ) {
+ List<SysUser> users = sysUserService.selectAllList().stream()
+ .filter(e -> e.getStatus().equals("0") && e.getDeptId().equals(id.toString()))
+ .collect(Collectors.toList());
+ return R.ok(users);
+ }
+ @Log(title = "审批流程-设置审批人", businessType = BusinessType.UPDATE)
@ApiOperation(value = "设置审批人")
@PostMapping(value = "/setApproval")
public R setDept(@RequestBody SetApprovalDTO dto) {
- OaApprovalFlowNode approval = oaApprovalFlowNodeService.getById(dto.getId());
- approval.setApprovalIds(dto.getApprovalIds());
- oaApprovalFlowNodeService.updateById(approval);
+ LambdaUpdateWrapper<OaApprovalFlowNode> oaApprovalFlowNodeLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ oaApprovalFlowNodeLambdaUpdateWrapper.eq(OaApprovalFlowNode::getId,dto.getId());
+ oaApprovalFlowNodeLambdaUpdateWrapper.set(OaApprovalFlowNode::getApprovalType,dto.getApprovalType());
+ if (dto.getApprovalType() == 0){
+ oaApprovalFlowNodeLambdaUpdateWrapper.set(OaApprovalFlowNode::getApprovalIds,null);
+ }else{
+ oaApprovalFlowNodeLambdaUpdateWrapper.set(OaApprovalFlowNode::getApprovalIds,dto.getApprovalIds());
+ }
+ oaApprovalFlowNodeService.update(oaApprovalFlowNodeLambdaUpdateWrapper);
return R.ok();
}
}
--
Gitblit v1.7.1