提交 a15e1d72 authored 作者: 000516's avatar 000516 提交者: Coding

新建一条促销计划时,上下班时间只传时间部分,日期部分由后端拼接

...@@ -15,6 +15,11 @@ import io.jsonwebtoken.lang.Collections; ...@@ -15,6 +15,11 @@ import io.jsonwebtoken.lang.Collections;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.YearMonth;
import java.time.ZoneId;
import java.util.Date;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
...@@ -162,6 +167,18 @@ public class PromPlanCoreController { ...@@ -162,6 +167,18 @@ public class PromPlanCoreController {
if (!oneSelf){ if (!oneSelf){
throw new ParamException(RCode.ACTIVITY_PLAN_EMPLOYEE_ERROR); throw new ParamException(RCode.ACTIVITY_PLAN_EMPLOYEE_ERROR);
} }
LocalDate localDate = operVo.getDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
LocalDate nextMonthValue = LocalDate.now().plusMonths(1);
if (operVo.getEmployeeNo().equals(operVo.getOperNo()) && (
!YearMonth.from(localDate).equals(YearMonth.from(nextMonthValue))
)) {
throw new ParamException(RCode.NEXT_MONTH_PLAN_CREATE_ERROR);
}
// 上下班时间补充日期部分
operVo.setClockInTime(LocalDateTime.of(localDate,operVo.getInTime()));
operVo.setClockOutTime(LocalDateTime.of(localDate,operVo.getOutTime()));
promPlanCoreService.saveActivityPlan(operVo); promPlanCoreService.saveActivityPlan(operVo);
return R.success(); return R.success();
} }
......
...@@ -7,6 +7,7 @@ import lombok.experimental.Accessors; ...@@ -7,6 +7,7 @@ import lombok.experimental.Accessors;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -57,11 +58,13 @@ public class ActivityPlanOperVo { ...@@ -57,11 +58,13 @@ public class ActivityPlanOperVo {
/** /**
* 上班时间 * 上班时间
*/ */
private LocalTime inTime;
private LocalDateTime clockInTime; private LocalDateTime clockInTime;
/** /**
* 下班时间 * 下班时间
*/ */
private LocalTime outTime;
private LocalDateTime clockOutTime; private LocalDateTime clockOutTime;
/** /**
......
...@@ -10,6 +10,7 @@ import com.wangxiaolu.promotion.service.activity.examine.ExaPlanCoreService; ...@@ -10,6 +10,7 @@ import com.wangxiaolu.promotion.service.activity.examine.ExaPlanCoreService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.Objects; import java.util.Objects;
/** /**
...@@ -32,6 +33,12 @@ public class ExaPlanCoreServiceImpl implements ExaPlanCoreService { ...@@ -32,6 +33,12 @@ public class ExaPlanCoreServiceImpl implements ExaPlanCoreService {
if (Objects.isNull(planInfoDto)) { if (Objects.isNull(planInfoDto)) {
throw new ParamException(RCode.ACTIVITY_PLAN_IS_NULL); throw new ParamException(RCode.ACTIVITY_PLAN_IS_NULL);
} }
// 判断执行日期是否开始
Date date = planInfoDto.getDate();
if (date.after(new Date())) {
throw new ParamException(RCode.ACTIVITY_NOT_START);
}
examineDto.setDeptQcOrgName(planInfoDto.getOrgName()); examineDto.setDeptQcOrgName(planInfoDto.getOrgName());
examineDto.setManageName(planInfoDto.getEmployeeName()); examineDto.setManageName(planInfoDto.getEmployeeName());
examineDto.setCity(planInfoDto.getCity()); examineDto.setCity(planInfoDto.getCity());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论