bug fix
This commit is contained in:
@@ -78,7 +78,7 @@ public class EmployeeTrainingDAO {
|
|||||||
|
|
||||||
public Integer unCompleteNum(Long shopId) {
|
public Integer unCompleteNum(Long shopId) {
|
||||||
Example example = new Example(EmployeeTrainingDO.class);
|
Example example = new Example(EmployeeTrainingDO.class);
|
||||||
example.createCriteria().andEqualTo("shopId", shopId).andCondition("theoretical_exam_status != 1").andCondition("practical_exam_status != 1");
|
example.createCriteria().andEqualTo("shopId", shopId).andCondition("(theoretical_exam_status != 1 or practical_exam_status != 1)");
|
||||||
return employeeTrainingMapper.selectCountByExample(example);
|
return employeeTrainingMapper.selectCountByExample(example);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -658,7 +658,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
|
|||||||
employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
|
employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
|
||||||
|
|
||||||
//查询员工是否全部培训完成
|
//查询员工是否全部培训完成
|
||||||
Integer unCompleteNum = employeeTrainingDAO.unCompleteNum(tempUserDetailDO.getShopId());
|
Integer unCompleteNum = employeeTrainingDAO.unCompleteNum(employeeTrainingDO.getShopId());
|
||||||
if (unCompleteNum != null && unCompleteNum == 0) {
|
if (unCompleteNum != null && unCompleteNum == 0) {
|
||||||
// 培训全部结束
|
// 培训全部结束
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user