From 8d776d133e6e6e3772e63edfb6f2622ee50b942e Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 31 May 2022 14:11:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=E7=AC=AC=E4=B8=89=E6=96=B9=E4=B8=9A=E5=8A=A1=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/BussinessOriginTypeController.java  |  3 +-
 .../api/admin/httpclient/ErpBasicClient.java  |  2 +
 .../BussinessOriginTypeFilterRequest.java     |  1 +
 .../impl/ThrInvWarehouseServiceImpl.java      |  2 +
 .../mapper/basic/BussinessOriginTypeDao.xml   | 12 +++--
 .../mapper/thrsys/ThrInvWarehouseDao.xml      | 50 +++++++++++--------
 6 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java
index 2a60d582..85668991 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java
@@ -157,7 +157,8 @@ public class BussinessOriginTypeController {
                     }
                     if (basicThirdSysBusApiEntities.size() >= 100) {
                         page++;
-                    }
+                    } else
+                        break;
                 } else {
                     break;
                 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java
index f5e0a3a7..cce45a32 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java
@@ -80,6 +80,8 @@ public class ErpBasicClient {
         String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getOrderType";
         UdiwmsBusTypeRequest udiwmsBusTypeRequest = new UdiwmsBusTypeRequest();
         udiwmsBusTypeRequest.setThirdSys(filterBasicThirdSysDetailRequest.getThirdSysFk());
+        udiwmsBusTypeRequest.setPage(filterBasicThirdSysDetailRequest.getPage());
+        udiwmsBusTypeRequest.setLimit(filterBasicThirdSysDetailRequest.getLimit());
         String response = HttpClient.uCloudPost(url, udiwmsBusTypeRequest, basicThirdSysEntity);
         log.info(response);
         try {
diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java
index b45acad6..75441be3 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java
@@ -15,4 +15,5 @@ public class BussinessOriginTypeFilterRequest extends ListPageRequest {
     private String localAction;
     private String lastUpdateTime;
     private Integer corpType;
+    private String key;
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java
index 03d190a4..96e38356 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java
@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -127,6 +128,7 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
                     thrInvWarehouseEntity.setThirdSysFk(thirdSysFk);
                     thrInvWarehouseEntity.setAdvanceType(false); //默认是仓库
                     thrInvWarehouseEntity.setStatus(1);//默认启用
+                    thrInvWarehouseEntity.setUpdateTime(new Date());
                     list.add(thrInvWarehouseEntity);
                 }
                 //插入数据
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml
index 7360f9f0..0f60d1bb 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml
@@ -59,11 +59,16 @@
         <where>
             basic_third_sys_detail.key = 'busTypeQueryUrl' and basic_third_sys_detail.enabled=1
             <if test="name != ''and name != null">
-                AND name LIKE concat(#{name},'%')
+                AND basic_bustype_origin.name LIKE concat(#{name},'%')
             </if>
             <if test="action != ''and action != null">
-                AND action LIKE concat(#{action},'%')
+                AND basic_bustype_origin.action LIKE concat(#{action},'%')
             </if>
+            <if test="key != ''and key != null">
+                AND( (basic_bustype_origin.name LIKE concat(#{key},'%') )or( basic_bustype_origin.action LIKE
+                concat(#{key},'%')) )
+            </if>
+
 
         </where>
     </select>
@@ -79,7 +84,8 @@
         #{enable},
         #{remark},
         #{thirdSys},
-        #{thirdSysName},#{inoutType}
+        #{thirdSysName},
+        #{inoutType}
         )
     </insert>
 
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
index 47a14eb2..670e62bb 100644
--- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
@@ -26,8 +26,8 @@
                 AND isDefault = #{isDefault}
             </if>
             <if test="key != null">
-                and code like concat('%', #{key}, '%')
-                        or `name` like concat('%', #{key}, '%')
+                and (code like concat('%', #{key}, '%')
+                or `name` like concat('%', #{key}, '%'))
             </if>
             <if test="lastUpdateTime != null and lastUpdateTime != ''">
                 <![CDATA[
@@ -70,20 +70,28 @@
                 AND isDefault = #{isDefault}
             </if>
             <if test="thirdSysFk != null">
-            AND thirdSysFk = #{thirdSysFk}
+                AND thirdSysFk = #{thirdSysFk}
             </if>
         </where>
 
     </select>
     <insert id="insertThrInvWarehouse" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity">
-        replace INTO thr_inv_warehouse
+        replace
+        INTO thr_inv_warehouse
         (pid, code, name, advanceType, isDefault,
          status, updateTime, remark, thirdSysFk)
-        values (#{pid}, #{code},
-                #{name}, #{advanceType}, #{isDefault},
-                #{status}, #{updateTime},
-                #{remark}, #{thirdSysFk})
+        values (
+        #{pid},
+        #{code},
+        #{name},
+        #{advanceType},
+        #{isDefault},
+        #{status},
+        #{updateTime},
+        #{remark},
+        #{thirdSysFk}
+        )
     </insert>
 
     <insert id="insertThrInvWarehouses" parameterType="java.util.List">
@@ -163,21 +171,21 @@
     </select>
     <insert id="insertInvWarehouses">
         replace into thr_inv_warehouse (pid, code, name, advanceType, isDefault, status, updateTime, remark, level,
-                                        pcode,
-                                        thirdSysFk)
-                values
+        pcode,
+        thirdSysFk)
+        values
         <foreach collection="thrInvWarehouseEntitys" index="index" item="item" separator=",">
             (#{item.pid},
-             #{item.code},
-             #{item.name},
-             #{item.advanceType},
-             #{item.isDefault},
-             #{item.status},
-             #{item.updateTime},
-             #{item.remark},
-             #{item.level},
-             #{item.pcode},
-             #{item.thirdSysFk})
+            #{item.code},
+            #{item.name},
+            #{item.advanceType},
+            #{item.isDefault},
+            #{item.status},
+            #{item.updateTime},
+            #{item.remark},
+            #{item.level},
+            #{item.pcode},
+            #{item.thirdSysFk})
         </foreach>
     </insert>
 </mapper>
\ No newline at end of file