diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ApiErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ApiErrorCodeEnum.java index 56b7c5325..4eda76877 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ApiErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ApiErrorCodeEnum.java @@ -6,7 +6,7 @@ import java.util.function.Function; import java.util.stream.Collectors; public enum ApiErrorCodeEnum { - LINE_INFO("lineInfoDO","线索信息确实"), + LINE_INFO("lineInfoDO","线索信息缺失"), FRANCHISE_FEE("franchiseFeeDO","缴费信息缺失"), SIGNING_BASE_INFO("signingBaseInfoDO","签约信息缺失"), LINE_PAY("linePayDO","缴款信息缺失"), 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 21ceb4aac..b7d70d698 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 @@ -78,7 +78,7 @@ public class EmployeeTrainingDAO { public Integer unCompleteNum(Long shopId) { 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); } } 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 e335b15bd..cea4fee27 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 @@ -658,7 +658,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO); //查询员工是否全部培训完成 - Integer unCompleteNum = employeeTrainingDAO.unCompleteNum(tempUserDetailDO.getShopId()); + Integer unCompleteNum = employeeTrainingDAO.unCompleteNum(employeeTrainingDO.getShopId()); if (unCompleteNum != null && unCompleteNum == 0) { // 培训全部结束