From de1f9da5633bb09506f4be2220601630cc4d65b2 Mon Sep 17 00:00:00 2001
From: liufeilong <liufeilong@ele-cloud.com>
Date: Sat, 22 Apr 2023 15:04:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B9=E6=8D=AE=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8F=B7=E7=A0=81=E6=9F=A5=E8=AF=A2xtly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consumer/dao/OrderProcessInfoMapper.java     |  2 ++
 .../order/controller/OrderInvoiceController.java |  9 +++++++++
 .../order/service/OrderProcessService.java       |  2 ++
 .../service/impl/OrderProcessServiceImpl.java    |  7 ++++++-
 .../mybatis/mapper/OrderProcessInfoMapper.xml    | 16 ++++++++++++++++
 5 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java
index d77f24fc..d95e780d 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java
@@ -155,4 +155,6 @@ public interface OrderProcessInfoMapper {
      */
     int selectCountByNsrsbhDdzt(@Param("ddztList") List<String> ddztList,
                                 @Param("shList") List<String> shList, @Param("entList") List<String> entList);
+
+    List<Map> getOrderMessageByMap(@Param("map") Map map);
 }
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java
index 59cc5662..a7faecad 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java
@@ -609,5 +609,14 @@ public class OrderInvoiceController {
     public R rewriteBzdh(@RequestBody RewriteBzdhDTO dto) {
         return bzdhService.rewriteBzdh(dto);
     }
+
+    /**
+     * 页面上有直接调用order-management-invoice模块的接口，这个模块没有order_process_info Mapper
+     * 有时候需要查询一些定制化字段，写此方法弥补这个问题
+     */
+    @PostMapping("/getOrderMessageByMap")
+    public R getOrderMessageByMap(@RequestBody Map map){
+        return R.ok(orderProcessService.getOrderMessageByMap(map));
+    }
 }
 
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java
index 7449fd47..17e5aa43 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java
@@ -149,4 +149,6 @@ public interface OrderProcessService {
      * @date 2021-11-03
      */
     int selectCountByNsrsbhDdzt(List<String> ddztList, List<String> shList, List<String> entList);
+
+    List<Map> getOrderMessageByMap(Map map);
 }
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java
index ccc2ea6b..fedc9aff 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java
@@ -249,5 +249,10 @@ public class OrderProcessServiceImpl implements OrderProcessService {
     public int selectCountByNsrsbhDdzt(List<String> ddztList, List<String> shList, List<String> entList) {
         return orderProcessInfoMapper.selectCountByNsrsbhDdzt(ddztList, shList, entList);
     }
-    
+
+    @Override
+    public List<Map> getOrderMessageByMap(Map map) {
+        return orderProcessInfoMapper.getOrderMessageByMap(map);
+    }
+
 }
diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
index a93384e4..f0347e8d 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
@@ -1303,4 +1303,20 @@
         </if>
 
     </select>
+
+    <select id="getOrderMessageByMap" resultType="java.util.Map"
+            parameterType="java.util.Map">
+        select op.xtly from order_process_info op
+        left join order_invoice_info oii on op.order_info_id = oii.order_info_id
+        <where>
+            <if test="map.fpdm != null and map.fpdm != ''">
+                and oii.fpdm = #{map.fpdm,jdbcType=VARCHAR}
+            </if>
+            <if test="map.fphm != null and map.fphm != ''">
+                and oii.fphm = #{map.fphm,jdbcType=VARCHAR}
+            </if>
+        </where>
+    </select>
+
+
 </mapper>