相关bug修改

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -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 {

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> {
 }

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,8 +9,7 @@ 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 映射

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> {
 }

src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml

@@ -33,45 +33,40 @@
     </sql>
 
     <select id="selectGroupedWithPagination" resultType="com.glxp.mipsdl.entity.ctqyy.VYpzsIoInfo">
-    SELECT
-        RECEIPT_NUMBER
-    FROM
-        v_ypzs_io_info
+        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')
+                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 <= DATE_FORMAT(#{udiwmsThrOrderRequest.endTime}, '%Y-%m-%d %H:%i:%S')
+                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 concat('%', #{udiwmsThrOrderRequest.corpName}, '%')
-                or CONSIGNEE_NAME like concat('%', #{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 concat('%', #{udiwmsThrOrderRequest.billNo}, '%')
+                and PHYSIC_CODE LIKE '%' || #{udiwmsThrOrderRequest.billNo} || '%'
             </if>
             <if test="udiwmsThrOrderRequest.busType != null and udiwmsThrOrderRequest.busType != ''">
-            and IO_SORT like concat('%', #{udiwmsThrOrderRequest.busType}, '%')
+                and IO_SORT LIKE '%' || #{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}, '%')
-                )
+                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
+        GROUP BY RECEIPT_NUMBER
+        ORDER BY RECEIPT_NUMBER
     </select>
 </mapper>