diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ShopIdRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ShopIdRequest.java new file mode 100644 index 000000000..7f1b1c93d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ShopIdRequest.java @@ -0,0 +1,15 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author byd + * @date 2024-04-24 16:40 + */ +@Data +public class ShopIdRequest { + + @ApiModelProperty("shopId") + private Long shopId; +} 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 7fb13ebe0..d243ff305 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 @@ -596,7 +596,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { if (item.getId() != null) { assessmentDataDO = assessmentDataDAO.selectByPrimaryKey(item.getId()); } else { - assessmentDataDO = assessmentDataDAO.selectByTemplateId(item.getTemplateId(), employeeTrainingDO.getXfsgUserDetailId().toString(), item.getShopId()); + assessmentDataDO = assessmentDataDAO.selectByTemplateId(item.getTemplateId(), userId, item.getShopId()); } if (assessmentDataDO != null) { assessmentDataDO.setScore(item.getScore()); @@ -609,7 +609,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { assessmentDataDO.setShopId(item.getShopId()); assessmentDataDO.setComments(item.getComments()); assessmentDataDO.setScore(item.getScore()); - assessmentDataDO.setAssessmentUserId(employeeTrainingDO.getXfsgUserDetailId().toString()); + assessmentDataDO.setAssessmentUserId(userId); assessmentDataDO.setPicture(item.getPicture()); assessmentDataDO.setVideo(item.getVideo()); assessmentDataDAO.insertSelective(assessmentDataDO); @@ -624,7 +624,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { if (totalScore.get().intValue() > CommonConstants.NINETY) { employeeTrainingDO.setPracticalExamStatus(1); } else { - employeeTrainingDO.setPracticalExamStatus(0); + employeeTrainingDO.setPracticalExamStatus(2); } employeeTrainingDO.setPracticalExamScore(totalScore.get().intValue()); employeeTrainingDO.setActualAssessmentTime(new Date()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTempUserDetailController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTempUserDetailController.java index 25a64f048..d546ea9f8 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTempUserDetailController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTempUserDetailController.java @@ -2,6 +2,7 @@ package com.cool.store.controller.webb; import com.cool.store.dto.ehr.StaffBaseInfoDTO; import com.cool.store.request.IdRequest; +import com.cool.store.request.ShopIdRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.TempUserDetailService; import com.cool.store.vo.TempUserDetailInfoVO; @@ -60,8 +61,8 @@ public class PCTempUserDetailController { @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "店铺id shopId") }) - public ResponseResult registrationCompleted(@RequestBody IdRequest idRequest) { - tempUserDetailService.registrationCompleted((idRequest.getId())); + public ResponseResult registrationCompleted(@RequestBody ShopIdRequest shopIdRequest) { + tempUserDetailService.registrationCompleted(shopIdRequest.getShopId()); return ResponseResult.success(Boolean.TRUE); }