Browse Source

20201127v1.3

tiaosheng
zy_Java 5 years ago
parent
commit
3dc3a8b80a
  1. 4
      mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java
  2. 4
      mt/src/main/resources/mapper_dao/CompeteVideoDao.xml
  3. 3
      tall/src/main/java/com/ccsens/tall/service/UserService.java

4
mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java

@ -66,10 +66,10 @@ public class CompeteVideoController {
return JsonResponse.newInstance().ok(peoSignStatus); return JsonResponse.newInstance().ok(peoSignStatus);
} }
@MustLogin @MustLogin
@ApiOperation(value = "查看教练签到状态(签到用)", notes = "Mr.王---------查看教练的人的签到状态") @ApiOperation(value = "查看裁判签到状态(签到用)", notes = "Mr.王---------查看教练的人的签到状态")
@RequestMapping(value = "/selectCoachStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @RequestMapping(value = "/selectCoachStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<PageInfo<VideoProjectVo.CoachSignStatu>> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetSignStatus> params) { public JsonResponse<PageInfo<VideoProjectVo.CoachSignStatu>> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetSignStatus> params) {
log.info("查看教练签到状态(签到用):{}",params); log.info("查看裁判签到状态(签到用):{}",params);
PageInfo<VideoProjectVo.CoachSignStatu> coachSignStatus = iCompeteVedioService.selectCoachSignStatus(params); PageInfo<VideoProjectVo.CoachSignStatu> coachSignStatus = iCompeteVedioService.selectCoachSignStatus(params);
return JsonResponse.newInstance().ok(coachSignStatus); return JsonResponse.newInstance().ok(coachSignStatus);
} }

4
mt/src/main/resources/mapper_dao/CompeteVideoDao.xml

@ -68,7 +68,7 @@
tt.`cr` as `time` tt.`cr` as `time`
FROM FROM
t_compete_judgment tcj t_compete_judgment tcj
left join tall.t_pro_member ttpm on tcj.member_id=ttpm.id left join tall.t_pro_member ttpm on tcj.member_id=ttpm.id and ttpm.user_id != 0
left join ( left join (
select select
@ -76,7 +76,7 @@
user_id user_id
From tall.t_sys_log From tall.t_sys_log
where `url`='/users/signin' and `rec_status`=0 where `url`='/users/signin' and `rec_status`=0 and user_id != 0
<if test="param.signEndTime!=null"> <if test="param.signEndTime!=null">
and tall.t_sys_log.created_at &lt;= #{param.signEndTime,jdbcType=TIMESTAMP} and tall.t_sys_log.created_at &lt;= #{param.signEndTime,jdbcType=TIMESTAMP}
</if> </if>

3
tall/src/main/java/com/ccsens/tall/service/UserService.java

@ -333,6 +333,9 @@ public class UserService implements IUserService {
userSignVo = new UserVo.UserSign(); userSignVo = new UserVo.UserSign();
userSignVo.setUserId(theAuth.getUserId()); userSignVo.setUserId(theAuth.getUserId());
userSignVo.setAuthId(theAuth.getId()); userSignVo.setAuthId(theAuth.getId());
//给所有手机号一样的角色添加userId
memberHandler(theAuth.getUserId(), phone);
} else { } else {
throw new BaseException(CodeEnum.SMS_CODE_CORRECT); throw new BaseException(CodeEnum.SMS_CODE_CORRECT);
} }

Loading…
Cancel
Save