From f6ca9ee95b57f44a7ff69160f4906e186b017a65 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 21 Apr 2023 15:12:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E7=B3=BB=E7=BB=9F=E6=8E=A5=E5=8F=A3=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/dao/inout/IoOrderDao.java    |  2 +-
 .../mybatis/mapper/inout/IoOrderDao.xml       | 74 ++++++++++---------
 2 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java
index 214169688..7bddac727 100644
--- a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java
+++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java
@@ -65,5 +65,5 @@ public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, Io
      *
      * @return
      */
-    List<String> selectWaitSubmitOrder(String thirdSys);
+    List<String> selectWaitSubmitOrder(@Param("thirdSys") String thirdSys);
 }
\ No newline at end of file
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 4922ca64a..9bd2c4491 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -3,17 +3,17 @@
 <mapper namespace="com.glxp.api.dao.inout.IoOrderDao">
     <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderResponse">
         select io.*,
-        (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
-        (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
-        (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
-        (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
-        (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
-        (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,
-        (select employeeName from auth_user au4 where au4.id = io.checkUser)     checkUserName,
-        (select name from auth_dept ad2 where ad2.code = io.fromDeptCode)        fromDeptName,
-        (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
-        (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
-        (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
+               (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
+               (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
+               (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
+               (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
+               (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
+               (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,
+               (select employeeName from auth_user au4 where au4.id = io.checkUser)     checkUserName,
+               (select name from auth_dept ad2 where ad2.code = io.fromDeptCode)        fromDeptName,
+               (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
+               (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
+               (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
         from io_order as io
         <where>
             <if test="id != null and id != ''">
@@ -21,7 +21,7 @@
             </if>
             <if test="corpName != null and corpName != ''">
                 AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
-                concat('%', #{corpName}, '%')
+                    concat('%', #{corpName}, '%')
             </if>
             <if test="action != null and action != ''">
                 AND action = #{action}
@@ -109,12 +109,12 @@
 
                 <if test="invoiceActions1 == null and invoiceActions2 != null">
                     or (
-                    `action` in
+                        `action` in
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
                     and status = 7
-                    ))
+                        ))
                 </if>
 
                 <if test="invoiceActions1 != null and invoiceActions2 != null">
@@ -123,16 +123,15 @@
                         #{item}
                     </foreach>
                     and status = 10)
-                    or (
-                    `action` in
+                        or (
+                        `action` in
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
                     and status = 7)
-                    )
+                        )
                 </if>
             </if>
-
         </where>
         order by createTime desc
     </select>
@@ -179,7 +178,7 @@
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
-                date_format(#{endTime}, '%Y-%m-%d')
+                    date_format(#{endTime}, '%Y-%m-%d')
             </if>
             <if test="lastUpdateTime != null and lastUpdateTime != ''">
                 <![CDATA[
@@ -199,7 +198,7 @@
                            FROM basic_bussiness_type
                            WHERE supplementOrderType IS NOT NULL
                               OR supplementOrderType
-                                   != '')
+                               != '')
     </select>
 
     <select id="selectBillNos" resultType="com.glxp.api.res.inout.OrderNoResult">
@@ -210,17 +209,17 @@
 
     <select id="selectUploadOrder" resultType="com.glxp.api.res.inout.IoOrderResponse">
         select io.*,
-        (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
-        (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
-        (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
-        (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
-        (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
-        (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,
-        (select employeeName from auth_user au4 where au4.id = io.checkUser)     checkUserName,
-        (select name from auth_dept ad2 where ad2.code = io.fromDeptCode)        fromDeptName,
-        (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
-        (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
-        (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
+               (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
+               (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
+               (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
+               (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
+               (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
+               (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,
+               (select employeeName from auth_user au4 where au4.id = io.checkUser)     checkUserName,
+               (select name from auth_dept ad2 where ad2.code = io.fromDeptCode)        fromDeptName,
+               (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
+               (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
+               (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
         from io_order as io
         <where>
             io.dealStatus = 3
@@ -241,7 +240,7 @@
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
-                date_format(#{endTime}, '%Y-%m-%d')
+                    date_format(#{endTime}, '%Y-%m-%d')
             </if>
             <if test="startTime != null and startTime != '' and (endTime == null or endTime == '')">
                 AND date_format(createTime, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d')
@@ -266,6 +265,15 @@
     </select>
 
     <select id="selectWaitSubmitOrder" resultType="java.lang.String">
-
+        select t.billNo
+        from io_order t
+                 left join thr_system_bus_api t1 on t.action = t1.code
+        <where>
+            t.status = 7
+              and exportStatus = 0
+            <if test="thirdSys != null and thirdSys != ''">
+                AND t1.thirdSys = #{thirdSys}
+            </if>
+        </where>
     </select>
 </mapper>