lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-07-25 07:07:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(PurchaseOrder, SaleOrder): add djgClientIds field to requests and update services for client information processing

Browse Source
This commit is contained in:
lihongjie0209
2025-10-20 22:18:52 +08:00
parent 9bd08738b2
commit 304650a749
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/lihongjie/coal/purchaseOrder/dto/PurchaseOrderReportRequest.java
View File

@@ -55,6 +55,8 @@ month
private List<String> coalInfoIds;
private List<String> djgClientIds;
private String organizationId;

5
src/main/java/cn/lihongjie/coal/purchaseOrder/service/PurchaseOrderService.java
View File

@@ -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>
<#if field == 'coalInfoId'>,c.id as coal_info_id, max(c.name) as coal_info_name, max(c.code) as coal_info_code </#if>
<#if field == 'djgClientId'>,djg.id as djg_client_id, max(djg.name) as djg_client_name, max(djg.code) as djg_client_code </#if>
</#list>
@@ -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>
<#if coalInfoIds??> and c.id in :coalInfoIds </#if>
<#if djgClientIds??> and djg.id in :djgClientIds </#if>
@@ -370,6 +374,7 @@ public class PurchaseOrderService
<#if field == 'supplierId'>,s.id </#if>
<#if field == 'coalInfoId'>,c.id </#if>
<#if field == 'djgClientId'>,djg.id </#if>
</#list>

2
src/main/java/cn/lihongjie/coal/saleOrder/dto/SaleOrderReportRequest.java
View File

@@ -54,6 +54,8 @@ month
private List<String> productIds;
private List<String> djgClientIds;
private String organizationId;

7
src/main/java/cn/lihongjie/coal/saleOrder/service/SaleOrderService.java
View File

@@ -316,7 +316,8 @@ public class SaleOrderService extends BaseService<SaleOrderEntity, SaleOrderRepo
<#if field == 'supplierId'>,s.id as supplier_id, max(s.name) as supplier_name, max(s.code) as supplier_code </#if>
<#if field == 'productId'>,p.id as product_id, max(p.name) as product_name, max(p.code) as product_code </#if>
<#if field == 'djgClientId'>,djg.id as djg_client_id, max(djg.name) as djg_client_name, max(djg.code) as djg_client_code </#if>
</#list>
<#list fieldInfos as field>
@@ -338,6 +339,7 @@ public class SaleOrderService extends BaseService<SaleOrderEntity, SaleOrderRepo
t_sale_order o
left join t_product p on o.product_info_id = p.id
left join t_supplier s on o.supplier_id = s.id
left join t_supplier djg on o.djg_client_id = djg.id
where 1=1
@@ -350,6 +352,8 @@ public class SaleOrderService extends BaseService<SaleOrderEntity, SaleOrderRepo
<#if supplierIds??> and s.id in :supplierIds </#if>
<#if productIds??> and p.id in :productIds </#if>
<#if djgClientIds??> and djg.id in :djgClientIds </#if>
@@ -360,6 +364,7 @@ public class SaleOrderService extends BaseService<SaleOrderEntity, SaleOrderRepo
<#if field == 'supplierId'>,s.id </#if>
<#if field == 'productId'>,p.id </#if>
<#if field == 'djgClientId'>,djg.id </#if>
</#list>