From 6852f124618c8541d82f3de3cfbc1b11ad86fbbc Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 22:50:36 +0800
Subject: [PATCH] feat: 分页默认20条,销售台账导出去掉项目名称,生产订单关联优化

---
 src/main/java/com/ruoyi/home/controller/HomeController.java             |    2 +-
 src/main/java/com/ruoyi/framework/web/page/TableSupport.java            |    2 +-
 src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java |    2 +-
 src/main/resources/mapper/production/ProductionProductMainMapper.xml    |    4 ++--
 src/main/resources/mapper/production/ProductionOrderMapper.xml          |    8 ++++----
 src/main/java/com/ruoyi/sales/pojo/SalesLedger.java                     |    1 -
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
index ba93fb4..e0faa55 100644
--- a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
+++ b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
@@ -38,7 +38,7 @@
      */
     @GetMapping("/getList")
     public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
-                              @RequestParam(defaultValue = "10") long size, KnowledgeBase knowledgeBase) {
+                              @RequestParam(defaultValue = "20") long size, KnowledgeBase knowledgeBase) {
         Page page = new Page(current, size);
         return AjaxResult.success(knowledgeBaseService.listpage(page, knowledgeBase));
     }
diff --git a/src/main/java/com/ruoyi/framework/web/page/TableSupport.java b/src/main/java/com/ruoyi/framework/web/page/TableSupport.java
index 4f8257b..2233ac8 100644
--- a/src/main/java/com/ruoyi/framework/web/page/TableSupport.java
+++ b/src/main/java/com/ruoyi/framework/web/page/TableSupport.java
@@ -42,7 +42,7 @@
     {
         PageDomain pageDomain = new PageDomain();
         pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1));
-        pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10));
+        pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 20));
         pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
         pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
         pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE));
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 35c3954..6191517 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -254,7 +254,7 @@
                                      @RequestParam(required = false) String status,
                                      @RequestParam(required = false) String bizDate,
                                      @RequestParam(defaultValue = "1") Long pageNum,
-                                     @RequestParam(defaultValue = "10") Long pageSize) {
+                                     @RequestParam(defaultValue = "20") Long pageSize) {
         LocalDate queryDate = parseDateOrNull(bizDate);
         if (!isBlank(bizDate) && queryDate == null) {
             return R.fail("bizDate鏍煎紡閿欒锛岃浣跨敤yyyy-MM-dd");
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index c8a0443..ea82049 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -44,7 +44,6 @@
     /**
      * 椤圭洰鍚嶇О
      */
-    @Excel(name = "椤圭洰鍚嶇О")
     private String projectName;
 
     /**
diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index 67cc55b..2fad070 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -66,8 +66,8 @@
                    group_concat(distinct sl2.project_name order by sl2.project_name separator ',') as projectName,
                    min(sl2.delivery_date) as deliveryDate
             from production_order po2
-                     left join production_plan pp2
-                               on find_in_set(pp2.id, replace(replace(replace(po2.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
+                     join json_table(po2.production_plan_ids, '$[*]' columns(plan_id bigint path '$')) jt
+                     join production_plan pp2 on pp2.id = jt.plan_id
                      left join sales_ledger sl2 on sl2.id = pp2.sales_ledger_id
             group by po2.id
         ) po_sales on po_sales.orderId = po.id
@@ -176,8 +176,8 @@
                    group_concat(distinct sl2.project_name order by sl2.project_name separator ',') as projectName,
                    min(sl2.delivery_date) as deliveryDate
             from production_order po2
-                     left join production_plan pp2
-                               on find_in_set(pp2.id, replace(replace(replace(po2.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
+                     join json_table(po2.production_plan_ids, '$[*]' columns(plan_id bigint path '$')) jt
+                     join production_plan pp2 on pp2.id = jt.plan_id
                      left join sales_ledger sl2 on sl2.id = pp2.sales_ledger_id
             group by po2.id
         ) po_sales on po_sales.orderId = po.id
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index df585f9..06aaea8 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -44,8 +44,8 @@
                    group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as salesContractNo,
                    group_concat(distinct sl2.customer_name order by sl2.customer_name separator ',') as customerName
             from production_order po2
-                     left join production_plan pp2
-                               on find_in_set(pp2.id, replace(replace(replace(po2.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
+                     join json_table(po2.production_plan_ids, '$[*]' columns(plan_id bigint path '$')) jt
+                     join production_plan pp2 on pp2.id = jt.plan_id
                      left join sales_ledger sl2 on sl2.id = pp2.sales_ledger_id
             group by po2.id
         ) po_sales on po_sales.orderId = po.id

--
Gitblit v1.9.3