From b758eadf8398858d250e1d0ce3bb4a73f47e45d7 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 21 八月 2024 15:29:46 +0800
Subject: [PATCH] get product info

---
 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java   |    2 +-
 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java |    6 +++---
 pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml                  |   16 ++++++++++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
index 2dd7d75..5bc6c74 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
@@ -193,10 +193,18 @@
     order by id desc
   </select>
     <select id="selectByOrderId" resultType="com.dy.pmsGlobal.pojoPlt.PltProduct">
-        SELECT p.* FROM
-                (select * from pr_order_item WHERE deleted!=1 AND order_id = #{orderId,jdbcType=BIGINT}) poi,
-                (select * from plt_product  where  deleted!=1) p
-        WHERE poi.pro_id = p.id
+        SELECT
+        <include refid="Join_Column_List">
+            <property name="alias" value="p"/>
+        </include>
+        FROM
+        <if test="orderId != null and orderId != ''">
+            (select * from pr_order_item WHERE deleted!=1 AND order_id = #{orderId,jdbcType=BIGINT}) poi,
+        </if>
+        (select * from plt_product  where  deleted!=1) p
+        <if test="orderId != null and orderId != ''">
+            WHERE poi.pro_id = p.id
+        </if>
         order by id desc
     </select>
   <select id="selectMaxCode" resultType="java.lang.String">
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
index e09023d..67e1afd 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
@@ -135,11 +135,11 @@
      * 鍙牴鎹畂rderId鏌ヨ浜у搧
      * @return
      */
-    @GetMapping(path="selectByOrderId")
+    @GetMapping(path="getProduct")
     @SsoPowerAop(power = "10300000")
     @Log("鍙牴鎹畂rderId鏌ヨ浜у搧")
-    public BaseResponse<List<PltProduct>> selectByOrderId(Long orderId){
-        return BaseResponseUtils.buildSuccess(proSv.selectByOrderId(orderId));
+    public BaseResponse<List<PltProduct>> getProduct(Long orderId){
+        return BaseResponseUtils.buildSuccess(proSv.getProduct(orderId));
     }
 
 
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java
index d2e57f8..c817ff9 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java
@@ -248,7 +248,7 @@
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
         return dao.selectAll(params);
     }
-    public List<PltProduct> selectByOrderId(Long orderId) {
+    public List<PltProduct> getProduct(Long orderId) {
         return dao.selectByOrderId(orderId);
     }
 

--
Gitblit v1.8.0