添加预报名与正常学员混查

jsjp-admin/src/main/java/com/miaxis/app/controller/tms/TmsStudentInfoController.java

@@ -37,6 +37,25 @@ public class TmsStudentInfoController extends BaseController {
     @Autowired
     private ITmsStudentInfoService studentInfoService;
 
+
+
+
+    /**
+     * 查询全部学员信息列表(预报名和正式学员一起查)
+     */
+    @GetMapping("/allStudentInfoList")
+    @ApiOperation("查询全部学员信息列表(预报名和正式学员一起查)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "当前页码", dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize", value = "每页数据量", dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<TmsStudentInfoVo> allStudentInfoList(@ModelAttribute TmsAllStudentInfoDTO allStudentInfoDTO) {
+        startPage();
+        List<TmsStudentInfoVo> stuInfoList = studentInfoService.getTmsAllStudentInfoList(allStudentInfoDTO);
+        return toResponsePageInfo(stuInfoList);
+    }
+
+
     /**
      * 查询学员信息列表
      */

jsjp-service/src/main/java/com/miaxis/tms/dto/TmsAllStudentInfoDTO.java

@@ -0,0 +1,24 @@
+package com.miaxis.tms.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class TmsAllStudentInfoDTO implements Serializable {
+
+
+    @ApiModelProperty(value = "身份证号或姓名或手机")
+    private String field;
+
+    @ApiModelProperty(value = "驾校ID")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "地区编号",required = true)
+    private String city;
+
+
+
+}

jsjp-service/src/main/java/com/miaxis/tms/mapper/TmsStudentInfoMapper.java

@@ -44,6 +44,5 @@ public interface TmsStudentInfoMapper extends BaseMapper<TmsStudentInfoVo> {
 
     List<TmsBmCountVo> getEveryYearStuCountBySchoolId(TmsBmYearListDTO bmMonthListDTO);
 
-
-
+    List<TmsStudentInfoVo> getTmsAllStudentInfoList(TmsAllStudentInfoDTO aLLStudentInfoDTO);
 }

jsjp-service/src/main/java/com/miaxis/tms/service/ITmsStudentInfoService.java

@@ -17,6 +17,7 @@ import java.util.List;
 public interface ITmsStudentInfoService extends IService<TmsStudentInfoVo> {
 
 
+    List<TmsStudentInfoVo> getTmsAllStudentInfoList(TmsAllStudentInfoDTO aLLStudentInfoDTO);
 
     List<TmsStudentInfoVo> getTmsStudentInfoList(TmsStudentInfoDTO studentInfoDTO);
 

jsjp-service/src/main/java/com/miaxis/tms/service/impl/TmsStudentInfoServiceImpl.java

@@ -30,6 +30,11 @@ public class TmsStudentInfoServiceImpl extends ServiceImpl<TmsStudentInfoMapper,
     TmsStudentInfoMapper mapper;
 
 
+    @Override
+    public List<TmsStudentInfoVo> getTmsAllStudentInfoList(TmsAllStudentInfoDTO aLLStudentInfoDTO) {
+        return mapper.getTmsAllStudentInfoList(aLLStudentInfoDTO);
+    }
+
     @Override
     public List<TmsStudentInfoVo> getTmsStudentInfoList(TmsStudentInfoDTO studentInfoDto) {
        List<TmsStudentInfoVo> list =  mapper.getTmsStudentInfoList(studentInfoDto);

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

@@ -118,7 +118,7 @@
 
 
     <select id="getTmsStudentInfoTempList"  parameterType="com.miaxis.tms.dto.TmsStudentInfoTempDTO" resultMap="TmsStudentInfoTempResultMap">
-        select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,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
         from tms_student_info_temp@tms${city} t1
         <where>
             AND t1.TSO_HISTORY = '0'
@@ -134,6 +134,53 @@
 
 
 
+    <select id="getTmsAllStudentInfoList"  parameterType="com.miaxis.tms.dto.TmsAllStudentInfoDTO" resultMap="TmsStudentInfoResultMap">
+
+        select * from (
+        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
+        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
+        <where>
+            AND t1.TSO_HISTORY = '0'
+            AND t1.TSO_BUSITYPE in ('0', '1')
+            AND t1.TSO_LOGOUT = 0<if test="field != null  and field != ''">AND (t1.Tso_Name like '%' ||
+            #{field,jdbcType=VARCHAR} || '%' or t1.TSO_IDCARD like '%' || #{field,jdbcType=VARCHAR} || '%' or
+            t1.Tso_Phone like '%' || #{
+                field,jdbcType=VARCHAR} || '%')
+        </if>
+            <if test="schoolId != null "> and t1.TSO_SCHOOL_ID = #{schoolId,jdbcType=NUMERIC} </if>
+        </where>
+        union
+        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
+        from tms_student_info@tms${city} t1
+        left join tms_student_train_info@tms${city} t2
+        on t1.tso_id = t2.sri_student_id
+        <where>
+            AND t1.TSO_HISTORY = '0'
+            AND t1.TSO_BUSITYPE in ('0', '1')
+            AND t1.TSO_LOGOUT = 0
+            <if test="field != null  and field != ''">AND (t1.Tso_Name like '%' || #{field,jdbcType=VARCHAR} || '%' or
+                t1.
+                TSO_IDCARD like '%' || #{field,jdbcType=VARCHAR} || '%' or t1.Tso_Phone like '%' || #{
+                field,jdbcType=VARCHAR} || '%')
+            </if>
+            <if test="schoolId != null "> and t1.TSO_SCHOOL_ID = #{schoolId,jdbcType=NUMERIC} </if>
+        </where>
+        )
+        ORDER BY TSO_ID desc
+    </select>
+
+
+
+
+
 
 
     <select id="getTmsStudentInfoById"  parameterType="com.miaxis.tms.dto.TmsStudentInfoIdDTO" resultMap="TmsStudentInfoIdResultMap">