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

src/main/java/com/xjrsoft/module/student/vo/BaseStudentInfoDetailVo.java

@@ -52,17 +52,33 @@ public class BaseStudentInfoDetailVo {
      */
     @ApiModelProperty("学习形式")
     private String rollModality;
+    /**
+     * 学习形式
+     */
+    @ApiModelProperty("学习形式")
+    private String rollModalityCode;
     /**
      * 学籍状态(xjr_dictionary_item[archives_status])
      */
     @ApiModelProperty("学籍状态(xjr_dictionary_item[archives_status])")
     private String archivesStatus;
+    /**
+     * 学籍状态(xjr_dictionary_item[archives_status])
+     */
+    @ApiModelProperty("学籍状态(xjr_dictionary_item[archives_status])")
+    private String archivesStatusCode;
     /**
      * 就读方式(xjr_dictionary_item[stduy_status])
      */
     @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
     private String stduyStatus;
 
+    /**
+     * 就读方式(xjr_dictionary_item[stduy_status])
+     */
+    @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
+    private String stduyStatusCode;
+
     @ApiModelProperty("床位信息")
     private String bedInfo;
 

src/main/java/com/xjrsoft/module/workflow/entity/WorkflowRecord.java

@@ -56,5 +56,4 @@ public class WorkflowRecord implements Serializable {
 
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
-
 }

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

@@ -34,7 +34,8 @@
         SELECT t2.id,t2.name AS student_name,t1.student_id,t2.mobile AS phone,CONCAT(t5.name, ' ', t5.mobile) AS teacher_name,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 FROM base_student t1
+        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

src/main/resources/mapper/textbook/TextbookMapper.xml

@@ -272,7 +272,7 @@
                 left join textbook t2 on t2.id = t1.textbook_id
             where claim_type = 'claim_student'
             <if test="dto.baseSemesterId != null and dto.baseSemesterId > 0">
-                amd t.base_semester_id = #{dto.baseSemesterId}
+                and t.base_semester_id = #{dto.baseSemesterId}
             </if>
             <if test="dto.classId != null and dto.classId > 0">
                 and t.class_id = #{dto.classId}

src/main/resources/mapper/textbook/TextbookWarehouseRecordMapper.xml

@@ -32,7 +32,6 @@
         LEFT JOIN base_course_subject t5 ON t3.course_subject_id = t5.id
         LEFT JOIN xjr_dictionary_detail t6 ON t3.textbook_type = t6.code AND t6.item_id = 1739209191193636865
         LEFT JOIN base_grade t7 ON t3.grade_id = t7.id
-        LEFT JOIN textbook_class_relation t8 ON t8.textbook_id = t3.id
         LEFT JOIN base_semester t9 ON t9.id = t3.base_semester_id
         WHERE t1.delete_mark = 0
         <if test="dto.textbookType != null and dto.textbookType != ''">