From 290aedb9b0c567e94276b88a357921233710cf13 Mon Sep 17 00:00:00 2001 From: bianyadong Date: Tue, 14 May 2024 15:27:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/vo/AssessmentUserTrainingVO.java | 12 ++++++++++++ .../service/impl/EmployeeTrainingServiceImpl.java | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java index 0332bd213..ea72ec4c4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java @@ -106,6 +106,18 @@ public class AssessmentUserTrainingVO { @ApiModelProperty("所属区域") private String regionNodeName; + /** + * 考核项数 + */ + @ApiModelProperty("考核项数") + private Integer assessmentNum; + + /** + * 考核总项数 + */ + @ApiModelProperty("考核总项数") + private Integer assessmentTotalNum; + @ApiModelProperty("考核数据") 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 b04605fde..fea6cc85f 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 @@ -500,7 +500,8 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO); } } - + assessmentUserTrainingVO.setAssessmentNum(employeeTrainingDO.getAssessmentNum()); + assessmentUserTrainingVO.setAssessmentTotalNum(employeeTrainingDO.getAssessmentTotalNum()); assessmentUserTrainingVO.setPracticalExamScore(employeeTrainingDO.getPracticalExamScore()); assessmentUserTrainingVO.setPracticalExamStatus(employeeTrainingDO.getPracticalExamStatus()); assessmentUserTrainingVO.setId(tempUserDetailDO.getId());