预报名

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

@@ -43,5 +43,8 @@ public class TmsStudentInfoTempVo implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "报名类型 1预报名 2正式学员")
+    private String bmType;
+
 
 }

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

@@ -77,5 +77,8 @@ public class TmsStudentInfoVo implements Serializable {
     private Date trainFourExamTime;
 
 
+    @ApiModelProperty(value = "报名类型 1预报名 2正式学员")
+    private String bmType;
+
 
 }

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

@@ -21,6 +21,7 @@
         <result property="trainThreeExamTime" column="SRI_TRAIN_THREE_EXAM_TIME" />
         <result property="trainFourExamStatus" column="SRI_TRAIN_FOUR_EXAM_STATUS" />
         <result property="trainFourExamTime" column="SRI_TRAIN_FOUR_EXAM_TIME" />
+        <result property="bmType" column="BM_TYPE" />
     </resultMap>
 
 
@@ -34,6 +35,7 @@
         <result property="trainType" column="TSO_TRAINTYPE" />
         <result property="photoPath" column="TSO_PHOTO_PATH" />
         <result property="remark" column="TSO_REMARK" />
+        <result property="bmType" column="BM_TYPE" />
     </resultMap>
 
 
@@ -99,7 +101,7 @@
     <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_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-               t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time
+               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
         from tms_student_info@tms${city} t1
                  left join tms_student_train_info@tms${city} t2
                            on t1.tso_id = t2.sri_student_id
@@ -118,7 +120,7 @@
 
 
     <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
+        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
         from tms_student_info_temp@tms${city} t1
         <where>
             AND t1.TSO_HISTORY = '0'
@@ -140,7 +142,7 @@
         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_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-        t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time
+        t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'1' as bm_type
         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
@@ -156,7 +158,7 @@
         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_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-        t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time
+        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
         from tms_student_info@tms${city} t1
         left join tms_student_train_info@tms${city} t2
         on t1.tso_id = t2.sri_student_id