Skip to content

P
promotion-service
提交 3e42099c authored 作者: 000516's avatar 000516 提交者： Coding
浏览文件
操作

打卡时，计划如果已执行，则判断是否单点CP类型

Merge Request: 打卡时，计划如果已执行，则判断是否单点CP类型 Created By: @李秋林 Accepted By: @李秋林 URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/194?initial=true
上级 237c7f6e 35a08eb2
显示空白字符变更
内嵌 并排
正在显示 包含 1 行增加 和 1 行删除
src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityClockCoreServiceImpl.java
浏览文件 @ 3e42099c
...@@ -128,7 +128,7 @@ public class TemporaryActivityClockCoreServiceImpl implements TemporaryActivityC ...@@ -128,7 +128,7 @@ public class TemporaryActivityClockCoreServiceImpl implements TemporaryActivityC
public void clockInTodayPlan(TemporaryClockDto dto, Integer clockType) { public void clockInTodayPlan(TemporaryClockDto dto, Integer clockType) {
if (Objects.isNull(dto.getId())) { if (Objects.isNull(dto.getId())) {
ActivityPlanInfoDto planInfo = promPlanQueryService.selectById(dto.getPlanId()); ActivityPlanInfoDto planInfo = promPlanQueryService.selectById(dto.getPlanId());
if (Objects.isNull(planInfo) || planInfo.getPlanStatus().equals(PlanStatus.EXECUTION.getCode())){ if (Objects.isNull(planInfo) || (planInfo.getPlanStatus().equals(PlanStatus.EXECUTION.getCode()) && planInfo.getPattern().equals("单点CP"))){
throw new ParamException(RCode.NOT_CLOCK_STORE_ERROR); throw new ParamException(RCode.NOT_CLOCK_STORE_ERROR);
} }
ManageEmployeeInfoDto employeeDto = manageEmployeeInfoDao.selectById(planInfo.getEmployeeId()); ManageEmployeeInfoDto employeeDto = manageEmployeeInfoDao.selectById(planInfo.getEmployeeId());
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论