yys 修改导入导出bug

maven

3 天以前 e5977257949f2b59be2523c4c8d42c0a2a4555c6

yys  修改导入导出bug

 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java

@@ -40,7 +40,7 @@
    /**
     * 待出库数量
     */
    @Excel(name = "待出库数量")
//    @Excel(name = "待出库数量")
    private BigDecimal inboundNum0;



 src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java

@@ -129,12 +129,16 @@
        // 查询采购记录已入库数量
        List<Integer> collect = list.stream().map(ProcurementPageDto::getId).collect(Collectors.toList());
        if(CollectionUtils.isEmpty( collect)){
            ExcelUtil<ProcurementPageDto> util = new ExcelUtil<ProcurementPageDto>(ProcurementPageDto.class);
            util.exportExcel(response, list, "入库台账");
            return;
        }
        LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
        procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect);
        List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
        if(CollectionUtils.isEmpty( procurementRecords)){
            ExcelUtil<ProcurementPageDto> util = new ExcelUtil<ProcurementPageDto>(ProcurementPageDto.class);
            util.exportExcel(response, list, "入库台账");
            return;
        }
        for (ProcurementPageDto dto : list) {

 src/main/resources/mapper/purchase/ProductRecordMapper.xml

@@ -27,7 +27,7 @@
            and sl.sales_contract_no = #{c.salesContractNo}
        </if>
        <if test="c.supplierName != null and c.supplierName != ''">
            and sl.supplier_name = #{c.supplierName}
            and pl.supplier_name = #{c.supplierName}
        </if>
        <if test="c.createdAtStart != null and c.createdAtStart != ''">
            and pr.created_at &gt;= date_format(#{c.createdAtStart},'%Y-%m-%d hh:mm:ss')