Forráskód Böngészése

发票管理相关功能修改

yzc 1 éve
szülő
commit
3b26c31649

+ 7 - 9
hx-purchase/src/main/resources/mapper/invoice/InvoiceDetailsMapper.xml

@@ -2,15 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.purchase.mapper.invoice.InvoiceDetailsMapper">
     <select id="getPage" resultType="com.fjhx.purchase.entity.invoice.vo.InvoiceDetailsVo">
-        SELECT
-            t1.*,
-            t2.supply_id AS supplyId,
-            t2.type  AS invoiceType,
-            t3.`code` AS purchaseCode
-        FROM
-            invoice_details t1
-        LEFT JOIN invoice t2 ON t1.invoice_id = t2.id
-        LEFT JOIN purchase t3 ON t3.id = t1.purchase_id
+        SELECT t1.*,
+               t2.supply_id AS supplyId,
+               t2.type      AS invoiceType,
+               t3.`code`    AS purchaseCode
+        FROM invoice_details t1
+                 LEFT JOIN invoice t2 ON t1.invoice_id = t2.id
+                 LEFT JOIN ehsd_purchase t3 ON t3.id = t1.purchase_id
             ${ew.customSqlSegment}
     </select>
 

+ 7 - 14
hx-purchase/src/main/resources/mapper/invoice/InvoiceMapper.xml

@@ -2,20 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.purchase.mapper.invoice.InvoiceMapper">
     <select id="getPage" resultType="com.fjhx.purchase.entity.invoice.vo.InvoiceVo">
-        SELECT
-            *
-        FROM
-            (
-                SELECT
-                    t1.*,
-                    GROUP_CONCAT( t3.`code` ) AS purchaseCodes
-                FROM
-                    invoice t1
-                        LEFT JOIN invoice_details t2 ON t1.id = t2.invoice_id
-                        LEFT JOIN purchase t3 ON t2.purchase_id = t3.id
-                GROUP BY
-                    t1.id
-            ) t1
+        SELECT *
+        FROM (SELECT t1.*,
+                     GROUP_CONCAT(t3.`code`) AS purchaseCodes
+              FROM invoice t1
+                       LEFT JOIN invoice_details t2 ON t1.id = t2.invoice_id
+                       LEFT JOIN ehsd_purchase t3 ON t2.purchase_id = t3.id
+              GROUP BY t1.id) t1
             ${ew.customSqlSegment}
     </select>