src/main/java/com/ruoyi/basic/pojo/Product.java

@@ -1,8 +1,7 @@
package com.ruoyi.basic.pojo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@@ -26,4 +25,8 @@
     *  产品名称
     */
    private String productName;

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = FieldFill.INSERT)
    private Integer tenantId;
}

 src/main/java/com/ruoyi/basic/pojo/ProductModel.java

@@ -1,8 +1,7 @@
package com.ruoyi.basic.pojo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@@ -31,4 +30,8 @@
     * 单位
     */
    private String unit;

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = FieldFill.INSERT)
    private Integer tenantId;
}

 src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java

@@ -30,5 +30,6 @@
        IGNORE_TABLES.add("temp_file");
        IGNORE_TABLES.add("common_file");
        IGNORE_TABLES.add("DepartmentHierarchy");
        IGNORE_TABLES.add("sys_oper_log");
    }
}

 src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java

@@ -85,12 +85,12 @@
    /**
     * 开票台账导出
     * @param response
     * @param invoiceLedgerDto
     * @param invoiceRegistrationProductDto
     * @return
     */
    @PostMapping("/export")
    public void invoiceLedgerExport(HttpServletResponse response, InvoiceLedgerDto invoiceLedgerDto) {
        invoiceLedgerService.invoiceLedgerExport(response, invoiceLedgerDto);
    public void invoiceLedgerExport(HttpServletResponse response, InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
        invoiceLedgerService.invoiceLedgerExport(response, invoiceRegistrationProductDto);
    }

    /**

 src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java

@@ -46,4 +46,6 @@
    @ApiModelProperty(value = "发票文件名")
    private String invoiceFileName;

    private String searchText;

}

 src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.pojo.SalesLedger;
import org.apache.ibatis.annotations.Param;

@@ -27,4 +28,11 @@
    List getSalesNo();

    <T> BigDecimal selectSum(LambdaQueryWrapper<T> wrapper, SFunction<T, BigDecimal> column);

    /**
     *
     * @param salesLedgerDto
     * @return
     */
    List<SalesLedger> selectSalesLedgerList(@Param("salesLedgerDto") SalesLedgerDto salesLedgerDto);
}

 src/main/java/com/ruoyi/sales/pojo/SalesLedger.java

@@ -71,9 +71,13 @@
    /**
     * 录入人
     */
    @Excel(name = "录入人")
    private String entryPerson;

    @TableField(exist = false)
    @ApiModelProperty(value = "录入人")
    @Excel(name = "录入人")
    private String entryPersonName;

    /**
     * 备注
     */

 src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java

