From c3636d3d77c09a8de21ea2bc585d28c9a175c8e1 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 24 七月 2025 15:19:15 +0800
Subject: [PATCH] yys 修改排序规则
---
src/main/java/com/ruoyi/framework/config/ResourcesConfig.java | 2 ++
src/main/resources/mapper/production/SalesLedgerWorkMapper.xml | 2 +-
src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml | 2 +-
src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml | 8 ++++----
src/main/resources/application.yml | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
index 0bd4da2..396e2a9 100644
--- a/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
@@ -54,6 +54,7 @@
public CorsFilter corsFilter()
{
CorsConfiguration config = new CorsConfiguration();
+ config.setAllowCredentials(true);
// 璁剧疆璁块棶婧愬湴鍧�
config.addAllowedOriginPattern("*");
// 璁剧疆璁块棶婧愯姹傚ご
@@ -68,4 +69,5 @@
// 杩斿洖鏂扮殑CorsFilter
return new CorsFilter(source);
}
+
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a87ef6b..a6ce03c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
# Spring閰嶇疆
spring:
profiles:
- active: prod
\ No newline at end of file
+ active: dev
\ No newline at end of file
diff --git a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
index f6e8f3f..f30adaa 100644
--- a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
@@ -24,7 +24,7 @@
LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id
<where>
- 1 = 1
+ t3.type = 1
<if test="salesLedgerDto.schedulingUserName != null and salesLedgerDto.schedulingUserName != '' ">
AND t4.scheduling_user_uame LIKE CONCAT('%',#{salesLedgerDto.schedulingUserName},'%')
</if>
diff --git a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
index 8a2bb9e..27c0fe7 100644
--- a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
@@ -21,7 +21,7 @@
LEFT join sales_ledger_scheduling t3 on T2.id = t3.sales_ledger_product_id
LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
<where>
- T1.id is not null
+ T1.id is not null and T2.type = 1
<if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
</if>
@@ -60,7 +60,7 @@
sales_ledger_product T2
LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
LEFT join sales_ledger_scheduling t3 on T1.id = t3.sales_ledger_id
- where T1.id is not null
+ where T1.id is not null and T2.type = 1
GROUP BY T2.id
</select>
<select id="listPageProcess" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingProcessDto">
@@ -85,7 +85,7 @@
LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
left join sales_ledger_product t3 on T2.sales_ledger_product_id = t3.id
<where>
- 1 = 1
+ t3.type = 1
<if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
AND T2.status = #{salesLedgerDto.status}
</if>
@@ -108,6 +108,6 @@
AND T2.scheduling_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
</if>
</where>
- order by T2.update_time desc
+ order by T2.status asc
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml b/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml
index 5e9507b..41cbe07 100644
--- a/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml
@@ -25,7 +25,7 @@
LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id
<where>
- 1 = 1
+ t3.type = 1
<if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
AND t4.status = #{salesLedgerDto.status}
</if>
--
Gitblit v1.9.3