From 7bbaff0cf4218c88db95297af621cc06f4807c6a Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Tue, 13 Dec 2022 15:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 46 +++++++++++++++++++
 .../groundbooking/groundbooking-mapper.xml    | 10 +++-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 37971c7..544c7da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,8 +167,54 @@
     <build>
         <plugins>
             <plugin>
+                <!-- 打包时去除第三方依赖 -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <layout>ZIP</layout>
+                    <includes>
+                        <include>
+                            <groupId>non-exists</groupId>
+                            <artifactId>non-exists</artifactId>
+                        </include>
+                    </includes>
+                </configuration>
+            </plugin>
+            <!-- 拷贝第三方依赖文件到指定目录 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <!-- target/lib 是依赖jar包的输出目录，根据自己喜好配置 -->
+                            <outputDirectory>target/lib</outputDirectory>
+                            <excludeTransitive>false</excludeTransitive>
+                            <stripVersion>false</stripVersion>
+                            <includeScope>runtime</includeScope>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- 排除静态资源，静态资源自行拷贝 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*.properties</exclude>
+                        <exclude>**/*.xml</exclude>
+                        <exclude>**/*.yml</exclude>
+                        <exclude>static/**</exclude>
+                        <exclude>templates/**</exclude>
+                        <exclude>mybatis/**</exclude>
+                    </excludes>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/src/main/resources/mybatis/mapper/venuebooking/groundbooking/groundbooking-mapper.xml b/src/main/resources/mybatis/mapper/venuebooking/groundbooking/groundbooking-mapper.xml
index d534b18..1baef11 100644
--- a/src/main/resources/mybatis/mapper/venuebooking/groundbooking/groundbooking-mapper.xml
+++ b/src/main/resources/mybatis/mapper/venuebooking/groundbooking/groundbooking-mapper.xml
@@ -175,7 +175,15 @@
             AND t1.order_type = '1'
         </if>
         GROUP BY
-            t1.ground_booking_id
+            t1.ground_booking_id,
+            t1.serial,
+            t1.venues_name,
+            t1.project_name,
+            t1.order_type,
+            t1.gmt_create,
+            t2.venue_panorama,
+            t3.price,
+            t3.booking_item_id
         ORDER BY
             t1.order_type ASC,t1.gmt_create DESC
     </select>