Merge remote-tracking branch 'origin/master'

mitao

2 天以前 bdd967acce69d2420d9866789dfcee42c7e77023

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowNodeController.java

@@ -1,15 +1,18 @@
package com.ruoyi.web.controller.api;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
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.service.ISysUserService;
import com.ruoyi.system.service.OaApprovalFlowNodeService;
import com.ruoyi.system.service.OaApprovalService;
import com.ruoyi.system.vo.system.ApprovalFlowNodeVO;
@@ -20,6 +23,7 @@

import javax.annotation.Resource;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -30,12 +34,14 @@
 * @since 2025-09-15
 */
@RestController
@Api("审批流程")
@Api(tags ="审批流程")
@RequestMapping("/oa-approval-flow-node")
public class OaApprovalFlowNodeController {
    @Resource
    private OaApprovalFlowNodeService oaApprovalFlowNodeService;

    @Resource
    private ISysUserService sysUserService;
    /**
     * 审批流程设计列表
     */
@@ -60,14 +66,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() == 1){
            oaApprovalFlowNodeLambdaUpdateWrapper.set(OaApprovalFlowNode::getApprovalIds,null);
        }else{
            oaApprovalFlowNodeLambdaUpdateWrapper.set(OaApprovalFlowNode::getApprovalIds,dto.getApprovalIds());
        }
        oaApprovalFlowNodeService.update(oaApprovalFlowNodeLambdaUpdateWrapper);
        return R.ok();
    }
}