fix(server): relation关系xml加载

server/build.gradle

@@ -67,7 +67,7 @@ subprojects {
     sourceSets {
         main {
             resources {
-                srcDirs = ["src/main/resources", "src/main/profile/$env"]
+                srcDirs = ["src/main/resources", "src/main/profile/$env", "src/main/java"]
             }
         }
     }

server/data/src/main/java/com/qxgmat/data/dao/entity/ExercisePaperQuestion.java

@@ -28,6 +28,12 @@ public class ExercisePaperQuestion implements Serializable {
     @Column(name = "`question_no_id`")
     private Integer questionNoId;
 
+    /**
+     * 序号
+     */
+    @Column(name = "`no`")
+    private Integer no;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -98,6 +104,24 @@ public class ExercisePaperQuestion implements Serializable {
         this.questionNoId = questionNoId;
     }
 
+    /**
+     * 获取序号
+     *
+     * @return no - 序号
+     */
+    public Integer getNo() {
+        return no;
+    }
+
+    /**
+     * 设置序号
+     *
+     * @param no 序号
+     */
+    public void setNo(Integer no) {
+        this.no = no;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -108,6 +132,7 @@ public class ExercisePaperQuestion implements Serializable {
         sb.append(", paperId=").append(paperId);
         sb.append(", questionId=").append(questionId);
         sb.append(", questionNoId=").append(questionNoId);
+        sb.append(", no=").append(no);
         sb.append("]");
         return sb.toString();
     }
@@ -161,6 +186,16 @@ public class ExercisePaperQuestion implements Serializable {
             return this;
         }
 
+        /**
+         * 设置序号
+         *
+         * @param no 序号
+         */
+        public Builder no(Integer no) {
+            obj.setNo(no);
+            return this;
+        }
+
         public ExercisePaperQuestion build() {
             return this.obj;
         }

server/data/src/main/java/com/qxgmat/data/dao/mapping/ExaminationMapper.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qxgmat.data.dao.ExaminationMapper">
-  <resultMap id="BaseResultMap" type="com.qxgmat.data.dao.entity.Examination">
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="id" jdbcType="INTEGER" property="id" />
-  </resultMap>
-</mapper>

server/data/src/main/java/com/qxgmat/data/dao/mapping/ExerciseMapper.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qxgmat.data.dao.ExerciseMapper">
-  <resultMap id="BaseResultMap" type="com.qxgmat.data.dao.entity.Exercise">
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="id" jdbcType="INTEGER" property="id" />
-  </resultMap>
-</mapper>

server/data/src/main/java/com/qxgmat/data/dao/mapping/ExercisePaperQuestionMapper.xml

@@ -9,11 +9,12 @@
     <result column="paper_id" jdbcType="INTEGER" property="paperId" />
     <result column="question_id" jdbcType="INTEGER" property="questionId" />
     <result column="question_no_id" jdbcType="INTEGER" property="questionNoId" />
+    <result column="no" jdbcType="INTEGER" property="no" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--
       WARNING - @mbg.generated
     -->
-    `id`, `paper_id`, `question_id`, `question_no_id`
+    `id`, `paper_id`, `question_id`, `question_no_id`, `no`
   </sql>
 </mapper>

server/data/src/main/java/com/qxgmat/data/relation/mapping/ExerciseQuestionRelationMapper.xml

@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qxgmat.data.relation.ExerciseQuestionRelationMapper">
-  <resultMap id="BaseResultMap" type="com.qxgmat.data.dao.entity.ExercisePaperQuestion">
+  <resultMap id="IdMap" type="com.qxgmat.data.dao.entity.ExercisePaperQuestion">
     <!--
       WARNING - @mbg.generated
     -->
-    <id column="id" jdbcType="INT" property="id" />
+    <id column="id" jdbcType="INTEGER" property="id" />
   </resultMap>
-  <sql id="Base_Column_List">
+  <sql id="Id_Column_List">
     <!--
       WARNING - @mbg.generated
     -->
     epq.`id`
   </sql>
 
-  <!--练习题目列表列表-->
-  <select id="listAdmin" resultMap="BaseResultMap">
+  <select id="listAdmin" resultMap="IdMap">
     select
-    <include refid="Base_Column_List" />
+    <include refid="Id_Column_List" />
     from `exercise_paper_question` epq
     left join `question` q on q.`id` = epq.`question_id`
     left join `question_no` qn on qn.`id` = epq.`question_no_id`
@@ -25,7 +24,7 @@
     left join `exercise_paper` ep on ep.`id` = epg.`paper_id`
         and ep.`id` = #{paperId,jdbcType=VARCHAR}
     </if>
-    where q.`module` = "exercise"
+    where qn.`module` = "exercise"
     <if test="paperId != null">
       and epq.`paper_id` != null
     </if>

server/data/src/main/java/com/qxgmat/data/relation/mapping/QuestionNoRelationMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qxgmat.data.relation.QuestionRelationMapper">
-  <resultMap id="BaseResultMap" type="com.qxgmat.data.dao.entity.QuestionNo">
+<mapper namespace="com.qxgmat.data.relation.QuestionNoRelationMapper">
+  <resultMap id="IdMap" type="com.qxgmat.data.dao.entity.QuestionNo">
     <!--
       WARNING - @mbg.generated
     -->
-    <id column="id" jdbcType="INT" property="id" />
+    <id column="id" jdbcType="INTEGER" property="id" />
   </resultMap>
-  <sql id="Base_Column_List">
+  <sql id="Id_Column_List">
     <!--
       WARNING - @mbg.generated
     -->

server/data/src/main/java/com/qxgmat/data/relation/mapping/QuestionRelationMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qxgmat.data.relation.QuestionRelationMapper">
-  <resultMap id="BaseResultMap" type="com.qxgmat.data.dao.entity.Question">
+  <resultMap id="IdMap" type="com.qxgmat.data.dao.entity.Question">
     <!--
       WARNING - @mbg.generated
     -->
-    <id column="id" jdbcType="INT" property="id" />
+    <id column="id" jdbcType="INTEGER" property="id" />
   </resultMap>
-  <sql id="Base_Column_List">
+  <sql id="Id_Column_List">
     <!--
       WARNING - @mbg.generated
     -->

server/data/src/main/java/com/qxgmat/data/relation/mapping/UserAskRelationMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qxgmat.data.relation.UserAskRelationMapper">
-  <resultMap id="BaseResultMap" type="com.qxgmat.data.dao.entity.UserAsk">
+  <resultMap id="IdMap" type="com.qxgmat.data.dao.entity.UserAsk">
     <!--
       WARNING - @mbg.generated
     -->
-    <id column="id" jdbcType="INT" property="id" />
+    <id column="id" jdbcType="INTEGER" property="id" />
   </resultMap>
-  <sql id="Base_Column_List">
+  <sql id="Id_Column_List">
     <!--
       WARNING - @mbg.generated
     -->
@@ -24,9 +24,9 @@
   </update>
 
   <!--用户提问列表-->
-  <select id="listWithUser" resultMap="BaseResultMap">
+  <select id="listWithUser" resultMap="IdMap">
     select
-    <include refid="Base_Column_List" />
+    <include refid="Id_Column_List" />
     from `user_aks` ua
     left join `user` u on u.`id` = ua.`user_id`
       <if test="userId != null">

server/data/src/main/java/com/qxgmat/data/relation/mapping/UserCollectQuestionRelationMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qxgmat.data.relation.UserPaperRelationMapper">
-  <resultMap id="BaseResultMap" type="com.qxgmat.data.dao.entity.UserCollectQuestion">
+<mapper namespace="com.qxgmat.data.relation.UserCollectQuestionRelationMapper">
+  <resultMap id="IdMap" type="com.qxgmat.data.dao.entity.UserCollectQuestion">
     <!--
       WARNING - @mbg.generated
     -->
-    <id column="id" jdbcType="INT" property="id" />
+    <id column="id" jdbcType="INTEGER" property="id" />
   </resultMap>
-  <sql id="Base_Column_List">
+  <sql id="Id_Column_List">
     <!--
       WARNING - @mbg.generated
     -->
@@ -17,9 +17,9 @@
   <!--
     用户收藏题目列表
   -->
-  <select id="list" resultMap="BaseResultMap">
+  <select id="list" resultMap="IdMap">
     select
-    <include refid="Base_Column_List" />
+    <include refid="Id_Column_List" />
     from `user_collect_question` ucq
     left join `question_no` qn on qn.`id` = ucq.`question_no_id`
       <if test="module != null">

server/data/src/main/java/com/qxgmat/data/relation/mapping/UserPaperRelationMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qxgmat.data.relation.UserPaperRelationMapper">
-  <resultMap id="BaseResultMap" type="com.qxgmat.data.dao.entity.UserPaper">
+  <resultMap id="IdMap" type="com.qxgmat.data.dao.entity.UserPaper">
     <!--
       WARNING - @mbg.generated
     -->
-    <id column="id" jdbcType="INT" property="id" />
+    <id column="id" jdbcType="INTEGER" property="id" />
   </resultMap>
-  <sql id="Base_Column_List">
+  <sql id="Id_Column_List">
     <!--
       WARNING - @mbg.generated
     -->
@@ -18,9 +18,9 @@
     用户预习作业列表: 后台
     https://blog.csdn.net/t_1007/article/details/52369261
   -->
-  <select id="listHomeworkPreviewAdmin" resultMap="BaseResultMap">
+  <select id="listHomeworkPreviewAdmin" resultMap="IdMap">
     select
-    <include refid="Base_Column_List" />
+    <include refid="Id_Column_List" />
     from `user_paper` up
     left join `homework_preview` hp on hp.`id` = up.`module_id`
       and up.`module` = "homework_preview"
@@ -46,9 +46,9 @@
   <!--
     用户预习作业列表: 用户端
   -->
-  <select id="listHomeworkPreview" resultMap="BaseResultMap">
+  <select id="listHomeworkPreview" resultMap="IdMap">
     select
-    <include refid="Base_Column_List" />
+    <include refid="Id_Column_List" />
     from `user_paper` up
     left join `homework_preview` hp on hp.`id` = up.`module_id`
       and up.`module` = "homework_preview"
@@ -76,9 +76,9 @@
   <!--
     用户预习作业Top列表: 用户端
   -->
-  <select id="listHomeworkPreviewGroupTop" resultMap="BaseResultMap">
+  <select id="listHomeworkPreviewGroupTop" resultMap="IdMap">
     select
-    <include refid="Base_Column_List" />
+    <include refid="Id_Column_List" />
     from `user_paper` up
     where
     hp.`id` != null

server/data/src/main/java/com/qxgmat/data/relation/mapping/UserReportRelationMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qxgmat.data.relation.UserReportRelationMapper">
-  <resultMap id="BaseResultMap" type="com.qxgmat.data.dao.entity.UserReport">
+  <resultMap id="IdMap" type="com.qxgmat.data.dao.entity.UserReport">
     <!--
       WARNING - @mbg.generated
     -->
-    <id column="id" jdbcType="INT" property="id" />
+    <id column="id" jdbcType="INTEGER" property="id" />
   </resultMap>
-  <sql id="Base_Column_List">
+  <sql id="Id_Column_List">
     <!--
       WARNING - @mbg.generated
     -->
@@ -18,7 +18,7 @@
     用户完成度最高的最后一次
     https://blog.csdn.net/t_1007/article/details/52369261
   -->
-  <select id="listFinishLast" resultMap="BaseResultMap">
+  <select id="listFinishLast" resultMap="IdMap">
     select
       SUBSTRING_INDEX(GROUP_CONCAT(ur.`id` ORDER BY ur.`user_number` desc, ur.`create_time` desc),',',1)
     from `user_report` ur
@@ -41,7 +41,7 @@
     用户最后一次
     https://blog.csdn.net/t_1007/article/details/52369261
   -->
-  <select id="listLast" resultMap="BaseResultMap">
+  <select id="listLast" resultMap="IdMap">
     select
     SUBSTRING_INDEX(GROUP_CONCAT(ur.`id` ORDER BY ur.`create_time` desc),',',1)
     from `user_report` ur