From c1aec2124f989f4a98fafca24613a9fb6d49e9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 29 May 2024 19:55:21 +0800 Subject: [PATCH] getUser --- .../java/com/cool/store/service/EmployeeTrainingService.java | 3 ++- .../cool/store/service/impl/EmployeeTrainingServiceImpl.java | 5 +++-- .../store/controller/webb/EmployeeTrainingController.java | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java index 392b64d0d..8baa5705b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.*; import com.cool.store.vo.AssessmentUserTrainingVO; import com.cool.store.vo.EmployeeTrainingDetailVO; @@ -35,5 +36,5 @@ public interface EmployeeTrainingService { void turn(Long id, String userId, String turnUserId); - void assessmentUserCommit(EmployeeAssessmentCommitListRequest request); + void assessmentUserCommit(EmployeeAssessmentCommitListRequest request, LoginUserInfo userId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java index cea4fee27..49286934f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java @@ -3,6 +3,7 @@ package com.cool.store.service.impl; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; import com.cool.store.constants.RedisConstant; +import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.*; import com.cool.store.dto.SmallVideoDTO; import com.cool.store.dto.SmallVideoInfoDTO; @@ -579,7 +580,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { @Transactional(rollbackFor = Exception.class) @Override - public void assessmentUserCommit(EmployeeAssessmentCommitListRequest request) { + public void assessmentUserCommit(EmployeeAssessmentCommitListRequest request, LoginUserInfo user) { if (CollectionUtils.isEmpty(request.getList())) { return; } @@ -628,7 +629,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { checkVideoHandel(assessmentDataDOList); assessmentDataDAO.batchInsertOrUpdate(assessmentDataDOList); - employeeTrainingDO.setPracticalAssessmentUserId(userId); + employeeTrainingDO.setPracticalAssessmentUserId(user.getUserId()); employeeTrainingDO.setPracticalExamScore(totalScore.get().intValue()); if (totalScore.get().intValue() > CommonConstants.NINETY) { employeeTrainingDO.setPracticalExamStatus(1); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java index 5b76d016b..c2ec01b16 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java @@ -1,6 +1,7 @@ package com.cool.store.controller.webb; import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.*; import com.cool.store.response.ResponseResult; import com.cool.store.service.EmployeeTrainingService; @@ -131,7 +132,7 @@ public class EmployeeTrainingController { @ApiOperation("培训-实训考核-提交考核结果") @PostMapping("/assessmentUserCommit") public ResponseResult assessmentUserCommit(@RequestBody EmployeeAssessmentCommitListRequest request) { - employeeTrainingService.assessmentUserCommit(request); + employeeTrainingService.assessmentUserCommit(request, CurrentUserHolder.getUser()); return ResponseResult.success(Boolean.TRUE); }