@@ -54,10 +54,10 @@
    /**
     * 附件下载
     * @param response
     * @param invoiceLedgerDto
     * @param invoiceRegistrationProductDto
     * @return
     */
    void invoiceLedgerExport(HttpServletResponse response ,InvoiceLedgerDto invoiceLedgerDto);
    void invoiceLedgerExport(HttpServletResponse response ,InvoiceRegistrationProductDto invoiceRegistrationProductDto);

    /**
     * 开票台账详情

 src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java

@@ -12,6 +12,7 @@
import com.ruoyi.sales.excel.InvoiceLedgerExcelDto;
import com.ruoyi.sales.mapper.InvoiceLedgerFileMapper;
import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.InvoiceRegistrationMapper;
import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.InvoiceLedgerFile;
@@ -49,6 +50,9 @@

    @Autowired
    private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;

    @Autowired
    private InvoiceRegistrationMapper invoiceRegistrationMapper;

    /**
     * 开票台账新增
@@ -158,13 +162,13 @@
    /**
     * 附件下载
     * @param response
     * @param invoiceLedgerDto
     * @param invoiceRegistrationProductDto
     * @return
     */
    @Override
    public void invoiceLedgerExport(HttpServletResponse response, InvoiceLedgerDto invoiceLedgerDto) {
        List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoiceLedgerList(invoiceLedgerDto);
        List<InvoiceLedgerExcelDto> invoiceLedgerExcelDtoList = invoiceLedgerDtoList.stream().map(item -> {
    public void invoiceLedgerExport(HttpServletResponse response, InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
        List<InvoiceRegistrationProductDto> invoiceRegistrationProductList = invoiceRegistrationProductMapper.invoiceRegistrationProductList(invoiceRegistrationProductDto);
        List<InvoiceLedgerExcelDto> invoiceLedgerExcelDtoList = invoiceRegistrationProductList.stream().map(item -> {
            InvoiceLedgerExcelDto invoiceLedgerExcelDto = new InvoiceLedgerExcelDto();
            BeanUtils.copyProperties(item, invoiceLedgerExcelDto);
            return invoiceLedgerExcelDto;

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -82,11 +82,7 @@

    @Override
    public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {
        LambdaQueryWrapper<SalesLedger> queryWrapper = new LambdaQueryWrapper<>();
        if (StringUtils.isNotBlank(salesLedgerDto.getCustomerName())) {
            queryWrapper.eq(SalesLedger::getCustomerName, salesLedgerDto.getCustomerName());
        }
        return salesLedgerMapper.selectList(queryWrapper);
        return salesLedgerMapper.selectSalesLedgerList(salesLedgerDto);
    }

    public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto) {

 src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml

@@ -6,37 +6,57 @@

    <select id="invoiceRegistrationProductList" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
        SELECT
            id   ,
            sales_ledger_id           ,
            sales_ledger_product_id   ,
            invoice_registration_id   ,
            product_category          ,
            specification_model       ,
            unit                      ,
            quantity                  ,
            tax_rate                  ,
            tax_inclusive_unit_price  ,
            tax_inclusive_total_price ,
            tax_exclusive_total_price ,
            invoice_type              ,
            invoice_num               ,
            invoice_amount            ,
            no_invoice_num            ,
            no_invoice_amount         ,
            create_time               ,
            create_user               ,
            update_time               ,
            update_user               ,
            tenant_id
        FROM invoice_registration_product
        T1.id   ,
        T1.sales_ledger_id           ,
        T1.sales_ledger_product_id   ,
        T1.invoice_registration_id   ,
        T1.product_category          ,
        T1.specification_model       ,
        T1.unit                      ,
        T1.quantity                  ,
        T1.tax_rate                  ,
        T1.tax_inclusive_unit_price  ,
        T1.tax_inclusive_total_price ,
        T1.tax_exclusive_total_price ,
        T1.invoice_type              ,
        T1.invoice_num               ,
        T1.invoice_amount            ,
        T1.no_invoice_num            ,
        T1.no_invoice_amount         ,
        T1.create_time               ,
        T1.create_user               ,
        T1.update_time               ,
        T1.update_user               ,
        T1.tenant_id,
        T2.sales_contract_no,
        T2.customer_contract_no,
        T2.customer_name,
        T3.invoice_no,
        T3.invoice_total,
        T3.invoice_person,
        T3.invoice_date,
        T4.invoiceFileName
        FROM invoice_registration_product T1
        LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
        LEFT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id
        LEFT JOIN (
        SELECT
        invoice_ledger_id,
        GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
        FROM invoice_ledger_file GROUP BY invoice_ledger_id
        ) T4 ON T4.invoice_ledger_id = T3.id
        <where>
            <if test="invoiceRegistrationProductDto.invoiceRegistrationId != null">
                invoice_registration_id = #{invoiceRegistrationProductDto.invoiceRegistrationId}
            <if test="invoiceRegistrationProductDto.searchText != null and invoiceRegistrationProductDto.searchText != '' ">
                AND (T2.sales_contract_no LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
                OR
                T2.customer_name LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
                )
            </if>
            <if test="invoiceRegistrationProductDto.salesLedgerId != null">
                sales_ledger_id = #{invoiceRegistrationProductDto.salesLedgerId}
            <if test="invoiceRegistrationProductDto.invoiceDate != null">
                AND T3.invoice_date = #{invoiceRegistrationProductDto.invoiceDate}
            </if>
        </where>
        ORDER BY T1.create_time DESC
    </select>

    <select id="invoiceRegistrationProductPage" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
@@ -80,6 +100,17 @@
                GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
            FROM invoice_ledger_file GROUP BY invoice_ledger_id
        ) T4 ON T4.invoice_ledger_id = T3.id
        <where>
            <if test="invoiceRegistrationProductDto.searchText != null and invoiceRegistrationProductDto.searchText != '' ">
                AND (T2.sales_contract_no LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
                         OR
                     T2.customer_name LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
                     )
            </if>
            <if test="invoiceRegistrationProductDto.invoiceDate != null">
                AND T3.invoice_date = #{invoiceRegistrationProductDto.invoiceDate}
            </if>
        </where>
        ORDER BY T1.create_time DESC
    </select>
</mapper>

 src/main/resources/mapper/sales/SalesLedgerMapper.xml

@@ -12,4 +12,30 @@
    <select id="getSalesNo" resultType="com.ruoyi.sales.pojo.SalesLedger">
        
    </select>

    <select id="selectSalesLedgerList" resultType="com.ruoyi.sales.pojo.SalesLedger">
        SELECT
            T1.id,
            T1.sales_contract_no,
            T1.customer_contract_no,
            T1.project_name,
            T1.entry_date,
            T1.salesman,
            T1.customer_id,
            T1.customer_name,
            T1.entry_person,
            T1.remarks,
            T1.attachment_materials,
            T1.tenant_id,
            T1.contract_amount,
            T2.nick_name AS entry_person_name
        FROM
            sales_ledger T1
        LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
        <where>
            <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
                T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
            </if>
        </where>
    </select>
</mapper>