Merge remote-tracking branch 'origin/dev_tide' into dev_tide

liding

6 天以前 1284fb157043e488aa1794d8f1b64ebf18aa5147

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

@@ -2,7 +2,6 @@

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;
@@ -20,7 +19,6 @@

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

@RestController
@@ -115,7 +113,7 @@
    @DeleteMapping("/deleteIds")
    @ApiOperation(value = "删除审批")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult deleteIds(@RequestBody Long[] ids) {
    public AjaxResult deleteIds(@RequestBody String[] ids) {
        if (ids == null || ids.length == 0) {
            return AjaxResult.warn("参数不能为空");
        }
@@ -123,42 +121,34 @@
        return AjaxResult.success("操作成功");
    }

    @ApiOperation(value = "公出管理导出")
    @ApiOperation(value = "自由协同审批导出")
    @PostMapping("/exportOne")
    public void exportOne(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
                .eq(ApproveProcess::getApproveDelete, 0)
                .eq(ApproveProcess::getApproveType, 1));
        List<ApproveProcess> accountExpenses = exportList(1);
        ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
        util.exportExcel(response, accountExpenses, "公出管理导出");
        util.exportExcel(response, accountExpenses, "自由协同审批表");
    }

    @ApiOperation(value = "请假管理导出")
    @PostMapping("/exportTwo")
    public void exportTwo(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
                .eq(ApproveProcess::getApproveDelete, 0)
                .eq(ApproveProcess::getApproveType, 2));
        List<ApproveProcess> accountExpenses = exportList(2);
        ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
        util.exportExcel(response, accountExpenses, "请假管理导出");
    }

    @ApiOperation(value = "出差管理导出")
    @ApiOperation(value = "销售合同审批导出")
    @PostMapping("/exportThree")
    public void exportThree(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
                .eq(ApproveProcess::getApproveDelete, 0)
                .eq(ApproveProcess::getApproveType, 3));
        List<ApproveProcess> accountExpenses = exportList(3);
        ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
        util.exportExcel(response, accountExpenses, "出差管理导出");
        util.exportExcel(response, accountExpenses, "销售合同审批表");
    }

    @ApiOperation(value = "报销管理导出")
    @PostMapping("/exportFour")
    public void exportFour(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
                .eq(ApproveProcess::getApproveDelete, 0)
                .eq(ApproveProcess::getApproveType, 4));
        List<ApproveProcess> accountExpenses = exportList(4);
        ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
        util.exportExcel(response, accountExpenses, "报销管理导出");
    }
@@ -166,20 +156,37 @@
    @ApiOperation(value = "采购申请导出")
    @PostMapping("/exportFive")
    public void exportFive(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
                .eq(ApproveProcess::getApproveDelete, 0)
                .eq(ApproveProcess::getApproveType, 5));
        List<ApproveProcess> accountExpenses = exportList(5);
        ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
        util.exportExcel(response, accountExpenses, "采购申请导出");
        util.exportExcel(response, accountExpenses, "采购计划审批表");
    }

    @ApiOperation(value = "协同审批导出")
    @PostMapping("/exportZero")
    public void exportZero(HttpServletResponse response) {
        List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
                        .eq(ApproveProcess::getApproveDelete, 0)
                .eq(ApproveProcess::getApproveType, 0));
        List<ApproveProcess> accountExpenses = exportList(1);
        ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
        util.exportExcel(response, accountExpenses, "协同审批导出");
        util.exportExcel(response, accountExpenses, "自由协同审批表");
    }

    @ApiOperation(value = "报价审批导出")
    @PostMapping("/exportSix")
    public void exportSix(HttpServletResponse response) {
        ExcelUtil<ApproveProcess> util = new ExcelUtil<>(ApproveProcess.class);
        util.exportExcel(response, exportList(6), "报价审批表");
    }

    @ApiOperation(value = "出库审批导出")
    @PostMapping("/exportSeven")
    public void exportSeven(HttpServletResponse response) {
        ExcelUtil<ApproveProcess> util = new ExcelUtil<>(ApproveProcess.class);
        util.exportExcel(response, exportList(7), "出库审批表");
    }

    private List<ApproveProcess> exportList(int type) {
        return approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
                .eq(ApproveProcess::getApproveDelete, 0)
                .eq(ApproveProcess::getApproveType, type)
                .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId()));
    }
}