suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

getUser

Browse Source
This commit is contained in:
苏竹红
2024-05-29 19:55:21 +08:00
parent 5f7314cd38
commit c1aec2124f
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java
View File

@@ -1,5 +1,6 @@
package com.cool.store.service; package com.cool.store.service;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.*; import com.cool.store.request.*;
import com.cool.store.vo.AssessmentUserTrainingVO; import com.cool.store.vo.AssessmentUserTrainingVO;
import com.cool.store.vo.EmployeeTrainingDetailVO; import com.cool.store.vo.EmployeeTrainingDetailVO;
@@ -35,5 +36,5 @@ public interface EmployeeTrainingService {
void turn(Long id, String userId, String turnUserId); void turn(Long id, String userId, String turnUserId);
void assessmentUserCommit(EmployeeAssessmentCommitListRequest request); void assessmentUserCommit(EmployeeAssessmentCommitListRequest request, LoginUserInfo userId);
} }

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java
View File

@@ -3,6 +3,7 @@ package com.cool.store.service.impl;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.CommonConstants; import com.cool.store.constants.CommonConstants;
import com.cool.store.constants.RedisConstant; import com.cool.store.constants.RedisConstant;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.*; import com.cool.store.dao.*;
import com.cool.store.dto.SmallVideoDTO; import com.cool.store.dto.SmallVideoDTO;
import com.cool.store.dto.SmallVideoInfoDTO; import com.cool.store.dto.SmallVideoInfoDTO;
@@ -579,7 +580,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public void assessmentUserCommit(EmployeeAssessmentCommitListRequest request) { public void assessmentUserCommit(EmployeeAssessmentCommitListRequest request, LoginUserInfo user) {
if (CollectionUtils.isEmpty(request.getList())) { if (CollectionUtils.isEmpty(request.getList())) {
return; return;
} }
@@ -628,7 +629,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
checkVideoHandel(assessmentDataDOList); checkVideoHandel(assessmentDataDOList);
assessmentDataDAO.batchInsertOrUpdate(assessmentDataDOList); assessmentDataDAO.batchInsertOrUpdate(assessmentDataDOList);
employeeTrainingDO.setPracticalAssessmentUserId(userId); employeeTrainingDO.setPracticalAssessmentUserId(user.getUserId());
employeeTrainingDO.setPracticalExamScore(totalScore.get().intValue()); employeeTrainingDO.setPracticalExamScore(totalScore.get().intValue());
if (totalScore.get().intValue() > CommonConstants.NINETY) { if (totalScore.get().intValue() > CommonConstants.NINETY) {
employeeTrainingDO.setPracticalExamStatus(1); employeeTrainingDO.setPracticalExamStatus(1);

3
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java
View File

@@ -1,6 +1,7 @@
package com.cool.store.controller.webb; package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.*; import com.cool.store.request.*;
import com.cool.store.response.ResponseResult; import com.cool.store.response.ResponseResult;
import com.cool.store.service.EmployeeTrainingService; import com.cool.store.service.EmployeeTrainingService;
@@ -131,7 +132,7 @@ public class EmployeeTrainingController {
@ApiOperation("培训-实训考核-提交考核结果") @ApiOperation("培训-实训考核-提交考核结果")
@PostMapping("/assessmentUserCommit") @PostMapping("/assessmentUserCommit")
public ResponseResult<Boolean> assessmentUserCommit(@RequestBody EmployeeAssessmentCommitListRequest request) { public ResponseResult<Boolean> assessmentUserCommit(@RequestBody EmployeeAssessmentCommitListRequest request) {
employeeTrainingService.assessmentUserCommit(request); employeeTrainingService.assessmentUserCommit(request, CurrentUserHolder.getUser());
return ResponseResult.success(Boolean.TRUE); return ResponseResult.success(Boolean.TRUE);
} }