Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

5 天以前 0d7d874912d0147376826b55667a1deb6547ed91

 src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java

@@ -2,53 +2,46 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.approve.bean.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.bean.vo.ApproveProcessVO;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.domain.SysDept;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.ParseException;
import java.util.List;

@RestController
@RequestMapping("/approveProcess")
@Api(tags = "审批")
public class ApproveProcessController {
@AllArgsConstructor
@Tag(name = "审批")
public class ApproveProcessController extends BaseController {

    @GetMapping("/test")
    public AjaxResult test() {
        System.out.println(1111);
        return AjaxResult.success("测试");
    }


    @Autowired
    private IApproveProcessService approveProcessService;
    /**、
     * 获取部门列表
     * @return
     */
    @GetMapping("/getDept")
    public AjaxResult getDept() {
    public R<?> getDept() {
        Long userId = SecurityUtils.getUserId();
        LoginUser user = SecurityUtils.getLoginUser();
        Long[] deptIds = SecurityUtils.getDeptId();

        List<SysDept> sysDeptList = approveProcessService.selectDeptListByDeptIds(deptIds);
        return AjaxResult.success(sysDeptList);
        return R.ok(sysDeptList);
    }

    /**
@@ -58,14 +51,14 @@
     */
    @PostMapping("/add")
    @Transactional(rollbackFor = Exception.class)
    @ApiOperation(value = "添加审批")
    public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
    @Operation(summary = "添加审批")
    public R<?> add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
        if (approveProcessVO == null) {
            return AjaxResult.warn("参数不能为空");
            return R.fail(HttpStatus.WARN,"参数不能为空");
        }

        approveProcessService.addApprove(approveProcessVO);
        return AjaxResult.success("添加成功");
        return R.ok(null, "添加成功");
    }

    /**
@@ -74,12 +67,12 @@
     * @return
     */
    @GetMapping("/get")
    @ApiOperation(value = "审批详情")
    public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
    @Operation(summary = "审批详情")
    public R<?> get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
        if (approveGetAndUpdateVo.getId() == null || approveGetAndUpdateVo.getId().isEmpty()) {
            return AjaxResult.warn("参数不能为空");
            return R.fail(HttpStatus.WARN,"参数不能为空");
        }
        return AjaxResult.success(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
        return R.ok(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
    }

    /**
@@ -89,22 +82,22 @@
     */
    @PostMapping("/update")
    @Transactional(rollbackFor = Exception.class)
    @ApiOperation(value = "更新审批")
    public AjaxResult update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
    @Operation(summary = "更新审批")
    public R<?> update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
        if (approveGetAndUpdateVo == null) {
            return AjaxResult.warn("参数不能为空");
            return R.fail(HttpStatus.WARN,"参数不能为空");
        }
        approveProcessService.updateByApproveId(approveGetAndUpdateVo);
        return AjaxResult.success("操作成功");
        return R.ok(null, "操作成功");
    }
    /**
     * 获取审批列表
     * @return
     */
    @GetMapping("/list")
    @ApiOperation(value = "获取审批列表")
    public AjaxResult list(Page page, ApproveProcess approveProcess) {
        return AjaxResult.success(approveProcessService.listAll(page, approveProcess));
    @Operation(summary = "获取审批列表")
    public R<?> list(Page page, ApproveProcess approveProcess) {
        return R.ok(approveProcessService.listAll(page, approveProcess));
    }

    /**
@@ -113,17 +106,17 @@
     * @return
     */
    @DeleteMapping("/deleteIds")
    @ApiOperation(value = "删除审批")
    @Operation(summary = "删除审批")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult deleteIds(@RequestBody List<Long> ids) {
    public R<?> deleteIds(@RequestBody List<Long> ids) {
        if (ids == null || ids.size() == 0) {
            return AjaxResult.warn("参数不能为空");
            return R.fail(HttpStatus.WARN,"参数不能为空");
        }
        approveProcessService.delApprove(ids);
        return AjaxResult.success("操作成功");
        return R.ok(null, "操作成功");
    }

    @ApiOperation(value = "公出管理导出")
    @Operation(summary = "公出管理导出")
    @PostMapping("/exportOne")
    public void exportOne(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -133,7 +126,7 @@
        util.exportExcel(response, accountExpenses, "公出管理导出");
    }

    @ApiOperation(value = "请假管理导出")
    @Operation(summary = "请假管理导出")
    @PostMapping("/exportTwo")
    public void exportTwo(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -143,7 +136,7 @@
        util.exportExcel(response, accountExpenses, "请假管理导出");
    }

    @ApiOperation(value = "出差管理导出")
    @Operation(summary = "出差管理导出")
    @PostMapping("/exportThree")
    public void exportThree(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -153,7 +146,7 @@
        util.exportExcel(response, accountExpenses, "出差管理导出");
    }

    @ApiOperation(value = "报销管理导出")
    @Operation(summary = "报销管理导出")
    @PostMapping("/exportFour")
    public void exportFour(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -163,7 +156,7 @@
        util.exportExcel(response, accountExpenses, "报销管理导出");
    }

    @ApiOperation(value = "采购申请导出")
    @Operation(summary = "采购申请导出")
    @PostMapping("/exportFive")
    public void exportFive(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -173,7 +166,7 @@
        util.exportExcel(response, accountExpenses, "采购申请导出");
    }

    @ApiOperation(value = "协同审批导出")
    @Operation(summary = "协同审批导出")
    @PostMapping("/exportZero")
    public void exportZero(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -183,7 +176,7 @@
        util.exportExcel(response, accountExpenses, "协同审批导出");
    }

    @ApiOperation(value = "危险作业审批导出")
    @Operation(summary = "危险作业审批导出")
    @PostMapping("/exportEight")
    public void exportEight(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()