Эх сурвалжийг харах

教练端列表添加驾校名称

zhangbin 1 жил өмнө
parent
commit
f552fec5f9

+ 2 - 1
jsjp-service/src/main/java/com/miaxis/tms/vo/TmsStudentInfoTempVo.java

@@ -46,5 +46,6 @@ public class TmsStudentInfoTempVo implements Serializable {
     @ApiModelProperty(value = "报名类型 1预报名 2正式学员")
     private String bmType;
 
-
+    @ApiModelProperty(value = "驾校名称")
+    private String schoolName;
 }

+ 2 - 0
jsjp-service/src/main/java/com/miaxis/tms/vo/TmsStudentInfoVo.java

@@ -92,5 +92,7 @@ public class TmsStudentInfoVo implements Serializable {
     @ApiModelProperty(value = "报名类型 1预报名 2正式学员")
     private String bmType;
 
+    @ApiModelProperty(value = "驾校名称")
+    private String schoolName;
 
 }

+ 26 - 7
jsjp-service/src/main/resources/mapper/tms/TmsStudentInfoMapper.xml

@@ -26,6 +26,7 @@
         <result property="trainFourExamStatus" column="SRI_TRAIN_FOUR_EXAM_STATUS" />
         <result property="trainFourExamTime" column="SRI_TRAIN_FOUR_EXAM_TIME" />
         <result property="bmType" column="BM_TYPE" />
+        <result property="schoolName" column="SCHOOL_NAME" />
     </resultMap>
 
 
@@ -134,10 +135,13 @@
     <select id="getTmsMyStudentInfoList"  parameterType="com.miaxis.tms.dto.TmsStudentInfoDTO" resultMap="TmsStudentInfoResultMap">
         select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,t1.TSO_SEX,t1.Tso_Phone,t1.TSO_APPLYDATE, t1.TSO_STATE , t1.TSO_TRAINTYPE, t1.tso_photo_path, t1.TSO_REMARK,
                t2.SRI_TRAIN_ONE_STATUS,t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time, t2.SRI_TRAIN_TWO_STATUS,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-               t2.SRI_TRAIN_Three_STATUS,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'2' as bm_type
+               t2.SRI_TRAIN_Three_STATUS,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'2' as bm_type,
+               t3.tsi_name as school_name
         from tms_student_info@tms${city} t1
                  left join tms_student_train_info@tms${city} t2
-                           on t1.tso_id = t2.sri_student_id
+                on t1.tso_id = t2.sri_student_id
+                left join tms_school_info@tms${city} t3
+                on t1.tso_school_id = t3.tsi_id
         <where>
             AND t1.TSO_BUSITYPE in ('0', '1')
             AND t1.TSO_LOGOUT = 0
@@ -154,10 +158,13 @@
     <select id="getTmsStudentInfoList"  parameterType="com.miaxis.tms.dto.TmsStudentInfoDTO" resultMap="TmsStudentInfoResultMap">
         select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,t1.TSO_SEX,t1.Tso_Phone,t1.TSO_APPLYDATE, t1.TSO_STATE , t1.TSO_TRAINTYPE, t1.tso_photo_path, t1.TSO_REMARK,
         t2.SRI_TRAIN_ONE_STATUS,t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time, t2.SRI_TRAIN_TWO_STATUS,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-        t2.SRI_TRAIN_Three_STATUS,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'2' as bm_type
+        t2.SRI_TRAIN_Three_STATUS,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'2' as bm_type,
+        t3.tsi_name as school_name
         from tms_student_info@tms${city} t1
         left join tms_student_train_info@tms${city} t2
         on t1.tso_id = t2.sri_student_id
+        left join tms_school_info@tms${city} t3
+        on t1.tso_school_id = t3.tsi_id
         <where>
             AND t1.TSO_BUSITYPE in ('0', '1')
             AND t1.TSO_LOGOUT = 0
