diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java index f1997a961..7ab53c9fb 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java @@ -77,11 +77,8 @@ public class EmployeeTrainingDAO { } public Integer unCompleteNum(Long shopId) { - List statusList = new ArrayList<>(); - statusList.add(0); - statusList.add(1); Example example = new Example(EmployeeTrainingDO.class); - example.createCriteria().andIn("assessmentStatus", statusList).andEqualTo("shopId", shopId); + example.createCriteria().andEqualTo("shopId", shopId).andCondition("theoreticalExamStatus != 1").andCondition("practical_exam_status != 1", 1); return employeeTrainingMapper.selectCountByExample(example); } } 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 73992e055..e335b15bd 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 @@ -649,10 +649,10 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { } - if (employeeTrainingDO.getPracticalExamStatus() == CommonConstants.TWO || employeeTrainingDO.getTheoreticalExamStatus() == CommonConstants.TWO) { + if (employeeTrainingDO.getPracticalExamStatus() == CommonConstants.TWO) { employeeTrainingDO.setAssessmentStatus(CommonConstants.THREE); } - if (employeeTrainingDO.getPracticalExamStatus() == 1 && employeeTrainingDO.getTheoreticalExamStatus() == 1) { + if (employeeTrainingDO.getPracticalExamStatus() == 1) { employeeTrainingDO.setAssessmentStatus(CommonConstants.TWO); } employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);