From d4d53e7a5fe430194f3d9007862326a206e09231 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 7 Mar 2025 15:13:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20xml=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/dev/DeptDeviceDetailDao.xml        |  72 +++++----
 .../mybatis/mapper/inout/IoOrderDao.xml       | 141 ++++++++++++------
 .../mapper/inout/IoOrderInvoiceMapper.xml     |  53 +++++--
 .../mapper/inout/IoOrderMutiMapper.xml        |  19 ++-
 .../mapper/inout/IoOrderMutiSetMapper.xml     |  14 +-
 .../mapper/inout/IoOrderUploadLogDao.xml      |   7 +-
 .../mybatis/mapper/inout/IoStatDayDao.xml     |  13 +-
 .../mapper/inout/IoStatDetailMapper.xml       |  14 +-
 .../mybatis/mapper/inout/IoStatMonthDao.xml   |  14 +-
 .../mybatis/mapper/inout/IoStatQuarterDao.xml |  14 +-
 .../mybatis/mapper/inout/IoStatYearDao.xml    |  12 +-
 .../mybatis/mapper/inout/ReceiveDao.xml       |  42 ++++--
 .../system/SystemPDFTemplateRelevanceDao.xml  |   6 +-
 .../mybatis/mapper/thrsys/ThrDeptDao.xml      |  14 --
 14 files changed, 283 insertions(+), 152 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/dev/DeptDeviceDetailDao.xml b/src/main/resources/mybatis/mapper/dev/DeptDeviceDetailDao.xml
index f7d4e44ba..f9b7f6332 100644
--- a/src/main/resources/mybatis/mapper/dev/DeptDeviceDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/dev/DeptDeviceDetailDao.xml
@@ -7,33 +7,41 @@
     </select>
 
     <select id="filterList" resultType="com.glxp.api.res.dev.DeptDeviceDetailResponse">
-        select t.id,
-               t.deptCode,
-               t.invCode,
-               t.originCode,
-               t.code,
-               t.relId,
-               t.deviceName,
-               t.ggxh,
-               t.batchNo,
-               t.nameCode,
-               t.serialNo,
-               t.productionDate,
-               t.expireDate,
-               t.manufactory,
-               t.measname,
-               t.zczbhhzbapzbh,
-               t.supId,
-               t.supName,
-               t.status,
-               t.addType,
-               t.maTime,
-               t.remark,
-               (select employeeName from auth_user where id = t.createUser) creatUserName,
-               (select employeeName from auth_user where id = t.manager)    managerName,
-               (select `name` from auth_dept where code = t.deptCode)       deptName,
-               (select `name` from auth_warehouse where code = t.invCode)   invName
-        from dept_device_detail t
+                SELECT t.id,
+                       t.deptCode,
+                       t.invCode,
+                       t.originCode,
+                       t.code,
+                       t.relId,
+                       t.deviceName,
+                       t.ggxh,
+                       t.batchNo,
+                       t.nameCode,
+                       t.serialNo,
+                       t.productionDate,
+                       t.expireDate,
+                       t.manufactory,
+                       t.measname,
+                       t.zczbhhzbapzbh,
+                       t.supId,
+                       t.supName,
+                       t.status,
+                       t.addType,
+                       t.maTime,
+                       t.remark,
+                       au_create.employeeName  AS creatUserName,
+                       au_manager.employeeName AS managerName,
+                       ad.name                 AS deptName,
+                       aw.name                 AS invName
+                FROM dept_device_detail AS t
+                             LEFT JOIN
+                             auth_user AS au_create ON au_create.id = t.createUser
+                             LEFT JOIN
+                             auth_user AS au_manager ON au_manager.id = t.manager
+                             LEFT JOIN
+                             auth_dept AS ad ON ad.code = t.deptCode
+                             LEFT JOIN
+                             auth_warehouse AS aw ON aw.code = t.invCode
         <where>
             <if test="deptCode != null and deptCode != ''">
                 AND t.deptCode = #{deptCode}
@@ -92,11 +100,15 @@
     </select>
 
     <select id="selectInspectSet" resultType="com.glxp.api.res.dev.DeviceInspectSetResponse">
