教练端接口修改

jsjp-admin/src/main/java/com/miaxis/app/controller/gzpt/GzptUserInfoController.java

@@ -5,6 +5,7 @@ import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.newgzpt.domain.GzptUserInfo;
@@ -18,6 +19,8 @@ import com.miaxis.newgzpt.vo.GzptExamInfoVO;
 import com.miaxis.newgzpt.vo.GzptSchActivationVO;
 import com.miaxis.userInfo.service.IUserVipService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -91,13 +94,19 @@ public class GzptUserInfoController extends BaseController {
 
 
     /**
-     * 根据学员stuOutId获取学员考试信息
+     * 根据学员stuOutId获取学员考试成绩信息
+     * @return
      */
     @GetMapping("/getUserScoreByOutId")
-    @ApiOperation("根据学员stuOutId获取学员考试信息")
-    public Response<List<GzptExamInfoVO>> getUserScoreByOutId(Long stuOutId)   {
+    @ApiOperation("根据学员stuOutId获取学员考试成绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<GzptExamInfoVO> getUserScoreByOutId(Long stuOutId)   {
+        startPage();
         List<GzptExamInfoVO> scoreList = userInfoService.getUserScoreByOutId(stuOutId);
-        return Response.success(scoreList);
+        return toResponsePageInfo(scoreList);
 
     }
 

jsjp-admin/src/main/java/com/miaxis/app/controller/tms/CoachInfoController.java → jsjp-admin/src/main/java/com/miaxis/app/controller/tms/TmsCoachInfoController.java

@@ -4,13 +4,13 @@ package com.miaxis.app.controller.tms;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
-import com.miaxis.tms.domain.CoachInfo;
-import com.miaxis.tms.dto.CoachInfoDTO;
-import com.miaxis.tms.dto.CoachInfoIdDTO;
-import com.miaxis.tms.dto.CoachInfoPwDTO;
-import com.miaxis.tms.service.ICoachInfoService;
-import com.miaxis.tms.vo.CoachInfoQRVo;
-import com.miaxis.tms.vo.CoachInfoVo;
+import com.miaxis.tms.domain.TmsCoachInfo;
+import com.miaxis.tms.dto.TmsCoachInfoDTO;
+import com.miaxis.tms.dto.TmsCoachInfoIdDTO;
+import com.miaxis.tms.dto.TmsCoachInfoPwDTO;
+import com.miaxis.tms.service.ITmsCoachInfoService;
+import com.miaxis.tms.vo.TmsCoachInfoQRVo;
+import com.miaxis.tms.vo.TmsCoachInfoVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
@@ -30,10 +30,10 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @Api(tags = "【app-教练员】")
 @RequestMapping(Constants.OPEN_PREFIX + "/tms/coachInfo")
-public class CoachInfoController extends BaseController {
+public class TmsCoachInfoController extends BaseController {
 
     @Autowired
-    private ICoachInfoService coachInfoService;
+    private ITmsCoachInfoService coachInfoService;
 
 
     /**
@@ -41,7 +41,7 @@ public class CoachInfoController extends BaseController {
      */
     @GetMapping("/getCoachInfo")
     @ApiOperation("获取教练员详细信息")
-    public Response<CoachInfoVo> getCoachInfo(CoachInfoIdDTO coaIdDto) {
+    public Response<TmsCoachInfoVo> getCoachInfo(TmsCoachInfoIdDTO coaIdDto) {
         return Response.success(coachInfoService.getCoachInfoById(coaIdDto));
     }
 
@@ -51,9 +51,9 @@ public class CoachInfoController extends BaseController {
      */
     @GetMapping("/getCoachQrInfo")
     @ApiOperation("获取教练员生成二维码信息")
-    public Response<CoachInfoQRVo> getCoachQrInfo(CoachInfoIdDTO coaIdDto) {
-        CoachInfoVo coachInfoVo = coachInfoService.getCoachInfoById(coaIdDto);
-        CoachInfoQRVo qrVo = new CoachInfoQRVo();
+    public Response<TmsCoachInfoQRVo> getCoachQrInfo(TmsCoachInfoIdDTO coaIdDto) {
+        TmsCoachInfoVo coachInfoVo = coachInfoService.getCoachInfoById(coaIdDto);
+        TmsCoachInfoQRVo qrVo = new TmsCoachInfoQRVo();
         BeanUtils.copyProperties(coachInfoVo,qrVo);
         return Response.success(qrVo);
     }
@@ -63,8 +63,8 @@ public class CoachInfoController extends BaseController {
      */
     @GetMapping("/coachInfoLogin")
     @ApiOperation("教练登录")
-    public Response<CoachInfo> coachInfoLogin(CoachInfoDTO coaDto) {
-        CoachInfo coachInfo = coachInfoService.getCoachBylogin(coaDto);
+    public Response<TmsCoachInfo> coachInfoLogin(TmsCoachInfoDTO coaDto) {
+        TmsCoachInfo coachInfo = coachInfoService.getCoachBylogin(coaDto);
         if(coachInfo==null) {
             Response response = new Response(502,"用户不存在或用户密码错误");
             return response;
@@ -79,7 +79,7 @@ public class CoachInfoController extends BaseController {
      */
     @PutMapping("/updateCoachPassword")
     @ApiOperation("教练修改密码")
-    public Response<CoachInfo> updateCoachPassword(CoachInfoPwDTO coaPwDto) {
+    public Response<TmsCoachInfo> updateCoachPassword(TmsCoachInfoPwDTO coaPwDto) {
         return coachInfoService.updateCoachPassword(coaPwDto);
     }
 

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

@@ -9,6 +9,7 @@ import com.miaxis.tms.dto.TmsStudentInfoDTO;
 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.TmsStudentInfoIdVo;
 import com.miaxis.tms.vo.TmsStudentInfoVo;
 import io.swagger.annotations.Api;
@@ -55,7 +56,7 @@ public class TmsStudentInfoController extends BaseController {
 
 
     /**
-     * 获取用户id获取详细信息
+     * 根据学员id获取详细信息
      */
     @GetMapping("/getTmsStudentInfoById")
     @ApiOperation("根据ID获取学员员详细信息")
@@ -64,9 +65,19 @@ public class TmsStudentInfoController extends BaseController {
     }
 
 
+    /**
+     * 根据学员id学员训练照片
+     */
+    @GetMapping("/getTmsLogFacListByStuId")
+    @ApiOperation("根据学员id学员训练照片")
+    public ResponsePageInfo<TmsLogFaceVo> getTmsLogFacListByStuId(TmsStudentInfoIdDTO studentInfoIdDTO) {
+        startPage();
+        List<TmsLogFaceVo> logFaceListList = studentInfoService.getTmsLogFacListByStuId(studentInfoIdDTO);
+        return toResponsePageInfo(logFaceListList);
+    }
 
     /**
-     * 根据学员ID绑定APP教练员
+     * 根据学员ID绑定APP教练员(极速驾培调用)
      */
     @GetMapping("/updateStudentAppCoachIdById")
     @ApiOperation("根据学员ID绑定APP教练员")

jsjp-admin/src/test/java/com/miaxis/test/CoachTest.java

@@ -1,9 +1,9 @@
 package com.miaxis.test;
 
 import com.miaxis.JsjpApplication;
-import com.miaxis.tms.dto.CoachInfoIdDTO;
-import com.miaxis.tms.service.ICoachInfoService;
-import com.miaxis.tms.vo.CoachInfoVo;
+import com.miaxis.tms.dto.TmsCoachInfoIdDTO;
+import com.miaxis.tms.service.ITmsCoachInfoService;
+import com.miaxis.tms.vo.TmsCoachInfoVo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,17 +18,17 @@ public class CoachTest {
 
 
     @Autowired
-    private ICoachInfoService coachInfoService;
+    private ITmsCoachInfoService coachInfoService;
 
 
     @Test
     public void test()  {
 
-        CoachInfoIdDTO coachIdDto = new CoachInfoIdDTO();
+        TmsCoachInfoIdDTO coachIdDto = new TmsCoachInfoIdDTO();
         coachIdDto.setCity("3501");
         coachIdDto.setId(3501033734l);
 
-        CoachInfoVo coachInfo = coachInfoService.getCoachInfoById(coachIdDto);
+        TmsCoachInfoVo coachInfo = coachInfoService.getCoachInfoById(coachIdDto);
         System.out.println(coachInfo);
 
     }

jsjp-service/src/main/java/com/miaxis/tms/domain/CoachInfo.java → jsjp-service/src/main/java/com/miaxis/tms/domain/TmsCoachInfo.java

@@ -22,7 +22,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 @TableName("tms_coach_info")
 @ApiModel(value = "CoachInfo", description = "教练对象 tms_coach_info")
-public class CoachInfo implements Serializable {
+public class TmsCoachInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

jsjp-service/src/main/java/com/miaxis/tms/dto/CoachInfoDTO.java → jsjp-service/src/main/java/com/miaxis/tms/dto/TmsCoachInfoDTO.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 
 
 @Data
-public class CoachInfoDTO implements Serializable {
+public class TmsCoachInfoDTO implements Serializable {
 
 
     @ApiModelProperty(value = "登录账号")

jsjp-service/src/main/java/com/miaxis/tms/dto/CoachInfoIdDTO.java → jsjp-service/src/main/java/com/miaxis/tms/dto/TmsCoachInfoIdDTO.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 
 
 @Data
-public class CoachInfoIdDTO implements Serializable {
+public class TmsCoachInfoIdDTO implements Serializable {
 
 
     @ApiModelProperty(value = "id")

jsjp-service/src/main/java/com/miaxis/tms/dto/CoachInfoPwDTO.java → jsjp-service/src/main/java/com/miaxis/tms/dto/TmsCoachInfoPwDTO.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 
 
 @Data
-public class CoachInfoPwDTO implements Serializable {
+public class TmsCoachInfoPwDTO implements Serializable {
 
 
     @ApiModelProperty(value = "登录账号")

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

@@ -14,13 +14,13 @@ public class TmsStudentInfoDTO implements Serializable {
     private String field;
 
     @ApiModelProperty(value = "驾校ID")
-    private Integer schoolId;
+    private Long schoolId;
 
     @ApiModelProperty(value = "教练员ID")
-    private String coachId;
+    private Long coachId;
 
     @ApiModelProperty(value = "APPP教练员ID")
-    private String appCoachId;
+    private Long appCoachId;
 
     @ApiModelProperty(value = "地区编号",required = true)
     private String city;

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

@@ -1,27 +0,0 @@
-package com.miaxis.tms.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.tms.domain.CoachInfo;
-import com.miaxis.tms.dto.CoachInfoDTO;
-import com.miaxis.tms.dto.CoachInfoIdDTO;
-import com.miaxis.tms.dto.CoachInfoPwDTO;
-import com.miaxis.tms.vo.CoachInfoVo;
-
-/**
- * <p>
- * 学员基本信息表 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2021-03-09
- */
-public interface CoachInfoMapper extends BaseMapper<CoachInfo> {
-
-
-    CoachInfoVo getCoachInfoById(CoachInfoIdDTO coaDto);
-
-    CoachInfo getCoachBylogin(CoachInfoDTO coaDto);
-
-    int updateCoachPassword(CoachInfoPwDTO coaPwDto);
-}

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

@@ -0,0 +1,26 @@
+package com.miaxis.tms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.tms.domain.TmsCoachInfo;
+import com.miaxis.tms.dto.TmsCoachInfoDTO;
+import com.miaxis.tms.dto.TmsCoachInfoIdDTO;
+import com.miaxis.tms.dto.TmsCoachInfoPwDTO;
+import com.miaxis.tms.vo.TmsCoachInfoVo;
+
+/**
+ * <p>
+ * 学员基本信息表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-03-09
+ */
+public interface TmsCoachInfoMapper extends BaseMapper<TmsCoachInfo> {
+
+
+    TmsCoachInfoVo getCoachInfoById(TmsCoachInfoIdDTO coaDto);
+
+    TmsCoachInfo getCoachBylogin(TmsCoachInfoDTO coaDto);
+
+    int updateCoachPassword(TmsCoachInfoPwDTO coaPwDto);
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.TmsStudentInfoIdVo;
 import com.miaxis.tms.vo.TmsStudentInfoVo;
 
@@ -25,4 +26,6 @@ public interface TmsStudentInfoMapper extends BaseMapper<TmsStudentInfoVo> {
     TmsStudentInfoIdVo getTmsStudentInfoById(TmsStudentInfoIdDTO stuIdDTO);
 
     int upStuAppCoachIdById(TmsStudentInfoQrDTO studentInfoQrDTO);
+
+    List<TmsLogFaceVo> getTmsLogFacListByStuId(TmsStudentInfoIdDTO studentInfoIdDTO);
 }

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

@@ -1,30 +0,0 @@
-package com.miaxis.tms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.tms.domain.CoachInfo;
-import com.miaxis.tms.dto.CoachInfoDTO;
-import com.miaxis.tms.dto.CoachInfoIdDTO;
-import com.miaxis.tms.dto.CoachInfoPwDTO;
-import com.miaxis.tms.vo.CoachInfoVo;
-
-/**
- * <p>
- * 学员基本信息表 服务类
- * </p>
- *
- * @author ${author}
- * @since 2021-03-09
- */
-public interface ICoachInfoService extends IService<CoachInfo> {
-
-
-
-    CoachInfoVo getCoachInfoById(CoachInfoIdDTO coaDto);
-
-
-    CoachInfo getCoachBylogin(CoachInfoDTO coaDto);
-
-
-    Response updateCoachPassword(CoachInfoPwDTO coaPwDto);
-}

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

@@ -0,0 +1,30 @@
+package com.miaxis.tms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.tms.domain.TmsCoachInfo;
+import com.miaxis.tms.dto.TmsCoachInfoDTO;
+import com.miaxis.tms.dto.TmsCoachInfoIdDTO;
+import com.miaxis.tms.dto.TmsCoachInfoPwDTO;
+import com.miaxis.tms.vo.TmsCoachInfoVo;
+
+/**
+ * <p>
+ * 学员基本信息表 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-03-09
+ */
+public interface ITmsCoachInfoService extends IService<TmsCoachInfo> {
+
+
+
+    TmsCoachInfoVo getCoachInfoById(TmsCoachInfoIdDTO coaDto);
+
+
+    TmsCoachInfo getCoachBylogin(TmsCoachInfoDTO coaDto);
+
+
+    Response updateCoachPassword(TmsCoachInfoPwDTO coaPwDto);
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 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.TmsStudentInfoIdVo;
 import com.miaxis.tms.vo.TmsStudentInfoVo;
 
@@ -26,4 +27,6 @@ public interface ITmsStudentInfoService extends IService<TmsStudentInfoVo> {
     TmsStudentInfoIdVo getTmsStudentInfoById(TmsStudentInfoIdDTO stuIdDTO);
 
     int upStuAppCoachIdById(TmsStudentInfoQrDTO studentInfoQrDTO);
+
+    List<TmsLogFaceVo> getTmsLogFacListByStuId(TmsStudentInfoIdDTO studentInfoIdDTO);
 }

jsjp-service/src/main/java/com/miaxis/tms/service/impl/CoachInfoServiceImpl.java → jsjp-service/src/main/java/com/miaxis/tms/service/impl/TmsCoachInfoServiceImpl.java

@@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.common.annotation.DataSource;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.enums.DataSourceTypeEnum;
-import com.miaxis.tms.domain.CoachInfo;
-import com.miaxis.tms.dto.CoachInfoDTO;
-import com.miaxis.tms.dto.CoachInfoIdDTO;
-import com.miaxis.tms.dto.CoachInfoPwDTO;
-import com.miaxis.tms.mapper.CoachInfoMapper;
-import com.miaxis.tms.service.ICoachInfoService;
-import com.miaxis.tms.vo.CoachInfoVo;
+import com.miaxis.tms.domain.TmsCoachInfo;
+import com.miaxis.tms.dto.TmsCoachInfoDTO;
+import com.miaxis.tms.dto.TmsCoachInfoIdDTO;
+import com.miaxis.tms.dto.TmsCoachInfoPwDTO;
+import com.miaxis.tms.mapper.TmsCoachInfoMapper;
+import com.miaxis.tms.service.ITmsCoachInfoService;
+import com.miaxis.tms.vo.TmsCoachInfoVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -26,28 +26,28 @@ import javax.annotation.Resource;
  */
 @Service
 @DataSource(value = DataSourceTypeEnum.NEWGZPT)
-public class CoachInfoServiceImpl extends ServiceImpl<CoachInfoMapper, CoachInfo> implements ICoachInfoService {
+public class TmsCoachInfoServiceImpl extends ServiceImpl<TmsCoachInfoMapper, TmsCoachInfo> implements ITmsCoachInfoService {
 
 
     @Resource
-    CoachInfoMapper mapper;
+    TmsCoachInfoMapper mapper;
 
     @Override
-    public CoachInfoVo getCoachInfoById(CoachInfoIdDTO coaDto) {
+    public TmsCoachInfoVo getCoachInfoById(TmsCoachInfoIdDTO coaDto) {
         return  mapper.getCoachInfoById(coaDto);
     }
 
     @Override
-    public CoachInfo getCoachBylogin(CoachInfoDTO coaDto) {
+    public TmsCoachInfo getCoachBylogin(TmsCoachInfoDTO coaDto) {
         return mapper.getCoachBylogin(coaDto);
     }
 
     @Override
-    public Response updateCoachPassword(CoachInfoPwDTO coaPwDto) {
+    public Response updateCoachPassword(TmsCoachInfoPwDTO coaPwDto) {
 
-        CoachInfoDTO coaDto = new CoachInfoDTO();
+        TmsCoachInfoDTO coaDto = new TmsCoachInfoDTO();
         BeanUtils.copyProperties(coaPwDto,coaDto);
-        CoachInfo coachInfo = this.getCoachBylogin(coaDto);
+        TmsCoachInfo coachInfo = this.getCoachBylogin(coaDto);
         if(coachInfo==null) {
             Response response = new Response(502,"用户不存在或用户密码错误");
             return response;

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

@@ -8,6 +8,7 @@ import com.miaxis.tms.dto.TmsStudentInfoIdDTO;
 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.TmsStudentInfoIdVo;
 import com.miaxis.tms.vo.TmsStudentInfoVo;
 import org.springframework.stereotype.Service;
@@ -48,5 +49,10 @@ public class TmsStudentInfoServiceImpl extends ServiceImpl<TmsStudentInfoMapper,
         return mapper.upStuAppCoachIdById(studentInfoQrDTO);
     }
 
+    @Override
+    public List<TmsLogFaceVo> getTmsLogFacListByStuId(TmsStudentInfoIdDTO studentInfoIdDTO) {
+        return mapper.getTmsLogFacListByStuId(studentInfoIdDTO);
+    }
+
 
 }

jsjp-service/src/main/java/com/miaxis/tms/vo/CoachInfoQRVo.java → jsjp-service/src/main/java/com/miaxis/tms/vo/TmsCoachInfoQRVo.java

@@ -19,7 +19,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "CoachInfoQRVo", description = "教练对象 tms_coach_info")
-public class CoachInfoQRVo implements Serializable {
+public class TmsCoachInfoQRVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

jsjp-service/src/main/java/com/miaxis/tms/vo/CoachInfoVo.java → jsjp-service/src/main/java/com/miaxis/tms/vo/TmsCoachInfoVo.java

@@ -22,7 +22,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 @TableName("tms_coach_info")
 @ApiModel(value = "CoachInfo", description = "教练对象 tms_coach_info")
-public class CoachInfoVo implements Serializable {
+public class TmsCoachInfoVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -0,0 +1,48 @@
+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;
+
+/**
+ * 用户对象 user_info
+ *
+ * @author miaxis
+ * @date 2021-01-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TmsLogFaceVo", description = "照片比对VO")
+public class TmsLogFaceVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date crdate;
+
+    @ApiModelProperty(value = "终端SIM号")
+    private String sim;
+
+    @ApiModelProperty(value = "照片对比源")
+    private String sourceimg;
+
+    @ApiModelProperty(value = "拍照类型 1-签到，2-训练过程3、签退")
+    private Integer type;
+
+    @ApiModelProperty(value = "上传照片")
+    private String img;
+
+    @ApiModelProperty(value = "相似度")
+    private String similar;
+
+
+
+
+}

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

@@ -2,6 +2,7 @@ package com.miaxis.tms.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,131 +16,130 @@ public class TmsStudentInfoIdVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableField("TSO_ID")
+    @ApiModelProperty(value = "学员ID")
     private Long id;
 
-    @TableField("TSO_CARDTYPE")
+    @ApiModelProperty(value = "证件类型： 1身份证 2护照 3军官证 4其他")
     private String cardType;
 
-    @TableField("TSO_IDCARD")
+    @ApiModelProperty(value = "证件号")
     private String idcard;
 
-    @TableField("TSO_NAME")
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    @TableField("TSO_SEX")
+    @ApiModelProperty(value = "性别(1:男性; 2:女性;)")
     private String sex;
 
-    @TableField("TSO_PHONE")
+    @ApiModelProperty(value = "手机号码")
     private String phone;
 
-    @TableField("TSO_SOURCE")
+    @ApiModelProperty(value = "来源(推荐人)")
     private String source;
 
-    @TableField("TSO_NATIONALITY")
+    @ApiModelProperty(value = "国籍")
     private String nationality;
 
-    @TableField("TSO_TRAINTYPE")
+    @ApiModelProperty(value = "培训车型(下列编码单选：A1,A2,A3,B1,B2,C1,C2,C3,C4,C5,D,E,F,M,N,P)")
     private String trainType;
 
-    @TableField("TSO_ACTIVE")
+    @ApiModelProperty(value = "是否已经激活 0 未激活 1 已激活")
     private String active;
 
-    @TableField("TSO_RECORD_DATE")
+    @ApiModelProperty(value = "备案时间")
     private Date recordDate;
 
-    @TableField("TSO_ADDRESS")
+    @ApiModelProperty(value = "联系地址")
     private String address;
 
-    @TableField("TSO_PHOTO_PATH")
+    @ApiModelProperty(value = "照片保存地址")
     private String photoPath;
 
-    @TableField("FACE")
+    @ApiModelProperty(value = "人脸比对模板")
     private String face;
 
-    @TableField("TSI_ID")
+    @ApiModelProperty(value = "驾校ID")
     private Long schoolId;
 
-    @TableField("TSI_NAME")
+    @ApiModelProperty(value = "驾校名称")
     private String schoolName;
 
-    @TableField("TSI_SHORTNAME")
+    @ApiModelProperty(value = "驾校简称")
     private String schoolShortName;
 
-    @TableField("TSI_ADDRESS")
+    @ApiModelProperty(value = "驾校地址")
     private String schoolAddress;
 
-    @TableField("TSI_INSCODE")
+    @ApiModelProperty(value = "驾校全国统一编号")
     private String schollInscode;
 
-    @TableField("TSI_QXBH")
+    @ApiModelProperty(value = "区县编号")
     private String qxbh;
 
-    @TableField("TSI_QXMC")
+    @ApiModelProperty(value = "区县名称")
     private String qxmc;
 
-    @TableField("TSI_DQBH")
+    @ApiModelProperty(value = "地区编号")
     private String dqbh;
 
-    @TableField("TSI_DQMC")
+    @ApiModelProperty(value = "地区名称")
     private String dqmc;
 
-    @TableField("SRI_TRAIN_ONE_EXAM_STATUS")
+    @ApiModelProperty(value = "第一阶段学时考核状态 0 未考核 1 考核通过 2 考核不通过")
     private String trainOneExamStatus;
 
-    @TableField("SRI_TRAIN_ONE_EXAM_TIME")
+    @ApiModelProperty(value = "第一阶段学时考核时间")
     private Date trainOneExamTime;
 
-    @TableField("SRI_TRAIN_TWO_EXAM_STATUS")
+    @ApiModelProperty(value = "第二阶段学时考核状态 0 未考核 1 考核通过 2 考核不通过")
     private String trainTwoExamStatus;
 
-    @TableField("SRI_TRAIN_TWO_EXAM_TIME")
+    @ApiModelProperty(value = "第二阶段学时考核时间")
     private Date trainTwoExamTime;
 
-    @TableField("SRI_TRAIN_THREE_EXAM_STATUS")
+    @ApiModelProperty(value = "第三阶段学时考核状态 0 未考核 1 考核通过 2 考核不通过")
     private String trainThreeExamStatus;
 
-    @TableField("SRI_TRAIN_THREE_EXAM_TIME")
+    @ApiModelProperty(value = "第三阶段学时考核时间")
     private Date trainThreeExamTime;
 
-
-    @TableField("SRI_TRAIN_FOUR_EXAM_STATUS")
+    @ApiModelProperty(value = "第四阶段学时考核状态 0 未考核 1 考核通过 2 考核不通过")
     private String trainFourExamStatus;
 
-    @TableField("SRI_TRAIN_FOUR_EXAM_TIME")
+    @ApiModelProperty(value = "第四阶段学时考核时间")
     private Date trainFourExamTime;
 
-    @TableField("K1")
+    @ApiModelProperty(value = "科目一已完成学时")
     private String k1;
 
-    @TableField("K2")
+    @ApiModelProperty(value = "科目二已完成学时")
     private String k2;
 
-    @TableField("K3")
+    @ApiModelProperty(value = "科目三已完成学时")
     private String k3;
 
-    @TableField("K4")
+    @ApiModelProperty(value = "科目四已完成学时")
     private String k4;
 
-    @TableField("TOTAL_KM1")
+    @ApiModelProperty(value = "科目一总需要学时")
     private String totalKm1;
 
-    @TableField("TOTAL_KM2")
+    @ApiModelProperty(value = "科目二总需要学时")
     private String totalKm2;
 
-    @TableField("TOTAL_KM3")
+    @ApiModelProperty(value = "科目三总需要学时")
     private String totalKm3;
 
-    @TableField("TOTAL_KM4")
+    @ApiModelProperty(value = "科目四总需要学时")
     private String totalKm4;
 
-    @TableField("K2MILEAGE")
+    @ApiModelProperty(value = "科目二里程数")
     private String k2Mileage;
 
-    @TableField("MILEAGE")
+    @ApiModelProperty(value = "总里程数")
     private String mileage;
 
-    @TableField("K3MILEAGE")
+    @ApiModelProperty(value = "科目三里程数")
     private String k3Mileage;
 
 }

jsjp-service/src/main/resources/mapper/tms/CoachInfoMapper.xml → jsjp-service/src/main/resources/mapper/tms/TmsCoachInfoMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miaxis.tms.mapper.CoachInfoMapper">
+<mapper namespace="com.miaxis.tms.mapper.TmsCoachInfoMapper">
 
     <!-- 定义结果映射 -->
-    <resultMap type="com.miaxis.tms.domain.CoachInfo" id="CoachInfoResultMap">
+    <resultMap type="com.miaxis.tms.domain.TmsCoachInfo" id="CoachInfoResultMap">
         <id property="id" column="TCI_ID"/>
         <result property="coachNum" column="TCI_COACHNUM"/>
         <result property="recordDate" column="TCI_RECORD_DATE"/>
@@ -52,7 +52,7 @@
 
 
     <!-- 定义结果映射 -->
-    <resultMap type="com.miaxis.tms.vo.CoachInfoVo" id="CoachInfoVoResultMap">
+    <resultMap type="com.miaxis.tms.vo.TmsCoachInfoVo" id="CoachInfoVoResultMap">
         <id property="id" column="TCI_ID"/>
         <result property="coachNum" column="TCI_COACHNUM"/>
         <result property="recordDate" column="TCI_RECORD_DATE"/>
@@ -105,18 +105,18 @@
 
 
 
-    <select id="getCoachInfoById"  parameterType="com.miaxis.tms.dto.CoachInfoIdDTO" resultMap="CoachInfoVoResultMap">
+    <select id="getCoachInfoById" parameterType="com.miaxis.tms.dto.TmsCoachInfoIdDTO" resultMap="CoachInfoVoResultMap">
         select c.*,s.tsi_dqbh,s.tsi_name from tms_coach_info@TMS${city} c join tms_school_info@TMS${city} s on c.tci_school_id = s.tsi_id where c.tci_id = #{id,jdbcType=NUMERIC}
     </select>
 
 
-    <select id="getCoachBylogin" parameterType="com.miaxis.tms.dto.CoachInfoDTO" resultMap="CoachInfoResultMap">
+    <select id="getCoachBylogin" parameterType="com.miaxis.tms.dto.TmsCoachInfoDTO" resultMap="CoachInfoResultMap">
         select * from tms_coach_info@TMS${city} t where t.tci_id =
                                              (select max(tci_id) from tms_coach_info@TMS${city} g where g.tci_idcard=#{idcard} and g.tci_password=#{password})
     </select>
 
 
-    <update id="updateCoachPassword" parameterType="com.miaxis.tms.dto.CoachInfoPwDTO" >
+    <update id="updateCoachPassword" parameterType="com.miaxis.tms.dto.TmsCoachInfoPwDTO" >
         update tms_coach_info@TMS${city} set tci_password = #{newPassword,jdbcType=VARCHAR}  where tci_id =
                                                                 (select max(tci_id) from tms_coach_info@TMS${city} g where g.tci_idcard=#{idcard,jdbcType=VARCHAR} and g.tci_password=#{password,jdbcType=VARCHAR})
     </update>

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

@@ -81,13 +81,13 @@
             AND t1.TSO_HISTORY = '0'
             AND t1.TSO_BUSITYPE in ('0', '1')
             AND t1.TSO_LOGOUT = 0
-            <if test="coachId!=null" > AND t1.TSO_COACHID = #{coachId } </if>
-            <if test="appCoachId!=null" > AND t1.TSO_APP_COACH_ID = #{appCoachId } </if>
+            <if test="coachId!=null" > AND t1.TSO_COACHID = #{coachId,jdbcType=NUMERIC } </if>
+            <if test="appCoachId!=null" > AND t1.TSO_APP_COACH_ID = #{appCoachId,jdbcType=NUMERIC } </if>
             <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} </if>
-            <if test="state != null  and state != ''"> AND t1.TSO_STATE = #{state}</if>
+            <if test="schoolId != null "> and t1.TSO_SCHOOL_ID = #{schoolId,,jdbcType=NUMERIC} </if>
+            <if test="state != null  and state != ''"> AND t1.TSO_STATE = #{state,jdbcType=VARCHAR }</if>
         </where>
-        ORDER BY t1.TSO_ID desc, NLSSORT(t1.TSO_NAME, 'NLS_SORT=SCHINESE_PINYIN_M')
+        ORDER BY t1.TSO_ID desc
     </select>
 
 
@@ -139,6 +139,11 @@
      WHERE T.TSO_ID = #{id}
     </select>
 
+    <select id="getTmsLogFacListByStuId" parameterType="com.miaxis.tms.dto.TmsStudentInfoIdDTO" resultType="com.miaxis.tms.vo.TmsLogFaceVo" >
+        select f.crdate,f.sim,f.sourceimg,f.img, f.similar, f.type from tms_log_face_info@tms${city} f
+        where f.stu_out_id = #{id}
+        order by f.crdate desc
+    </select>
 
 
     <update id="upStuAppCoachIdById" parameterType="com.miaxis.tms.dto.TmsStudentInfoQrDTO">