diff --git a/src/main/java/cn/lihongjie/coal/purchaseOrder/dto/PurchaseOrderReportRequest.java b/src/main/java/cn/lihongjie/coal/purchaseOrder/dto/PurchaseOrderReportRequest.java index e078f463..2a291abd 100644 --- a/src/main/java/cn/lihongjie/coal/purchaseOrder/dto/PurchaseOrderReportRequest.java +++ b/src/main/java/cn/lihongjie/coal/purchaseOrder/dto/PurchaseOrderReportRequest.java @@ -55,6 +55,8 @@ month private List coalInfoIds; + private List djgClientIds; + private String organizationId; diff --git a/src/main/java/cn/lihongjie/coal/purchaseOrder/service/PurchaseOrderService.java b/src/main/java/cn/lihongjie/coal/purchaseOrder/service/PurchaseOrderService.java index f2e50b26..c7d2463b 100644 --- a/src/main/java/cn/lihongjie/coal/purchaseOrder/service/PurchaseOrderService.java +++ b/src/main/java/cn/lihongjie/coal/purchaseOrder/service/PurchaseOrderService.java @@ -327,6 +327,7 @@ public class PurchaseOrderService <#if field == 'supplierId'>,s.id as supplier_id, max(s.name) as supplier_name, max(s.code) as supplier_code <#if field == 'coalInfoId'>,c.id as coal_info_id, max(c.name) as coal_info_name, max(c.code) as coal_info_code + <#if field == 'djgClientId'>,djg.id as djg_client_id, max(djg.name) as djg_client_name, max(djg.code) as djg_client_code @@ -349,6 +350,7 @@ public class PurchaseOrderService t_purchase_order o left join t_coal_info c on o.coal_info_id = c.id left join t_supplier s on c.supplier_id = s.id + left join t_supplier djg on o.djg_client_id = djg.id where 1=1 @@ -360,6 +362,8 @@ public class PurchaseOrderService <#if supplierIds??> and s.id in :supplierIds <#if coalInfoIds??> and c.id in :coalInfoIds + + <#if djgClientIds??> and djg.id in :djgClientIds @@ -370,6 +374,7 @@ public class PurchaseOrderService <#if field == 'supplierId'>,s.id <#if field == 'coalInfoId'>,c.id + <#if field == 'djgClientId'>,djg.id diff --git a/src/main/java/cn/lihongjie/coal/saleOrder/dto/SaleOrderReportRequest.java b/src/main/java/cn/lihongjie/coal/saleOrder/dto/SaleOrderReportRequest.java index f6b29f4b..ce1fc2c7 100644 --- a/src/main/java/cn/lihongjie/coal/saleOrder/dto/SaleOrderReportRequest.java +++ b/src/main/java/cn/lihongjie/coal/saleOrder/dto/SaleOrderReportRequest.java @@ -54,6 +54,8 @@ month private List productIds; + private List djgClientIds; + private String organizationId; diff --git a/src/main/java/cn/lihongjie/coal/saleOrder/service/SaleOrderService.java b/src/main/java/cn/lihongjie/coal/saleOrder/service/SaleOrderService.java index 5810ad7b..2753f4a7 100644 --- a/src/main/java/cn/lihongjie/coal/saleOrder/service/SaleOrderService.java +++ b/src/main/java/cn/lihongjie/coal/saleOrder/service/SaleOrderService.java @@ -316,7 +316,8 @@ public class SaleOrderService extends BaseService,s.id as supplier_id, max(s.name) as supplier_name, max(s.code) as supplier_code <#if field == 'productId'>,p.id as product_id, max(p.name) as product_name, max(p.code) as product_code - + + <#if field == 'djgClientId'>,djg.id as djg_client_id, max(djg.name) as djg_client_name, max(djg.code) as djg_client_code <#list fieldInfos as field> @@ -338,6 +339,7 @@ public class SaleOrderService extends BaseService and s.id in :supplierIds <#if productIds??> and p.id in :productIds + + <#if djgClientIds??> and djg.id in :djgClientIds @@ -360,6 +364,7 @@ public class SaleOrderService extends BaseService,s.id <#if field == 'productId'>,p.id + <#if field == 'djgClientId'>,djg.id