From afd4c62e089f746fdb7d0c3a97ac6581c61f0c85 Mon Sep 17 00:00:00 2001
From: ymnets <ymnets@qq.com>
Date: Tue, 12 Nov 2024 18:29:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=A1=A8=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JAVA_MYSQL_HCJXJY/pom.xml                       |  1 +
 JAVA_MYSQL_WEBSITE/.idea/workspace.xml          | 17 ++++++++++++++---
 .../com/hc/business/dto/ZccmQrAccessoryDto.java |  2 ++
 .../resources/mapper/ZccmQrAccessoryMapper.xml  |  5 +++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/JAVA_MYSQL_HCJXJY/pom.xml b/JAVA_MYSQL_HCJXJY/pom.xml
index b7c900f..9567017 100644
--- a/JAVA_MYSQL_HCJXJY/pom.xml
+++ b/JAVA_MYSQL_HCJXJY/pom.xml
@@ -57,6 +57,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/JAVA_MYSQL_WEBSITE/.idea/workspace.xml b/JAVA_MYSQL_WEBSITE/.idea/workspace.xml
index 41cfd5e..8bce958 100644
--- a/JAVA_MYSQL_WEBSITE/.idea/workspace.xml
+++ b/JAVA_MYSQL_WEBSITE/.idea/workspace.xml
@@ -5,8 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ef55dc1b-11d9-4203-81db-14a06469a368" name="更改" comment="">
+      <change beforePath="$PROJECT_DIR$/../JAVA_MYSQL_HCJXJY/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../JAVA_MYSQL_HCJXJY/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/model/jwt/GenerateAuthToken.java" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/model/jwt/GenerateAuthToken.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -104,6 +104,9 @@
       <workItem from="1731032769092" duration="2196000" />
       <workItem from="1731377023673" duration="87000" />
       <workItem from="1731380730161" duration="209000" />
+      <workItem from="1731396372121" duration="90000" />
+      <workItem from="1731396540755" duration="630000" />
+      <workItem from="1731404423787" duration="15000" />
     </task>
     <task id="LOCAL-00001" summary="更改表名字">
       <created>1730470371982</created>
@@ -140,7 +143,14 @@
       <option name="project" value="LOCAL" />
       <updated>1731049473645</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="测试修正">
+      <created>1731396452654</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1731396452654</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -150,6 +160,7 @@
     <MESSAGE value="更改表名字" />
     <MESSAGE value="官网优化" />
     <MESSAGE value="1" />
-    <option name="LAST_COMMIT_MESSAGE" value="1" />
+    <MESSAGE value="测试修正" />
+    <option name="LAST_COMMIT_MESSAGE" value="测试修正" />
   </component>
 </project>
\ No newline at end of file
diff --git a/JAVA_MYSQL_ZC/jxjy-business/src/main/java/com/hc/business/dto/ZccmQrAccessoryDto.java b/JAVA_MYSQL_ZC/jxjy-business/src/main/java/com/hc/business/dto/ZccmQrAccessoryDto.java
index e94bd75..71007bc 100644
--- a/JAVA_MYSQL_ZC/jxjy-business/src/main/java/com/hc/business/dto/ZccmQrAccessoryDto.java
+++ b/JAVA_MYSQL_ZC/jxjy-business/src/main/java/com/hc/business/dto/ZccmQrAccessoryDto.java
@@ -36,6 +36,8 @@ public class ZccmQrAccessoryDto {
      */
     private Integer chapterId;
 
+    private String chapterName;
+
     /**
      * 文件名
      */
diff --git a/JAVA_MYSQL_ZC/jxjy-business/src/main/resources/mapper/ZccmQrAccessoryMapper.xml b/JAVA_MYSQL_ZC/jxjy-business/src/main/resources/mapper/ZccmQrAccessoryMapper.xml
index 63a2a38..9c9885e 100644
--- a/JAVA_MYSQL_ZC/jxjy-business/src/main/resources/mapper/ZccmQrAccessoryMapper.xml
+++ b/JAVA_MYSQL_ZC/jxjy-business/src/main/resources/mapper/ZccmQrAccessoryMapper.xml
@@ -25,9 +25,10 @@
     </sql>
 
     <select id="queryByAll" resultType="com.hc.business.dto.ZccmQrAccessoryDto">
-        SELECT cc.*,c.course_name as courseName
+        SELECT cc.*,c.course_name as courseName,d.chapter_name chapterName
         FROM zccm_qr_accessory as cc
         Left JOIN zccm_course as c on cc.course_id = c.course_id
+        Left JOIN zccm_course_chapter d on cc.chapter_id = d.course_chapter_id
         <where>
             <if test="courseId!=null">
                 AND cc.course_id = #{courseId}
@@ -45,6 +46,6 @@
                 AND cc.file_name LIKE "%"#{fileName}"%"
             </if>
         </where>
-        ORDER BY cc.qr_index
+        ORDER BY cc.chapter_id,course_id,qr_index
     </select>
 </mapper>