-        select (select `name` from auth_dept where code = t.deptCode)     deptName,
-               (select `name` from auth_warehouse where code = t.invCode) invName,
+        SELECT ad.name AS deptName,
+               aw.name AS invName,
                t.deviceName,
                t.code
-        from dept_device_detail t
+        FROM dept_device_detail AS t
+                     LEFT JOIN
+                     auth_dept AS ad ON ad.code = t.deptCode
+                     LEFT JOIN
+                     auth_warehouse AS aw ON aw.code = t.invCode
         where t.code = #{code}
     </select>
 </mapper>
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 368020c31..33c103e42 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -254,29 +254,47 @@
 
 
     <select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderResponse">
-        select io.*,
-        (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,
-        (select employeeName from auth_user au where au.id = io.createUser) createUserName,
-        (select employeeName from auth_user au2 where au2.id = io.updateUser) updateUserName,
-        (select employeeName from auth_user au3 where au3.id = io.reviewUser) reviewUserName,
-        (select employeeName from auth_user au4 where au4.id = io.checkUser) checkUserName,
-        (select name from auth_dept ad2 where ad2.code = io.fromDeptCode) fromDeptName,
-        (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode) fromInvName,
-        (select name from basic_corp bc where bc.erpId = io.fromCorp) fromCorpName,
-        (select name from basic_corp bc where bc.erpId = io.customerId) customerName,
-        (SELECT count(*)
-        FROM io_order_detail_code
-        WHERE io_order_detail_code.orderIdFk = io.billNo
-        and io_order_detail_code.regStatus = 1
-        ) AS allCout,
-        (SELECT count(*)
-        FROM io_order_detail_code
-        WHERE io_order_detail_code.orderIdFk = io.billNo
-        and io_order_detail_code.regStatus = 0
-        ) As partCount
-        from io_order as io
+        SELECT
+            io.*,
+            bbt.name AS billTypeName,
+            ad.name AS deptName,
+            aw.name AS invName,
+            au_create.employeeName AS createUserName,
+            au_update.employeeName AS updateUserName,
+            au_review.employeeName AS reviewUserName,
+            au_check.employeeName AS checkUserName,
+            ad_from.name AS fromDeptName,
+            aw_from.name AS fromInvName,
+            bc_from.name AS fromCorpName,
+            bc_customer.name AS customerName,
+            SUM(CASE WHEN iodc.regStatus = 1 THEN 1 ELSE 0 END) AS allCount,
+            SUM(CASE WHEN iodc.regStatus = 0 THEN 1 ELSE 0 END) AS partCount
+        FROM
+            io_order io
+        LEFT JOIN
+            basic_bussiness_type bbt ON bbt.action = io.action
+        LEFT JOIN
+            auth_dept ad ON ad.code = io.deptCode
+        LEFT JOIN
+            auth_warehouse aw ON aw.code = io.invCode
+        LEFT JOIN
+            auth_user au_create ON au_create.id = io.createUser
+        LEFT JOIN
+            auth_user au_update ON au_update.id = io.updateUser
+        LEFT JOIN
+            auth_user au_review ON au_review.id = io.reviewUser
+        LEFT JOIN
+            auth_user au_check ON au_check.id = io.checkUser
+        LEFT JOIN
+            auth_dept ad_from ON ad_from.code = io.fromDeptCode
+        LEFT JOIN
+            auth_warehouse aw_from ON aw_from.code = io.fromInvCode
+        LEFT JOIN
+            basic_corp bc_from ON bc_from.erpId = io.fromCorp
+        LEFT JOIN
+            basic_corp bc_customer ON bc_customer.erpId = io.customerId
+        LEFT JOIN
+            io_order_detail_code iodc ON iodc.orderIdFk = io.billNo
         <where>
             <if test="billNo != null and billNo != ''">
                 AND billNo like concat(#{billNo}, '%')
@@ -397,6 +415,10 @@
                 </if>
             </if>
         </where>
+        GROUP BY  io.billNo,
+                    bbt.name, ad.name, aw.name, au_create.employeeName, au_update.employeeName,
+                    au_review.employeeName, au_check.employeeName, ad_from.name, aw_from.name,
+                    bc_from.name, bc_customer.name
         <choose>
             <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
                 order by ${orderBy} ${sort}
@@ -467,14 +489,16 @@
 
 
     <select id="selectSupplementOrderList" resultType="com.glxp.api.entity.inout.IoOrderEntity">
-        SELECT *
-        FROM io_order
-        WHERE (supplementNo IS NULL OR supplementNo = '')
-          AND `action` IN (SELECT `action`
-                           FROM basic_bussiness_type
-                           WHERE supplementOrderType IS NOT NULL
-                             and supplementOrderType
-                               != '')
+        SELECT io.*
+        FROM io_order io
+        WHERE (io.supplementNo IS NULL OR io.supplementNo = '')
+          AND EXISTS(
+                SELECT 1
+                FROM basic_bussiness_type bbt
+                WHERE bbt.action = io.action
+                  AND bbt.supplementOrderType IS NOT NULL
+                  AND bbt.supplementOrderType != ''
+                    )
     </select>
 
     <select id="selectBillNos" resultType="com.glxp.api.res.inout.OrderNoResult">
@@ -484,21 +508,46 @@
     </select>
 
     <select id="selectUploadOrder" resultType="com.glxp.api.res.inout.IoOrderResponse">
-        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,
-        (select employeeName from auth_user au where au.id = io.createUser) createUserName,
-        (select employeeName from auth_user au2 where au2.id = io.updateUser) updateUserName,
-        (select employeeName from auth_user au3 where au3.id = io.reviewUser) reviewUserName,
-        (select employeeName from auth_user au4 where au4.id = io.checkUser) checkUserName,
-        (select name from auth_dept ad2 where ad2.code = io.fromDeptCode) fromDeptName,
-        (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode) fromInvName,
-        (select name from basic_corp bc where bc.erpId = io.fromCorp) fromCorpName,
-        (select name from basic_corp bc where bc.erpId = io.customerId) customerName
-        from io_order as io
-        left join io_order_upload_log ioul on io.billNo = ioul.billNo
+        SELECT
+            io.*,
+            ioul.result,
+            bbt.name AS billTypeName,
+            ad.name AS deptName,
+            aw.name AS invName,
+            au_create.employeeName AS createUserName,
+            au_update.employeeName AS updateUserName,
+            au_review.employeeName AS reviewUserName,
+            au_check.employeeName AS checkUserName,
+            ad_from.name AS fromDeptName,
+            aw_from.name AS fromInvName,
+            bc_from.name AS fromCorpName,
+            bc_customer.name AS customerName
+        FROM
+            io_order io
+        LEFT JOIN
+            io_order_upload_log ioul ON io.billNo = ioul.billNo
+        LEFT JOIN
+            basic_bussiness_type bbt ON bbt.action = io.action
+        LEFT JOIN
+            auth_dept ad ON ad.code = io.deptCode
+        LEFT JOIN
+            auth_warehouse aw ON aw.code = io.invCode
+        LEFT JOIN
+            auth_user au_create ON au_create.id = io.createUser
+        LEFT JOIN
+            auth_user au_update ON au_update.id = io.updateUser
+        LEFT JOIN
+            auth_user au_review ON au_review.id = io.reviewUser
+        LEFT JOIN
+            auth_user au_check ON au_check.id = io.checkUser
+        LEFT JOIN
+            auth_dept ad_from ON ad_from.code = io.fromDeptCode
+        LEFT JOIN
+            auth_warehouse aw_from ON aw_from.code = io.fromInvCode
+        LEFT JOIN
+            basic_corp bc_from ON bc_from.erpId = io.fromCorp
+        LEFT JOIN
+            basic_corp bc_customer ON bc_customer.erpId = io.customerId
         <where>
             io.dealStatus = 3
             <if test="billNo != null and billNo != ''">
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
index c4fcb7956..27a9d6b32 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
@@ -139,20 +139,45 @@
 
     <select id="filterByInvoiceCode" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
             resultType="com.glxp.api.res.inout.IoOrderResponse">
-        select io.*,
-        (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,
-        (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
-        (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
-        (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,
-        (select employeeName from auth_user au4 where au4.id = io.checkUser)     checkUserName,
-        (select name from auth_dept ad2 where ad2.code = io.fromDeptCode)        fromDeptName,
-        (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
-        (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
-        (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
-        from io_order as io
-        inner join io_order_invoice ioi on io.billNo = ioi.orderIdFk
+            SELECT
+                io.*,
+                bus.name AS billTypeName,
+                ad.name AS deptName,
+                aw.name AS invName,
+                au_create.employeeName AS createUserName,
+                au_update.employeeName AS updateUserName,
+                au_review.employeeName AS reviewUserName,
+                au_check.employeeName AS checkUserName,
+                ad_from.name AS fromDeptName,
+                aw_from.name AS fromInvName,
+                bc_from.name AS fromCorpName,
+                bc_customer.name AS customerName
+            FROM
+                io_order AS io
+            INNER JOIN
+                io_order_invoice AS ioi ON io.billNo = ioi.orderIdFk
+            LEFT JOIN
+                basic_bussiness_type AS bus ON bus.action = io.action
+            LEFT JOIN
+                auth_dept AS ad ON ad.code = io.deptCode
+            LEFT JOIN
+                auth_warehouse AS aw ON aw.code = io.invCode
+            LEFT JOIN
+                auth_user AS au_create ON au_create.id = io.createUser
+            LEFT JOIN
+                auth_user AS au_update ON au_update.id = io.updateUser
+            LEFT JOIN
+                auth_user AS au_review ON au_review.id = io.reviewUser
+            LEFT JOIN
+                auth_user AS au_check ON au_check.id = io.checkUser
+            LEFT JOIN
+                auth_dept AS ad_from ON ad_from.code = io.fromDeptCode
+            LEFT JOIN
+                auth_warehouse AS aw_from ON aw_from.code = io.fromInvCode
+            LEFT JOIN
+                basic_corp AS bc_from ON bc_from.erpId = io.fromCorp
+            LEFT JOIN
+                basic_corp AS bc_customer ON bc_customer.erpId = io.customerId
         <where>
             <if test="invoiceEncode != null">
                 AND ioi.invoiceEncode = #{invoiceEncode}
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderMutiMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderMutiMapper.xml
index 780470d91..96c11e63b 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderMutiMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderMutiMapper.xml
@@ -5,14 +5,19 @@
     <select id="filterList" parameterType="com.glxp.api.req.inout.IoOrderMutiRequest"
             resultType="com.glxp.api.res.inout.IoOrderMutiResponse">
         SELECT
-        io.*,
-        b1.ggxh,
-        b1.cpmctymc,
-        (SELECT userName FROM auth_user WHERE auth_user.id=io.createUser) as createUserName,
-        (SELECT userName FROM auth_user WHERE auth_user.id=io.auditUser) as auditUserName
+            io.*,
+            b1.ggxh,
+            b1.cpmctymc,
+            au_create.userName AS createUserName,
+            au_audit.userName AS auditUserName
         FROM
-        io_order_muti io
-        LEFT JOIN basic_products b1 on b1.nameCode=io.nameCode
+            io_order_muti io
+        LEFT JOIN
+            basic_products b1 ON b1.nameCode = io.nameCode
+        LEFT JOIN
+            auth_user au_create ON au_create.id = io.createUser
+        LEFT JOIN
+            auth_user au_audit ON au_audit.id = io.auditUser
         <where>
             <if test=" udiCode!= '' and udiCode != null">
                 and io.udiCode = #{udiCode}
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderMutiSetMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderMutiSetMapper.xml
index bfa46a8af..496db8483 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderMutiSetMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderMutiSetMapper.xml
@@ -4,11 +4,17 @@
     <select id="filterList" parameterType="com.glxp.api.req.inout.IoOrderMutiSetRequest"
             resultType="com.glxp.api.res.inout.IoOrderMutiSetResponse">
         SELECT io.*,
-               (SELECT NAME FROM auth_warehouse aw WHERE aw.CODE = io.curInv)                 invName,
-               (SELECT NAME FROM basic_corp bc WHERE bc.erpId = io.fromCorp)                  fromCorpName,
-               (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = io.targetAction) targetActionName
+               a1.NAME  AS invName,
+               bc.NAME  AS fromCorpName,
+               bus.NAME AS targetActionName
         FROM io_order_muti_set io
-        left join auth_warehouse a1 on a1.code=io.curInv
+                     LEFT JOIN
+                     auth_warehouse a1 ON a1.code = io.curInv
+                     LEFT JOIN
+                     basic_corp bc ON bc.erpId = io.fromCorp
+                     LEFT JOIN
+                     basic_bussiness_type bus ON bus.action = io.targetAction
+
         <where>
             <if test=" curInv!= '' and curInv != null">
                 AND a1.name like concat('%', #{curInv}, '%')
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml
index f444a5a1d..b82de9941 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml
@@ -28,8 +28,11 @@
     </sql>
 
     <select id="filterList" resultType="com.glxp.api.res.thrsys.ThrOrderUploadLogResponse">
-        select log.*, (select `name` from basic_bussiness_type where action = log.billType) billTypeName
-        from io_order_upload_log log
+        SELECT log.*,
+               bbt.name AS billTypeName
+        FROM io_order_upload_log log
+                     LEFT JOIN
+                     basic_bussiness_type bbt ON bbt.action = log.billType
         <where>
             <if test="billNo != null and billNo != ''">
                 AND log.billNo like concat('%', #{billNo}, '%')
diff --git a/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml
index 87a47b376..ffe7c1717 100644
--- a/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoStatDayDao">
     <select id="filterList" resultType="com.glxp.api.entity.inout.IoStatDayEntity">
-        select *, 	( SELECT NAME FROM auth_dept WHERE io_stat_day.deptCode = auth_dept.CODE ) deptName
-        from io_stat_day
+        SELECT io_stat_day.*,
+               ad.NAME AS deptName
+        FROM io_stat_day
+                     LEFT JOIN
+                     auth_dept ad ON io_stat_day.deptCode = ad.CODE
         <where>
             <if test="recordKey != null and recordKey != ''">
                 AND recordKeyFk = #{recordKey}
@@ -21,7 +24,11 @@
     </select>
 
     <select id="filterListByRecordKey" resultType="com.glxp.api.entity.inout.IoStatDayEntity">
-        select *, 	( SELECT NAME FROM auth_dept WHERE io_stat_day.deptCode = auth_dept.CODE ) deptName
+        SELECT io_stat_day.*,
+               ad.NAME AS deptName
+        FROM io_stat_day
+                     LEFT JOIN
+                     auth_dept ad ON io_stat_day.deptCode = ad.CODE
         from io_stat_day
         where recordKeyFk = #{recordKey}
     </select>
diff --git a/src/main/resources/mybatis/mapper/inout/IoStatDetailMapper.xml b/src/main/resources/mybatis/mapper/inout/IoStatDetailMapper.xml
index 123c066fe..d1082f05a 100644
--- a/src/main/resources/mybatis/mapper/inout/IoStatDetailMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoStatDetailMapper.xml
@@ -33,8 +33,11 @@
     </sql>
 
     <select id="filterList" resultType="com.glxp.api.entity.inout.IoStatDetailEntity">
-        select *, (SELECT NAME FROM auth_warehouse WHERE io_stat_detail.invCode = auth_warehouse.code) invName
-        from io_stat_detail
+        SELECT io_stat_detail.*,
+               aw.NAME AS invName
+        FROM io_stat_detail
+                     LEFT JOIN
+                     auth_warehouse aw ON io_stat_detail.invCode = aw.code
         <where>
             <if test="recordKey != null and recordKey != ''">
                 AND recordKeyFk = #{recordKey}
@@ -52,8 +55,11 @@
     </select>
 
     <select id="filterListByRecordKey" resultType="com.glxp.api.entity.inout.IoStatDetailEntity">
-        select *, (SELECT NAME FROM auth_warehouse WHERE io_stat_detail.invCode = auth_warehouse.code) invName
-        from io_stat_detail
+        SELECT io_stat_detail.*,
+               aw.NAME AS invName
+        FROM io_stat_detail
+                     LEFT JOIN
+                     auth_warehouse aw ON io_stat_detail.invCode = aw.code
         where recordKeyFk = #{recordKey}
     </select>
 </mapper>
diff --git a/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml
index f5aae9dfe..c7e634793 100644
--- a/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoStatMonthDao">
     <select id="filterList" resultType="com.glxp.api.entity.inout.IoStatMonthEntity">
-        select *, 	( SELECT NAME FROM auth_dept WHERE io_stat_month.deptCode = auth_dept.CODE ) deptName
-        from io_stat_month
+        SELECT io_stat_month.*,
+               ad.NAME AS deptName
+        FROM io_stat_month
+                     LEFT JOIN
+                     auth_dept ad ON io_stat_month.deptCode = ad.CODE
         <where>
             <if test="recordKey != null and recordKey != ''">
                 AND recordKeyFk = #{recordKey}
@@ -20,8 +23,11 @@
         </where>
     </select>
     <select id="filterListByRecordKey" resultType="com.glxp.api.entity.inout.IoStatMonthEntity">
-        select *, 	( SELECT NAME FROM auth_dept WHERE io_stat_month.deptCode = auth_dept.CODE ) deptName
-        from io_stat_month
+        SELECT io_stat_month.*,
+               ad.NAME AS deptName
+        FROM io_stat_month
+                     LEFT JOIN
+                     auth_dept ad ON io_stat_month.deptCode = ad.CODE
         where recordKeyFk = #{recordKey}
     </select>
 </mapper>
diff --git a/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml
index d35d0568f..bbd7ba6ff 100644
--- a/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoStatQuarterDao">
     <select id="filterList" resultType="com.glxp.api.entity.inout.IoStatQuarterEntity">
-        select *, (SELECT NAME FROM auth_dept WHERE io_stat_quarter.deptCode = auth_dept.CODE) deptName
-        from io_stat_quarter
+        SELECT io_stat_quarter.*,
+               ad.NAME AS deptName
+        FROM io_stat_quarter
+                     LEFT JOIN
+                     auth_dept ad ON io_stat_quarter.deptCode = ad.CODE
         <where>
             <if test="recordKey != null and recordKey != ''">
                 AND recordKeyFk = #{recordKey}
@@ -21,8 +24,11 @@
     </select>
 
     <select id="filterListByRecordKey" resultType="com.glxp.api.entity.inout.IoStatQuarterEntity">
-        select *, (SELECT NAME FROM auth_dept WHERE io_stat_quarter.deptCode = auth_dept.CODE) deptName
-        from io_stat_quarter
+        SELECT io_stat_quarter.*,
+               ad.NAME AS deptName
+        FROM io_stat_quarter
+                     LEFT JOIN
+                     auth_dept ad ON io_stat_quarter.deptCode = ad.CODE
         where recordKeyFk = #{recordKey}
     </select>
 </mapper>
diff --git a/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml
index a5360a710..c989d89d4 100644
--- a/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml
@@ -2,8 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoStatYearDao">
     <select id="filterList" resultType="com.glxp.api.entity.inout.IoStatYearEntity">
-        select *, 	( SELECT NAME FROM auth_dept WHERE io_stat_year.deptCode = auth_dept.CODE ) deptName
-        from io_stat_year
+        SELECT io_stat_year.*,
+               ad.NAME AS deptName
+        FROM io_stat_year
+        LEFT JOIN auth_dept ad ON io_stat_year.deptCode = ad.CODE
         <where>
             <if test="recordKey != null and recordKey != ''">
                 AND recordKeyFk = #{recordKey}
@@ -21,8 +23,10 @@
     </select>
 
     <select id="filterListByRecordKey" resultType="com.glxp.api.entity.inout.IoStatYearEntity">
-        select *, 	( SELECT NAME FROM auth_dept WHERE io_stat_year.deptCode = auth_dept.CODE ) deptName
-        from io_stat_year
+        SELECT io_stat_year.*,
+               ad.NAME AS deptName
+        FROM io_stat_year
+        LEFT JOIN auth_dept ad ON io_stat_year.deptCode = ad.CODE
         where recordKeyFk = #{recordKey}
     </select>
 </mapper>
diff --git a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml
index ea0e87d27..a70fc1366 100644
--- a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml
@@ -2,18 +2,36 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.ReceiveDao">
     <select id="filterList" resultType="com.glxp.api.res.inout.ReceiveResponse">
-        select IFNULL(saf.status,1) as flowStatus,saf.updateTime as flowAuditTime,
-        io.*,
-               ( SELECT originName FROM basic_bustype_change bus WHERE bus.originAction = io.billType ) 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,
-               (select employeeName from auth_user au where au.id = io.createUser)        createUserName,
-               (select employeeName from auth_user au2 where au2.id = io.updateUser)      updateUserName,
-               (select employeeName from auth_user au3 where au3.id = io.auditUser)       auditUserName,
-               (select name from auth_dept ad2 where ad2.code = io.targetDeptCode)        targetDeptName,
-               (select name from auth_warehouse aw2 where aw2.code = io.targetInvCode)   targetInvName
-        from pur_receive as io
-        Left Join sys_approval_flow as saf ON io.approvalFlowId = saf.id
+        SELECT IFNULL(saf.status, 1)  AS flowStatus,
+               saf.updateTime         AS flowAuditTime,
+               io.*,
+               bus.originName         AS billTypeName,
+               ad.name                AS deptName,
+               aw.name                AS invName,
+               au_create.employeeName AS createUserName,
+               au_update.employeeName AS updateUserName,
+               au_audit.employeeName  AS auditUserName,
+               ad_target.name         AS targetDeptName,
+               aw_target.name         AS targetInvName
+        FROM pur_receive AS io
+         LEFT JOIN
+         sys_approval_flow AS saf ON io.approvalFlowId = saf.id
+         LEFT JOIN
+         basic_bustype_change AS bus ON bus.originAction = io.billType
+         LEFT JOIN
+         auth_dept AS ad ON ad.code = io.deptCode
+         LEFT JOIN
+         auth_warehouse AS aw ON aw.code = io.invCode
+         LEFT JOIN
+         auth_user AS au_create ON au_create.id = io.createUser
+         LEFT JOIN
+         auth_user AS au_update ON au_update.id = io.updateUser
+         LEFT JOIN
+         auth_user AS au_audit ON au_audit.id = io.auditUser
+         LEFT JOIN
+         auth_dept AS ad_target ON ad_target.code = io.targetDeptCode
+         LEFT JOIN
+         auth_warehouse AS aw_target ON aw_target.code = io.targetInvCode
         <where>
             <if test="billType != null and billType != ''">
                 AND billType = #{billType}
diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml
index 098077493..1f7d1f17b 100644
--- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml
@@ -21,10 +21,8 @@
         sys_pdf_template_relevance.remark3,
         printType
         from basic_bussiness_type
-        LEFT JOIN sys_pdf_template_relevance
-        on basic_bussiness_type.action = sys_pdf_template_relevance.localAction
-        LEFT JOIN sys_pdf_template
-        on sys_pdf_template_relevance.templateId = sys_pdf_template.id
+        LEFT JOIN sys_pdf_template_relevance on basic_bussiness_type.action = sys_pdf_template_relevance.localAction
+        LEFT JOIN sys_pdf_template on sys_pdf_template_relevance.templateId = sys_pdf_template.id
         <where>
             <if test="moduleId != null">
                 AND `moduleId` = #{moduleId}
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml
index 911e382bc..2ff056e75 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml
@@ -99,20 +99,6 @@
         )
     </insert>
 
-<!--    <insert id="insertThrDeptList" parameterType="java.util.List">-->
-<!--        replace INTO thr_dept-->
-<!--        (pid, code, name, advanceType, isDefault,-->
-<!--        status, updateTime, remark, thirdSysFk)-->
-<!--        VALUES-->
-<!--        <foreach collection="thrDeptEntities" item="item" index="index"-->
-<!--                 separator=",">-->
-<!--            (-->
-<!--            #{item.pid}, #{item.code},-->
-<!--            #{item.name}, #{item.advanceType}, #{item.isDefault},-->
-<!--            #{item.status}, #{item.updateTime},-->
-<!--            #{item.remark}, #{item.thirdSysFk})-->
-<!--        </foreach>-->
-<!--    </insert>-->
 
     <delete id="deleteById" parameterType="Map">
         DELETE