From 699974a05ec1677fe2d384fb6cf4c4e4cab7cf40 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 26 Feb 2023 20:33:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=85=B3=E8=81=94=E4=BF=AE=E6=94=B9=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thrsys/ThrSystemController.java           |  7 --
 .../mapper/thrsys/ThrSystemBusApiDao.xml      | 83 ++++++++++---------
 src/main/resources/schemas/schema_v2.1.sql    |  1 +
 3 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java
index 66918de16..74ee0ac5c 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java
@@ -272,13 +272,6 @@ public class ThrSystemController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
 
-        //todo 第三方单据类型还未完成
-//        BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.finByLocalAction(basicThirdSysBusApiEntity.getCode());
-//        if (bussinessOriginTypeResponse != null) {
-//            basicThirdSysBusApiEntity.setThirdBuyCode(bussinessOriginTypeResponse.getThirdAction());
-//            basicThirdSysBusApiEntity.setThirdBuyName(bussinessOriginTypeResponse.getThirdName());
-//        }
-
         boolean result = thrSystemBusApiService.saveBusTypes(thrSystemBusApiEntity);
         if (result) {
             return ResultVOUtils.success();
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml
index 96adac443..5726b786a 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml
@@ -2,25 +2,42 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
 <mapper namespace="com.glxp.api.dao.thrsys.ThrSystemBusApiDao">
-
     <update id="updateSysBusApi" parameterType="com.glxp.api.entity.thrsys.ThrSystemBusApiEntity">
         UPDATE thr_system_bus_api
         <trim prefix="set" suffixOverrides=",">
-            <if test="code != null">code=#{code},</if>
-            <if test="name != null">`name`=#{name},</if>
-            <if test="thirdBuyName != null">`thirdBuyName`=#{thirdBuyName},</if>
-            <if test="thirdBuyCode != null">`thirdBuyCode`=#{thirdBuyCode},</if>
-            <if test="thirdSys != null">thirdSys=#{thirdSys},</if>
-            <if test="url != null">url=#{url},</if>
-            <if test="type != null">`type`=#{type},</if>
-            <if test="remark != null">remark=#{remark},</if>
+            <if test="code != null">
+                code=#{code},
+            </if>
+            <if test="name != null">
+                `name`=#{name},
+            </if>
+            <if test="thirdBuyName != null">
+                `thirdBuyName`=#{thirdBuyName},
+            </if>
+            <if test="thirdBuyCode != null">
+                `thirdBuyCode`=#{thirdBuyCode},
+            </if>
+            <if test="thirdSys != null">
+                thirdSys=#{thirdSys},
+            </if>
+            <if test="url != null">
+                url=#{url},
+            </if>
+            <if test="type != null">
+                `type`=#{type},
+            </if>
+            <if test="remark != null">
+                remark=#{remark},
+            </if>
         </trim>
-        WHERE id=#{id}
+        WHERE id = #{id}
     </update>
 
     <select id="filterSysBusApi" parameterType="com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest"
             resultType="com.glxp.api.entity.thrsys.ThrSystemBusApiEntity">
-        SELECT * FROM thr_system_bus_api
+        SELECT thr_system_bus_api.*, tbo.name thirdBuyName
+        FROM thr_system_bus_api
+                 left join thr_bustype_origin tbo on thr_system_bus_api.thirdBuyCode = tbo.action
         <where>
             <if test="key != '' and key != null">
                 AND code = #{code}
@@ -31,11 +48,8 @@
             <if test="code != '' and code != null">
                 AND code = #{code}
             </if>
-            <if test="name != '' and name != null">
-                AND name = #{name}
-            </if>
             <if test="thirdSysFk != '' and thirdSysFk != null">
-                AND thirdSys = #{thirdSysFk}
+                AND thr_system_bus_api.thirdSys = #{thirdSysFk}
             </if>
         </where>
     </select>
@@ -44,33 +58,29 @@
     <insert id="insertSysBusApi" keyProperty="id"
             parameterType="com.glxp.api.entity.thrsys.ThrSystemBusApiEntity">
         insert
-        ignore
+            ignore
         INTO thr_system_bus_api
-                (`code`, `name`, thirdBuyName, thirdBuyCode, `thirdSys`, url, `type`, remark)
-        values (
-        #{code},
-        #{name},
-        #{thirdBuyName},
-        #{thirdBuyCode},
-        #{thirdSys},
-        #{url},
-        #{type},
-        #{remark}
-        )
+        (`code`, `name`, thirdBuyName, thirdBuyCode, `thirdSys`, url, `type`, remark)
+        values (#{code},
+                #{name},
+                #{thirdBuyName},
+                #{thirdBuyCode},
+                #{thirdSys},
+                #{url},
+                #{type},
+                #{remark})
     </insert>
 
     <insert id="saveBusTypes">
         insert into thr_system_bus_api (code, `name`, thirdBuyName, thirdBuyCode, thirdSys, type)
         values
         <foreach collection="list" index="index" item="item" separator=",">
-            (
-            #{item.code},
-            #{item.name},
-            #{item.thirdBuyName},
-            #{item.thirdBuyCode},
-            #{item.thirdSys},
-            #{item.type}
-            )
+            (#{item.code},
+             #{item.name},
+             #{item.thirdBuyName},
+             #{item.thirdBuyCode},
+             #{item.thirdSys},
+             #{item.type})
         </foreach>
     </insert>
 
@@ -96,5 +106,4 @@
         where thirdSys = #{thirdSys}
           and type = #{type}
     </select>
-
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql
index 46ff18635..4c01a2e75 100644
--- a/src/main/resources/schemas/schema_v2.1.sql
+++ b/src/main/resources/schemas/schema_v2.1.sql
@@ -2,3 +2,4 @@
 CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'fromThrBillNo', 'varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'thirdSysName', 'varchar(255) ', 3);
+CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ', 3);