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

zss

19 小时以前 7f642bd0b97e30ef91ac6d2809d7e4a77d00c7fe

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

 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java

@@ -125,6 +125,7 @@
    private SysUserMapper sysUserMapper;
    @Autowired
    private SysUserDeptMapper sysUserDeptMapper;
    @Autowired
    private StockInventoryMapper stockInventoryMapper;

    @Override

 src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java

@@ -1,15 +1,25 @@
package com.ruoyi.purchase.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.ProcurementBusinessSummaryDto;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.service.impl.ProcurementBusinessSummaryServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * @author :yys
@@ -26,7 +36,19 @@

    @GetMapping("/listPage")
    public AjaxResult listPage(Page page, ProcurementBusinessSummaryDto procurementBusinessSummaryDto) {
        return procurementBusinessSummaryService.listPage(page, procurementBusinessSummaryDto);
        return AjaxResult.success(procurementBusinessSummaryService.listPage(page, procurementBusinessSummaryDto));
    }

    /**
     * 导出采购台账列表
     */
    @Log(title = "导出采购报表", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ProcurementBusinessSummaryDto procurementBusinessSummaryDto) {
        Page page = new Page(-1,-1);
        IPage<ProcurementBusinessSummaryDto> list = procurementBusinessSummaryService.listPage(page, procurementBusinessSummaryDto);
        ExcelUtil<ProcurementBusinessSummaryDto> util = new ExcelUtil<ProcurementBusinessSummaryDto>(ProcurementBusinessSummaryDto.class);
        util.exportExcel(response, list.getRecords(), "采购报表");
    }

}

 src/main/java/com/ruoyi/purchase/service/impl/ProcurementBusinessSummaryServiceImpl.java

@@ -1,5 +1,6 @@
package com.ruoyi.purchase.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.ProcurementBusinessSummaryDto;
@@ -20,7 +21,7 @@
    @Autowired
    private SalesLedgerProductMapper salesLedgerProductMapper;

    public AjaxResult listPage(Page page, ProcurementBusinessSummaryDto procurementBusinessSummaryDto) {
        return AjaxResult.success(salesLedgerProductMapper.procurementBusinessSummaryListPage(page, procurementBusinessSummaryDto));
    public IPage<ProcurementBusinessSummaryDto> listPage(Page page, ProcurementBusinessSummaryDto procurementBusinessSummaryDto) {
        return salesLedgerProductMapper.procurementBusinessSummaryListPage(page, procurementBusinessSummaryDto);
    }
}

 src/main/resources/mapper/stock/StockInventoryMapper.xml

@@ -185,7 +185,7 @@
        p.product_name
    </select>
    <select id="selectTotal" resultType="java.math.BigDecimal">
        select sum(qualitity)
        select ifnull(sum(qualitity),0)
        from stock_inventory
    </select>