@@ -178,8 +185,11 @@
     </select>
 
     <select id="getTmsMyStudentInfoTempList"  parameterType="com.miaxis.tms.dto.TmsStudentInfoTempDTO" resultMap="TmsStudentInfoTempResultMap">
-        select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,t1.TSO_SEX,t1.Tso_Phone,t1.TSO_APPLYDATE, t1.TSO_STATE , t1.TSO_TRAINTYPE, t1.tso_photo_path, t1.TSO_REMARK,'1' as bm_type
+        select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,t1.TSO_SEX,t1.Tso_Phone,t1.TSO_APPLYDATE, t1.TSO_STATE , t1.TSO_TRAINTYPE, t1.tso_photo_path, t1.TSO_REMARK,'1' as bm_type,
+        t3.tsi_name as school_name
         from tms_student_info_temp@tms${city} t1
+        left join tms_school_info@tms${city} t3
+        on t1.tso_school_id = t3.tsi_id
         <where>
             AND t1.TSO_BUSITYPE in ('0', '1')
             AND t1.TSO_LOGOUT = 0
@@ -194,8 +204,11 @@
 
 
     <select id="getTmsStudentInfoTempList"  parameterType="com.miaxis.tms.dto.TmsStudentInfoTempDTO" resultMap="TmsStudentInfoTempResultMap">
-        select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,t1.TSO_SEX,t1.Tso_Phone,t1.TSO_APPLYDATE, t1.TSO_STATE , t1.TSO_TRAINTYPE, t1.tso_photo_path, t1.TSO_REMARK,'1' as bm_type
+        select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,t1.TSO_SEX,t1.Tso_Phone,t1.TSO_APPLYDATE, t1.TSO_STATE , t1.TSO_TRAINTYPE, t1.tso_photo_path, t1.TSO_REMARK,'1' as bm_type,
+        t3.tsi_name as school_name
         from tms_student_info_temp@tms${city} t1
+        left join tms_school_info@tms${city} t3
+        on t1.tso_school_id = t3.tsi_id
         <where>
             AND t1.TSO_BUSITYPE in ('0', '1')
             AND t1.TSO_LOGOUT = 0
@@ -221,10 +234,13 @@
         select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,t1.TSO_SEX,t1.Tso_Phone,t1.TSO_APPLYDATE, t1.TSO_STATE ,
         t1.TSO_TRAINTYPE, t1.tso_photo_path, t1.TSO_REMARK,
         t2.Sri_Train_One_Status,t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Status,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-        t2.Sri_Train_Three_Status,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Status,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'1' as bm_type
+        t2.Sri_Train_Three_Status,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Status,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'1' as bm_type,
+        t3.tsi_name as school_name
         from tms_student_info_temp@tms${city} t1
         left join tms_student_train_info@tms${city} t2
         on t1.tso_id = t2.sri_student_id
+        left join tms_school_info@tms${city} t3
+        on t1.tso_school_id = t3.tsi_id
         <where>
             AND t1.TSO_BUSITYPE in ('0', '1')
             AND t1.TSO_LOGOUT = 0
@@ -241,10 +257,13 @@
         select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,t1.TSO_SEX,t1.Tso_Phone,t1.TSO_APPLYDATE, t1.TSO_STATE , t1.
         TSO_TRAINTYPE, t1.tso_photo_path, t1.TSO_REMARK,
         t2.Sri_Train_One_Status,t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Status,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-        t2.Sri_Train_Three_Status,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Status,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'2' as bm_type
+        t2.Sri_Train_Three_Status,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Status,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'2' as bm_type,
+        t3.tsi_name as school_name
         from tms_student_info@tms${city} t1
         left join tms_student_train_info@tms${city} t2
         on t1.tso_id = t2.sri_student_id
+        left join tms_school_info@tms${city} t3
+        on t1.tso_school_id = t3.tsi_id
         <where>
             AND t1.TSO_BUSITYPE in ('0', '1')
             AND t1.TSO_LOGOUT = 0