suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
苏竹红
2024-05-26 11:14:52 +08:00
parent 867ffecadd c57f4d214d
commit 826f07dd8b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/src/main/java/com/cool/store/enums/ApiErrorCodeEnum.java
View File

@@ -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","缴款信息缺失"),

2
coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java
View File

@@ -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);
}
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java
View File

@@ -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) {
// 培训全部结束