Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/mapper/student/BaseStudentSchoolRollMapper.xml

@@ -43,20 +43,39 @@
         </if>
     </select>
     <select id="getInfoById" resultType="com.xjrsoft.module.student.vo.BaseStudentInfoDetailVo">
-        SELECT t2.id,t2.name AS student_name,t1.student_id,t5.name AS teacher_name, t5.mobile AS teacher_phone,t4.name AS class_name,
-        (SELECT mobile FROM base_student_family_member WHERE delete_mark = 0 AND user_id = t2.id AND is_guardian = 1) AS guardian_phone,
-        t8.name AS archives_status,t7.name AS stduy_status,t9.name AS roll_modality,t2.birth_date, t2.gender,t2.avatar,
-        t6.name AS nation,t10.name AS major_set_name,t3.archives_status as archivesStatusCode,t3.stduy_status as stduyStatusCode,t3.roll_modality as rollModalityCode
+        SELECT t2.id,
+               t2.name                                                                                                       AS student_name,
+               t2.mobile                                                                                                       AS phone,
+               t1.student_id,
+               t5.name                                                                                                       AS teacher_name,
+               t5.mobile                                                                                                     AS teacher_phone,
+               t4.name                                                                                                       AS class_name,
+               (SELECT mobile
+                FROM base_student_family_member
+                WHERE delete_mark = 0
+                  AND user_id = t2.id
+                  AND is_guardian = 1)                                                                                       AS guardian_phone,
+               t8.name                                                                                                       AS archives_status,
+               t7.name                                                                                                       AS stduy_status,
+               t9.name                                                                                                       AS roll_modality,
+               t2.birth_date,
+               t2.gender,
+               t2.avatar,
+               t6.name                                                                                                       AS nation,
+               t10.name                                                                                                      AS major_set_name,
+               t3.archives_status                                                                                            as archivesStatusCode,
+               t3.stduy_status                                                                                               as stduyStatusCode,
+               t3.roll_modality                                                                                              as rollModalityCode
         FROM base_student t1
-        INNER JOIN xjr_user t2 ON t1.user_id = t2.id
-        INNER JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
-        LEFT JOIN base_class t4 ON t3.class_id = t4.id
-        LEFT JOIN xjr_user t5 ON t4.teacher_id = t5.id
-        LEFT JOIN xjr_dictionary_detail t6 ON t6.code = t1.nation AND t6.item_id = 2023000000000000008
-        LEFT JOIN xjr_dictionary_detail t7 ON t7.code = t3.stduy_status AND t7.item_id = 2023000000000000030
-        LEFT JOIN xjr_dictionary_detail t8 ON t8.code = t3.archives_status AND t8.item_id = 2023000000000000029
-        LEFT JOIN xjr_dictionary_detail t9 ON t9.code = t3.roll_modality AND t9.item_id = 1762024751192084482
-        LEFT JOIN base_major_set t10 ON t3.major_set_id = t10.id
+                 INNER JOIN xjr_user t2 ON t1.user_id = t2.id
+                 INNER JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
+                 LEFT JOIN base_class t4 ON t3.class_id = t4.id
+                 LEFT JOIN xjr_user t5 ON t4.teacher_id = t5.id
+                 LEFT JOIN xjr_dictionary_detail t6 ON t6.code = t1.nation AND t6.item_id = 2023000000000000008
+                 LEFT JOIN xjr_dictionary_detail t7 ON t7.code = t3.stduy_status AND t7.item_id = 2023000000000000030
+                 LEFT JOIN xjr_dictionary_detail t8 ON t8.code = t3.archives_status AND t8.item_id = 2023000000000000029
+                 LEFT JOIN xjr_dictionary_detail t9 ON t9.code = t3.roll_modality AND t9.item_id = 1762024751192084482
+                 LEFT JOIN base_major_set t10 ON t3.major_set_id = t10.id
         WHERE t2.id = #{id}
     </select>
     <update id="updateInfoByUserId" parameterType="com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto">

src/main/resources/mapper/workflow/WorkflowExtraMapper.xml

@@ -28,7 +28,7 @@
                 #{taskId}
             </foreach>
         </if>
-    order by t.start_time DESC,
+    order by t.start_time DESC
     </select>
 
 </mapper>