From 3ff13676289528fde6f99851ebe472db036b2bf4 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 10 Jan 2024 14:18:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=B0=83=E5=B9=B3=E5=8F=B0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=87=BA=E5=85=A5=E5=BA=93=E6=96=B0=E5=A2=9E=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoOrderDetailResultController.java  | 16 ++++-----
 .../api/dao/inout/IoOrderDetailResultDao.java |  3 ++
 .../impl/IoOrderDetailResultServiceImpl.java  |  5 ++-
 .../mybatis/mapper/inout/IoOrderDao.xml       |  6 ++--
 .../mapper/inout/IoOrderDetailResultDao.xml   | 33 +++++++++++++++++++
 5 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
index 22f6f89c3..7dd992c31 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
@@ -385,14 +385,14 @@ public class IoOrderDetailResultController extends BaseController {
                     cptTraceResultResponse.setInOutType(2);
                     cptTraceResultResponse.setFromCorp(authCompany.getName());
                     cptTraceResultResponse.setFromCorpCreditNum(authCompany.getCreditCode());
-
-                    //往来单位为病人
-                    if (cptTraceOrderResponse.getCorpType() == 1 && cptTraceOrderResponse.getOutType() == 1) {
-                        cptTraceResultResponse.setToUserInfo(cptTraceOrderResponse.getFromCorpName());
-                    } else {
-                        cptTraceResultResponse.setToCorp(cptTraceOrderResponse.getFromCorpName());
-                        cptTraceResultResponse.setToCorpCreditNum(cptTraceOrderResponse.getCreditNo());
-                    }
+                    cptTraceResultResponse.setToCorp(cptTraceOrderResponse.getFromCorpName());
+                    cptTraceResultResponse.setToCorpCreditNum(cptTraceOrderResponse.getCreditNo());
+//                    //往来单位为病人
+//                    if (cptTraceOrderResponse.getCorpType() == 1 && cptTraceOrderResponse.getOutType() == 1) {
+//                        cptTraceResultResponse.setToUserInfo(cptTraceOrderResponse.getFromCorpName());
+//                    } else {
+//
+//                    }
                 } else {
                     cptTraceResultResponse.setInOutType(1);
                     cptTraceResultResponse.setFromCorp(cptTraceOrderResponse.getFromCorpName());
diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java
index 40633bcb6..a110267bb 100644
--- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java
+++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java
@@ -37,4 +37,7 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus<IoOrderDetailBizD
     List<IoOrderDetailStatRsponse> selectStatDataByTime(@Param("list") List<String> orderIdFk);
 
     List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest);
+
+
+    List<CptTraceOrderResponse> cptCodeTrace(CptTraceRequest cptTraceRequest);
 }
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
index 1773f7d73..649d073b3 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
@@ -76,6 +76,9 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
 
     @Override
     public List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest) {
-        return orderDetailResultDao.cptTrace(cptTraceRequest);
+        if (StrUtil.isNotEmpty(cptTraceRequest.getSerialNo())) {
+            return orderDetailResultDao.cptCodeTrace(cptTraceRequest);
+        } else
+            return orderDetailResultDao.cptTrace(cptTraceRequest);
     }
 }
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 2504ca286..9452a13d5 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -419,7 +419,8 @@
     </select>
 
     <select id="selectUploadOrder" resultType="com.glxp.api.res.inout.IoOrderResponse">
-        select io.*,ioul.result,
+        select io.*,
+               ioul.result,
                (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,
@@ -520,8 +521,7 @@
                      LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action
         WHERE basic_bussiness_type.inStock = 1
           and io_order.`status` = 7
-          AND date_format(io_order.updateTime, '%Y-%m-%d') between date_format(#{lastData}, '%Y-%m-%d') and
-                date_format(#{firstData}, '%Y-%m-%d')
+          AND date_format(io_order.updateTime, '%Y-%m-%d') between date_format(#{firstData}, '%Y-%m-%d') and date_format(#{lastData}, '%Y-%m-%d')
     </select>
 
 
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index 856d9cb14..8cd590109 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -152,4 +152,37 @@
             </if>
         </where>
     </select>
+
+    <select id="cptCodeTrace" parameterType="com.glxp.api.req.inout.CptTraceRequest"
+            resultType="com.glxp.api.res.inout.CptTraceOrderResponse">
+        select io.billNo,
+               io.createTime,
+               io.mainAction,
+               bbt.`name`        billType,
+               basic_corp.`name` fromCorpName,
+               basic_corp.creditNo,
+               io.action,
+               io.fromInvCode,
+               bbt.corpType,
+               iodr.reCount      count
+        from io_code iodr
+                     INNER JOIN io_order io on iodr.orderId = io.billNo
+                     left join basic_corp on io.fromCorp = basic_corp.erpId
+                     INNER JOIN basic_bussiness_type bbt on io.action = bbt.action
+        <where>
+            and bbt.inStock = true
+            <if test="batchNo != null and batchNo != ''">
+                AND iodr.batchNo = #{batchNo}
+            </if>
+            <if test="diList != null and diList.size() != 0">
+                AND iodr.`nameCode` in
+                <foreach collection="diList" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="serialNo != null and serialNo != ''">
+                AND iodr.serialNo = #{serialNo}
+            </if>
+        </where>
+    </select>
 </mapper>