feat(erp): 采购/销售明细按含税单价口径拆税，供应商合同补供应商名称与附件

gaoluyang

10 天以前 a0d55bcc8bfebd408d16166b27b7e05b3e4c9f4a

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java

@@ -5,8 +5,12 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDeptStatisticsDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;

@@ -38,8 +42,25 @@
                .eqIfPresent(ErpPurchaseRequestDO::getSupplierId, pageReqVO.getSupplierId())
                .eqIfPresent(ErpPurchaseRequestDO::getStatus, pageReqVO.getStatus())
                .eqIfPresent(ErpPurchaseRequestDO::getInStatus, pageReqVO.getInStatus())
                .eqIfPresent(ErpPurchaseRequestDO::getPurchaseCategory, pageReqVO.getPurchaseCategory())
                .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, pageReqVO.getRequestTime())
                .orderByDesc(ErpPurchaseRequestDO::getId));
    }

    /**
     * 按申请部门统计采购申请（申请单数、审核通过单数、数量与金额合计）
     */
    @Select("<script>"
            + "SELECT request_dept_id AS deptId, COUNT(1) AS requestCount, "
            + "IFNULL(SUM(CASE WHEN status = 20 THEN 1 ELSE 0 END), 0) AS approvedCount, "
            + "IFNULL(SUM(total_count), 0) AS totalCount, "
            + "IFNULL(SUM(total_price), 0) AS totalPrice "
            + "FROM erp_purchase_request WHERE deleted = 0 "
            + "<if test='beginTime != null'>AND request_time &gt;= #{beginTime} </if>"
            + "<if test='endTime != null'>AND request_time &lt;= #{endTime} </if>"
            + "GROUP BY request_dept_id ORDER BY totalPrice DESC"
            + "</script>")
    List<ErpPurchaseRequestDeptStatisticsDO> selectDeptStatistics(@Param("beginTime") LocalDateTime beginTime,
                                                                  @Param("endTime") LocalDateTime endTime);

}