签到签退接口更新

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

@@ -10,6 +10,7 @@ import com.miaxis.tms.dto.TmsStudentInfoIdDTO;
 import com.miaxis.tms.dto.TmsStudentInfoQrDTO;
 import com.miaxis.tms.service.ITmsStudentInfoService;
 import com.miaxis.tms.vo.TmsLogFaceVo;
+import com.miaxis.tms.vo.TmsSignVo;
 import com.miaxis.tms.vo.TmsStudentInfoIdVo;
 import com.miaxis.tms.vo.TmsStudentInfoVo;
 import io.swagger.annotations.Api;
@@ -70,12 +71,33 @@ public class TmsStudentInfoController extends BaseController {
      */
     @GetMapping("/getTmsLogFacListByStuId")
     @ApiOperation("根据学员id学员训练照片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "当前页码", dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize", value = "每页数据量", dataType = "int", paramType = "query", required = false),
+    })
     public ResponsePageInfo<TmsLogFaceVo> getTmsLogFacListByStuId(TmsStudentInfoIdDTO studentInfoIdDTO) {
         startPage();
         List<TmsLogFaceVo> logFaceListList = studentInfoService.getTmsLogFacListByStuId(studentInfoIdDTO);
         return toResponsePageInfo(logFaceListList);
     }
 
+
+    /**
+     * 根据学员id获取签到签退列表
+     */
+    @GetMapping("/getTmsSignListByStuId")
+    @ApiOperation("根据学员id获取签到签退列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "当前页码", dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize", value = "每页数据量", dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<TmsSignVo> getTmsSignListByStuId(TmsStudentInfoIdDTO studentInfoIdDTO) {
+        startPage();
+        List<TmsSignVo> signList= studentInfoService.getTmsSignListByStuId(studentInfoIdDTO);
+        return toResponsePageInfo(signList);
+    }
+
+
     /**
      * 根据学员ID绑定APP教练员(极速驾培调用)
      */

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

@@ -5,6 +5,7 @@ import com.miaxis.tms.dto.TmsStudentInfoDTO;
 import com.miaxis.tms.dto.TmsStudentInfoIdDTO;
 import com.miaxis.tms.dto.TmsStudentInfoQrDTO;
 import com.miaxis.tms.vo.TmsLogFaceVo;
+import com.miaxis.tms.vo.TmsSignVo;
 import com.miaxis.tms.vo.TmsStudentInfoIdVo;
 import com.miaxis.tms.vo.TmsStudentInfoVo;
 
@@ -28,4 +29,6 @@ public interface TmsStudentInfoMapper extends BaseMapper<TmsStudentInfoVo> {
     int upStuAppCoachIdById(TmsStudentInfoQrDTO studentInfoQrDTO);
 
     List<TmsLogFaceVo> getTmsLogFacListByStuId(TmsStudentInfoIdDTO studentInfoIdDTO);
+
+    List<TmsSignVo> getTmsSignListByStuId(TmsStudentInfoIdDTO studentInfoIdDTO);
 }

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

@@ -5,6 +5,7 @@ import com.miaxis.tms.dto.TmsStudentInfoDTO;
 import com.miaxis.tms.dto.TmsStudentInfoIdDTO;
 import com.miaxis.tms.dto.TmsStudentInfoQrDTO;
 import com.miaxis.tms.vo.TmsLogFaceVo;
+import com.miaxis.tms.vo.TmsSignVo;
 import com.miaxis.tms.vo.TmsStudentInfoIdVo;
 import com.miaxis.tms.vo.TmsStudentInfoVo;
 
@@ -29,4 +30,7 @@ public interface ITmsStudentInfoService extends IService<TmsStudentInfoVo> {
     int upStuAppCoachIdById(TmsStudentInfoQrDTO studentInfoQrDTO);
 
     List<TmsLogFaceVo> getTmsLogFacListByStuId(TmsStudentInfoIdDTO studentInfoIdDTO);
+
+    List<TmsSignVo> getTmsSignListByStuId(TmsStudentInfoIdDTO studentInfoIdDTO);
+
 }

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

@@ -9,6 +9,7 @@ import com.miaxis.tms.dto.TmsStudentInfoQrDTO;
 import com.miaxis.tms.mapper.TmsStudentInfoMapper;
 import com.miaxis.tms.service.ITmsStudentInfoService;
 import com.miaxis.tms.vo.TmsLogFaceVo;
+import com.miaxis.tms.vo.TmsSignVo;
 import com.miaxis.tms.vo.TmsStudentInfoIdVo;
 import com.miaxis.tms.vo.TmsStudentInfoVo;
 import org.springframework.stereotype.Service;
@@ -54,5 +55,10 @@ public class TmsStudentInfoServiceImpl extends ServiceImpl<TmsStudentInfoMapper,
         return mapper.getTmsLogFacListByStuId(studentInfoIdDTO);
     }
 
+    @Override
+    public List<TmsSignVo> getTmsSignListByStuId(TmsStudentInfoIdDTO studentInfoIdDTO) {
+        return mapper.getTmsSignListByStuId(studentInfoIdDTO);
+    }
+
 
 }

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

@@ -0,0 +1,33 @@
+package com.miaxis.tms.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TmsSignVo", description = "照片比对VO")
+public class TmsSignVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "车牌号")
+    private String trainCarLicnum;
+
+    @ApiModelProperty(value = "终端SIM号")
+    private String sim;
+
+    @ApiModelProperty(value = "上传时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date loginTime;
+
+    @ApiModelProperty(value = "签到签退的标志：1 签到 0 签退")
+    private String loginFlag;
+
+
+}

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

@@ -70,6 +70,16 @@
 
 
 
+    <resultMap id="TmsSignResultMap" type="com.miaxis.tms.vo.TmsSignVo">
+        <result property="trainCarLicnum" column="TDI_TRAIN_CAR_LICNUM" />
+        <result property="sim" column="TDI_SIM" />
+        <result property="loginTime" column="LSL_LOGIN_TIME" />
+        <result property="loginFlag" column="LSL_LOGIN_FLAG" />
+    </resultMap>
+
+
+
+
     <select id="getTmsStudentInfoList"  parameterType="com.miaxis.tms.dto.TmsStudentInfoDTO" resultMap="TmsStudentInfoResultMap">
         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,
                t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
@@ -146,6 +156,19 @@
     </select>
 
 
+    <select id="getTmsSignListByStuId" parameterType="com.miaxis.tms.dto.TmsStudentInfoIdDTO" resultMap="TmsSignResultMap" >
+        SELECT D.TDI_TRAIN_CAR_LICNUM, D.TDI_SIM, t.lsl_login_time,t.lsl_login_flag
+        FROM TMS_LOG_STUDENT_LOGIN@tms${city} T
+                 LEFT JOIN TMS_STUDENT_INFO@tms${city} s
+                           ON s.TSO_ID = T.LSL_STU_ID
+                 LEFT JOIN TMS_DEVICE_INFO@tms${city} D
+                           ON D.TDI_ID = T.LSL_DEV_ID
+        WHERE T.LSL_STU_ID = #{id}
+        ORDER BY T.LSL_LOGIN_TIME DESC
+    </select>
+
+
+
     <update id="upStuAppCoachIdById" parameterType="com.miaxis.tms.dto.TmsStudentInfoQrDTO">
         update TMS_STUDENT_INFO@tms${city} set tso_app_coach_id = #{appCoachId} where tso_id = #{id}
     </update>