From 85ff833b430eb83e5d47f723f301c1f83dc1d19f Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Wed, 18 Sep 2024 14:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/mipsdl/client/ctqyy/CtqyyClient.java |   8 +-
 .../ctqyy/VInsurNationGoodsReturnMapper.java  |   2 +
 .../thirddao/ctqyy/VYpzsIoInfoMapper.java     |   6 +-
 .../ctqyy/VYpzsPresInfoReturnMapper.java      |   2 +
 .../mapper/other/ctqyy/VYpzsIoInfoMapper.xml  | 139 +++++++++---------
 5 files changed, 78 insertions(+), 79 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
index 112d4c5..e1072cf 100644
--- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
@@ -1439,7 +1439,7 @@ public class CtqyyClient extends CommonHttpClient {
 
                 List<String> collect = planInfos.stream().map(VYpzsPlanInfo::getCGDBH).collect(Collectors.toList());
                 LambdaQueryWrapper<VYpzsPlanInfo> wrapper1 = new LambdaQueryWrapper<>();
-                wrapper1.in(VYpzsPlanInfo::getCGDBH,collect);
+                wrapper1.in(VYpzsPlanInfo::getCGDBH, collect);
                 List<VYpzsPlanInfo> vYpzsPlanInfos = vYpzsPlanInfoMapper.selectList(wrapper1);
 
                 Map<String, List<VYpzsPlanInfo>> groupedByBz = vYpzsPlanInfos.stream()
@@ -1507,14 +1507,14 @@ public class CtqyyClient extends CommonHttpClient {
                     .or().like(VYpzsIoInfo::getIO_SORT, keywords)//收货方
             );
 
-            Page<VYpzsIoInfo> page = vYpzsIoInfoMapper.selectGroupedWithPagination( new Page<VYpzsIoInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), udiwmsThrOrderRequest);
+            Page<VYpzsIoInfo> page = vYpzsIoInfoMapper.selectGroupedWithPagination(new Page<VYpzsIoInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), udiwmsThrOrderRequest);
 
             List<VYpzsIoInfo> ioInfos = page.getRecords();
             List<IoCollectOrder> ioCollectOrders = new ArrayList<>();
             if (CollUtil.isNotEmpty(ioInfos)) {
                 List<String> collect = ioInfos.stream().map(VYpzsIoInfo::getRECEIPT_NUMBER).collect(Collectors.toList());
                 LambdaQueryWrapper<VYpzsIoInfo> vYpzsIoInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                vYpzsIoInfoLambdaQueryWrapper.in(VYpzsIoInfo::getRECEIPT_NUMBER,collect);
+                vYpzsIoInfoLambdaQueryWrapper.in(VYpzsIoInfo::getRECEIPT_NUMBER, collect);
                 List<VYpzsIoInfo> vYpzsIoInfos = vYpzsIoInfoMapper.selectList(vYpzsIoInfoLambdaQueryWrapper);
 
                 Map<String, List<VYpzsIoInfo>> groupedByPhysicCode = vYpzsIoInfos.stream()
@@ -1541,7 +1541,7 @@ public class CtqyyClient extends CommonHttpClient {
                     List<IoCollectOrderBiz> bizList = new ArrayList<>();
                     value.forEach(entity -> {
                         IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
-                        BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()));
+                        BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()).last("limit 1"));
                         if (basicUdirelEntity != null) {
                             collectOrderBiz.setRelId(basicUdirelEntity.getId());
                         } else {
diff --git a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VInsurNationGoodsReturnMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VInsurNationGoodsReturnMapper.java
index b129906..6fe3c24 100644
--- a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VInsurNationGoodsReturnMapper.java
+++ b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VInsurNationGoodsReturnMapper.java
@@ -1,9 +1,11 @@
 package com.glxp.mipsdl.thirddao.ctqyy;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsReturn;
 import org.apache.ibatis.annotations.Mapper;
 
+@DS("ctqyySql")
 @Mapper
 public interface VInsurNationGoodsReturnMapper extends BaseMapper<VInsurNationGoodsReturn> {
 }
\ No newline at end of file
diff --git a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsIoInfoMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsIoInfoMapper.java
index 6ec1be8..a72d349 100644
--- a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsIoInfoMapper.java
+++ b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsIoInfoMapper.java
@@ -1,5 +1,6 @@
 package com.glxp.mipsdl.thirddao.ctqyy;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,12 +9,11 @@ import com.glxp.mipsdl.req.base.UdiwmsThrOrderRequest;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
+@DS("ctqyySql")
 @Mapper
 public interface VYpzsIoInfoMapper extends BaseMapper<VYpzsIoInfo> {
     // 使用基本的 MyBatis 注解或 XML 映射
-    Page<VYpzsIoInfo> selectGroupedWithPagination(IPage<VYpzsIoInfo> page, @Param("udiwmsThrOrderRequest")UdiwmsThrOrderRequest udiwmsThrOrderRequest);
+    Page<VYpzsIoInfo> selectGroupedWithPagination(IPage<VYpzsIoInfo> page, @Param("udiwmsThrOrderRequest") UdiwmsThrOrderRequest udiwmsThrOrderRequest);
 
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoReturnMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoReturnMapper.java
index 7e7020f..97e01ec 100644
--- a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoReturnMapper.java
+++ b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoReturnMapper.java
@@ -1,9 +1,11 @@
 package com.glxp.mipsdl.thirddao.ctqyy;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.ctqyy.VYpzsPresInfoReturn;
 import org.apache.ibatis.annotations.Mapper;
 
+@DS("ctqyySql")
 @Mapper
 public interface VYpzsPresInfoReturnMapper extends BaseMapper<VYpzsPresInfoReturn> {
 }
\ No newline at end of file
diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml
index 57c18e7..26dea85 100644
--- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml
@@ -1,77 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.mipsdl.thirddao.ctqyy.VYpzsIoInfoMapper">
-  <resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.ctqyy.VYpzsIoInfo">
-    <!--@mbg.generated-->
-    <!--@Table v_ypzs_io_info-->
-    <result column="RECEIPT_NUMBER" jdbcType="VARCHAR" property="RECEIPT_NUMBER" />
-    <result column="IO_FLAG" jdbcType="CHAR" property="IO_FLAG" />
-    <result column="IO_SORT" jdbcType="INTEGER" property="IO_SORT" />
-    <result column="SORT_NAME" jdbcType="VARCHAR" property="SORT_NAME" />
-    <result column="CONSIGNOR" jdbcType="VARCHAR" property="CONSIGNOR" />
-    <result column="CONSIGNOR_NAME" jdbcType="VARCHAR" property="CONSIGNOR_NAME" />
-    <result column="CONSIGNEE" jdbcType="VARCHAR" property="CONSIGNEE" />
-    <result column="CONSIGNEE_NAME" jdbcType="VARCHAR" property="CONSIGNEE_NAME" />
-    <result column="KEEP_BOOK_TIME" jdbcType="TIMESTAMP" property="KEEP_BOOK_TIME" />
-    <result column="KEEP_BOOK_OPERATOR" jdbcType="VARCHAR" property="KEEP_BOOK_OPERATOR" />
-    <result column="PHYSIC_CODE" jdbcType="VARCHAR" property="PHYSIC_CODE" />
-    <result column="PHYSIC_NAME" jdbcType="VARCHAR" property="PHYSIC_NAME" />
-    <result column="BATCH_NO" jdbcType="VARCHAR" property="BATCH_NO" />
-    <result column="BATCH_NUMBER" jdbcType="BIGINT" property="BATCH_NUMBER" />
-    <result column="QUANTITY" jdbcType="INTEGER" property="QUANTITY" />
-    <result column="PACK_UNIT1" jdbcType="VARCHAR" property="PACK_UNIT1" />
-    <result column="IMPORT_PRICE" jdbcType="DECIMAL" property="IMPORT_PRICE" />
-    <result column="IMPORT_MONEY" jdbcType="DECIMAL" property="IMPORT_MONEY" />
-    <result column="RETAIL_PRICE" jdbcType="DECIMAL" property="RETAIL_PRICE" />
-    <result column="RETAIL_MONEY" jdbcType="DECIMAL" property="RETAIL_MONEY" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    RECEIPT_NUMBER, IO_FLAG, IO_SORT, SORT_NAME, CONSIGNOR, CONSIGNOR_NAME, CONSIGNEE, 
-    CONSIGNEE_NAME, KEEP_BOOK_TIME, KEEP_BOOK_OPERATOR, PHYSIC_CODE, PHYSIC_NAME, BATCH_NO, 
-    BATCH_NUMBER, QUANTITY, PACK_UNIT1, IMPORT_PRICE, IMPORT_MONEY, RETAIL_PRICE, RETAIL_MONEY
-  </sql>
+    <resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.ctqyy.VYpzsIoInfo">
+        <!--@mbg.generated-->
+        <!--@Table v_ypzs_io_info-->
+        <result column="RECEIPT_NUMBER" jdbcType="VARCHAR" property="RECEIPT_NUMBER"/>
+        <result column="IO_FLAG" jdbcType="CHAR" property="IO_FLAG"/>
+        <result column="IO_SORT" jdbcType="INTEGER" property="IO_SORT"/>
+        <result column="SORT_NAME" jdbcType="VARCHAR" property="SORT_NAME"/>
+        <result column="CONSIGNOR" jdbcType="VARCHAR" property="CONSIGNOR"/>
+        <result column="CONSIGNOR_NAME" jdbcType="VARCHAR" property="CONSIGNOR_NAME"/>
+        <result column="CONSIGNEE" jdbcType="VARCHAR" property="CONSIGNEE"/>
+        <result column="CONSIGNEE_NAME" jdbcType="VARCHAR" property="CONSIGNEE_NAME"/>
+        <result column="KEEP_BOOK_TIME" jdbcType="TIMESTAMP" property="KEEP_BOOK_TIME"/>
+        <result column="KEEP_BOOK_OPERATOR" jdbcType="VARCHAR" property="KEEP_BOOK_OPERATOR"/>
+        <result column="PHYSIC_CODE" jdbcType="VARCHAR" property="PHYSIC_CODE"/>
+        <result column="PHYSIC_NAME" jdbcType="VARCHAR" property="PHYSIC_NAME"/>
+        <result column="BATCH_NO" jdbcType="VARCHAR" property="BATCH_NO"/>
+        <result column="BATCH_NUMBER" jdbcType="BIGINT" property="BATCH_NUMBER"/>
+        <result column="QUANTITY" jdbcType="INTEGER" property="QUANTITY"/>
+        <result column="PACK_UNIT1" jdbcType="VARCHAR" property="PACK_UNIT1"/>
+        <result column="IMPORT_PRICE" jdbcType="DECIMAL" property="IMPORT_PRICE"/>
+        <result column="IMPORT_MONEY" jdbcType="DECIMAL" property="IMPORT_MONEY"/>
+        <result column="RETAIL_PRICE" jdbcType="DECIMAL" property="RETAIL_PRICE"/>
+        <result column="RETAIL_MONEY" jdbcType="DECIMAL" property="RETAIL_MONEY"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        RECEIPT_NUMBER, IO_FLAG, IO_SORT, SORT_NAME, CONSIGNOR, CONSIGNOR_NAME, CONSIGNEE,
+        CONSIGNEE_NAME, KEEP_BOOK_TIME, KEEP_BOOK_OPERATOR, PHYSIC_CODE, PHYSIC_NAME, BATCH_NO,
+        BATCH_NUMBER, QUANTITY, PACK_UNIT1, IMPORT_PRICE, IMPORT_MONEY, RETAIL_PRICE, RETAIL_MONEY
+    </sql>
 
-  <select id="selectGroupedWithPagination" resultType="com.glxp.mipsdl.entity.ctqyy.VYpzsIoInfo">
-    SELECT
-        RECEIPT_NUMBER
-    FROM
-        v_ypzs_io_info
-    <where>
-        <if test="udiwmsThrOrderRequest.startTime != null">
-            <![CDATA[
-            and KEEP_BOOK_TIME >= DATE_FORMAT(#{udiwmsThrOrderRequest.startTime}, '%Y-%m-%d %H:%i:%S')
-            ]]>
-        </if>
-        <if test="udiwmsThrOrderRequest.endTime != null">
-            <![CDATA[
-            and KEEP_BOOK_TIME <= DATE_FORMAT(#{udiwmsThrOrderRequest.endTime}, '%Y-%m-%d %H:%i:%S')
-            ]]>
-        </if>
-        <if test="udiwmsThrOrderRequest.corpName != null and udiwmsThrOrderRequest.corpName != ''">
-            and (CONSIGNOR_NAME like concat('%', #{udiwmsThrOrderRequest.corpName}, '%')
-                or CONSIGNEE_NAME like concat('%', #{udiwmsThrOrderRequest.corpName}, '%')
-                )
-        </if>
-        <if test="udiwmsThrOrderRequest.billNo != null and udiwmsThrOrderRequest.billNo != ''">
-            and PHYSIC_CODE like concat('%', #{udiwmsThrOrderRequest.billNo}, '%')
-        </if>
-        <if test="udiwmsThrOrderRequest.busType != null and udiwmsThrOrderRequest.busType != ''">
-            and IO_SORT like concat('%', #{udiwmsThrOrderRequest.busType}, '%')
-        </if>
-
-        <if test="udiwmsThrOrderRequest.keyWords != null and udiwmsThrOrderRequest.keyWords != ''">
-            and (KEEP_BOOK_TIME like concat('%', #{udiwmsThrOrderRequest.keyWords}, '%')
-                or CONSIGNOR_NAME like concat('%', #{udiwmsThrOrderRequest.keyWords}, '%')
-                or CONSIGNEE_NAME like concat('%', #{udiwmsThrOrderRequest.keyWords}, '%')
-                or PHYSIC_CODE like concat('%', #{udiwmsThrOrderRequest.keyWords}, '%')
-                or IO_SORT like concat('%', #{udiwmsThrOrderRequest.keyWords}, '%')
-                )
-        </if>
-    </where>
-    GROUP BY
-        RECEIPT_NUMBER
-    ORDER BY
-        RECEIPT_NUMBER
-</select>
+    <select id="selectGroupedWithPagination" resultType="com.glxp.mipsdl.entity.ctqyy.VYpzsIoInfo">
+        SELECT RECEIPT_NUMBER
+        FROM v_ypzs_io_info
+        <where>
+            <if test="udiwmsThrOrderRequest.startTime != null">
+                <![CDATA[
+                and KEEP_BOOK_TIME >= TO_DATE(#{udiwmsThrOrderRequest.startTime}
+                  , 'YYYY-MM-DD HH24:MI:SS')
+                ]]>
+            </if>
+            <if test="udiwmsThrOrderRequest.endTime != null">
+                <![CDATA[
+                and KEEP_BOOK_TIME <= TO_DATE(#{udiwmsThrOrderRequest.endTime}
+                  , 'YYYY-MM-DD HH24:MI:SS')
+                ]]>
+            </if>
+            <if test="udiwmsThrOrderRequest.corpName != null and udiwmsThrOrderRequest.corpName != ''">
+                and (CONSIGNOR_NAME LIKE '%' || #{udiwmsThrOrderRequest.corpName} || '%'
+                 or CONSIGNEE_NAME LIKE '%' || #{udiwmsThrOrderRequest.corpName} || '%')
+            </if>
+            <if test="udiwmsThrOrderRequest.billNo != null and udiwmsThrOrderRequest.billNo != ''">
+                and PHYSIC_CODE LIKE '%' || #{udiwmsThrOrderRequest.billNo} || '%'
+            </if>
+            <if test="udiwmsThrOrderRequest.busType != null and udiwmsThrOrderRequest.busType != ''">
+                and IO_SORT LIKE '%' || #{udiwmsThrOrderRequest.busType} || '%'
+            </if>
+            <if test="udiwmsThrOrderRequest.keyWords != null and udiwmsThrOrderRequest.keyWords != ''">
+                and (KEEP_BOOK_TIME LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
+                 or CONSIGNOR_NAME LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
+                 or CONSIGNEE_NAME LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
+                 or PHYSIC_CODE LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
+                 or IO_SORT LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%')
+            </if>
+        </where>
+        GROUP BY RECEIPT_NUMBER
+        ORDER BY RECEIPT_NUMBER
+    </select>
 </mapper>
\ No newline at end of file