From 41cf6d7466e9aa4641ab39a138bb09d04a931b17 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 18 Jun 2024 16:00:57 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E7=82=B9=E4=BD=8D=E7=9A=84=E5=AD=90=E5=8D=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/PdmBiSubpackagerelationMapper.java |  2 ++
 .../mapper/PdmBiSubpackagerelationMapper.xml  | 12 +++++++++++
 .../PdmBiSubpackagerelationServiceImpl.java   | 20 +------------------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java
index 315554a65..c269fc620 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java
@@ -28,4 +28,6 @@ public interface PdmBiSubpackagerelationMapper extends BaseMapper<PdmBiSubpackag
                                                                   @Param("status") String status);
 
 
+    List<PdmBiSubpackagerelation> queryContainerNameBySaleOrder( @Param("sale_order_name") String sale_order_name);
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
index b2dd6d33c..032d3abad 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
@@ -72,5 +72,17 @@
             ORDER BY
             MAX(create_time) DESC
     </select>
+    <select id="queryContainerNameBySaleOrder" resultType="org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation">
+            SELECT
+                    a.*,b.*
+            FROM
+                    `pdm_bi_subpackagerelation` a
+                            LEFT JOIN bst_ivt_packageinfoivt b ON a.container_name = b.container_name
+            WHERE
+                    b.point_status = '6'
+              AND a.sale_order_name = #{sale_order_name}
+            ORDER BY  box_group DESC
+    </select>
+
 
 </mapper>
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index bb2774e37..f4c885abc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -153,25 +153,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
      */
     @Override
     public List<PdmBiSubpackagerelation> queryContainerNameBySaleOrder(Map whereJson) {
-        LambdaQueryWrapper<PdmBiSubpackagerelation> queryWrapper = new LambdaQueryWrapper<>();
-        if (whereJson.containsKey("customer_description")) {
-            queryWrapper.like(PdmBiSubpackagerelation::getCustomer_description, whereJson.get("customer_description"));
-        }
-        if (whereJson.containsKey("sale_order_name")) {
-            queryWrapper.eq(PdmBiSubpackagerelation::getSale_order_name, whereJson.get("sale_order_name"));
-        }
-        if (whereJson.containsKey("customer_name")) {
-            queryWrapper.like(PdmBiSubpackagerelation::getCustomer_name, whereJson.get("customer_name"));
-        }
-        if (whereJson.containsKey("status")) {
-            if ("99".equals(whereJson.get("status"))) {
-                queryWrapper.eq(PdmBiSubpackagerelation::getStatus, whereJson.get("status"));
-            } else {
-                queryWrapper.ge(PdmBiSubpackagerelation::getStatus, whereJson.get("status"));
-            }
-        }
-        queryWrapper.orderByDesc(PdmBiSubpackagerelation::getBox_group);
-        List<PdmBiSubpackagerelation> pdmBiSubpackagerelationList = pdmBiSubpackagerelationMapper.selectList(queryWrapper);
+        List<PdmBiSubpackagerelation> pdmBiSubpackagerelationList = pdmBiSubpackagerelationMapper.queryContainerNameBySaleOrder(whereJson.get("sale_order_name").toString());
         Map<String, Long> countByGroup = pdmBiSubpackagerelationList.stream()
                 .filter(item -> item.getBox_group() != null)
                 .collect(Collectors.groupingBy(PdmBiSubpackagerelation::getBox_group, Collectors.counting()));