feat(home): 添加生产看板功能并优化订单查询性能

云

5 天以前 482b2982ba27b18e6391c3862ec239c89a801a46

 src/main/java/com/ruoyi/account/controller/AccountIncomeController.java

@@ -1,21 +1,14 @@
package com.ruoyi.account.controller;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.service.AccountFileService;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
import com.ruoyi.quality.service.IQualityInspectFileService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

@@ -29,8 +22,8 @@
 */
@RestController
@RequestMapping("/account/accountIncome")
@Api(tags = "财务管理--收入管理")
public class AccountIncomeController {
@Tag(name = "财务管理--收入管理")
public class AccountIncomeController extends BaseController {

    @Resource
    private AccountIncomeService accountIncomeService;
@@ -42,12 +35,12 @@
     * @return
     */
    @PostMapping("/add")
    @ApiOperation("新增")
    public AjaxResult add(@RequestBody AccountIncome accountIncome) {
    @Operation(summary = "新增")
    public R<?> add(@RequestBody AccountIncome accountIncome) {
        accountIncome.setInputTime(new Date());
        LoginUser loginUser = SecurityUtils.getLoginUser();
        accountIncome.setInputUser(loginUser.getNickName());
        return AjaxResult.success(accountIncomeService.save(accountIncome));
        return R.ok(accountIncomeService.save(accountIncome));
    }

    /**
@@ -56,13 +49,13 @@
     * @return
     */
    @DeleteMapping("/del")
    @ApiOperation("删除")
    public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
    @Operation(summary = "删除")
    public R<?> delQualityInspect(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
            return R.fail("请选择至少一条数据");
        }
        //删除检验单
        return AjaxResult.success(accountIncomeService.removeBatchByIds(ids));
        return R.ok(accountIncomeService.removeBatchByIds(ids));
    }

    /**
@@ -71,9 +64,9 @@
     * @return
     */
    @PostMapping("/update")
    @ApiOperation("修改")
    public AjaxResult update(@RequestBody AccountIncome accountIncome) {
        return AjaxResult.success(accountIncomeService.updateById(accountIncome));
    @Operation(summary = "修改")
    public R<?> update(@RequestBody AccountIncome accountIncome) {
        return R.ok(accountIncomeService.updateById(accountIncome));
    }

    /**
@@ -83,9 +76,9 @@
     * @return
     */
    @GetMapping("/listPage")
    @ApiOperation("分页查询")
    public AjaxResult accountIncomeListPage(Page page, AccountIncome accountIncome) {
        return AjaxResult.success(accountIncomeService.accountIncomeListPage(page, accountIncome));
    @Operation(summary = "分页查询")
    public R<?> accountIncomeListPage(Page page, AccountIncome accountIncome) {
        return R.ok(accountIncomeService.accountIncomeListPage(page, accountIncome));
    }

    /**
@@ -94,9 +87,9 @@
     * @return
     */
    @GetMapping("/{id}")
    @ApiOperation("详情")
    public AjaxResult accountIncomeDetail(@PathVariable("id") Integer id) {
        return AjaxResult.success(accountIncomeService.getById(id));
    @Operation(summary = "详情")
    public R<?> accountIncomeDetail(@PathVariable("id") Integer id) {
        return R.ok(accountIncomeService.getById(id));
    }

    /**
@@ -105,7 +98,7 @@
     * @param accountIncome
     */
    @PostMapping("/export")
    @ApiOperation("导出")
    @Operation(summary = "导出")
    public void accountIncomeExport(HttpServletResponse response,AccountIncome accountIncome) {
        accountIncomeService.accountIncomeExport(response, accountIncome);
    }