diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/ReportController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/ReportController.java index 00f6cc9c0..17e5aabfc 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/ReportController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/ReportController.java @@ -162,6 +162,7 @@ public class ReportController { public List exportInventoryReport( @Parameter(description = "查询条件") @ParameterObject InventoryReportQueryDTO queryDTO) { log.info("开始导出进销存报表,查询条件:{}", queryDTO); + log.info("开始导出进销存报表,查询条件:{}", queryDTO); List list = inventoryReportService.exportExcel(queryDTO); log.info("导出进销存报表成功,导出记录数:{}", list.size()); return list; diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/InventoryReportMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/InventoryReportMapper.xml index 20133f11b..772705f26 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/InventoryReportMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/InventoryReportMapper.xml @@ -50,6 +50,8 @@ spu.id AS product_id, spu.product_code, spu.product_name, + spu.dept_id, + spu.create_by, cat.name AS category_name, base.spec AS spec, base.unit AS unit, @@ -165,9 +167,7 @@ AND r.supplier_id = #{param.supplierId} - - ${dataScope.sqlFilter} - + GROUP BY spu.id, spu.product_code, spu.product_name, cat.name, base.spec, base.unit, base.package_num, base.purchase_price, base.retail_price, stock.current_stock diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SalesReportMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SalesReportMapper.xml index 3928d33e2..4a49c9693 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SalesReportMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SalesReportMapper.xml @@ -32,6 +32,8 @@ spu.id AS product_id, spu.product_code, spu.product_name, + spu.dept_id, + spu.create_by, cat.name AS category_name, base.spec AS spec, base.unit AS unit,