创建计划操作人如果是城市经理的话，操作人与归属人必需一致

src/main/java/com/wangxiaolu/promotion/controller/activityplanv2/PromPlanCoreController.java

@@ -15,6 +15,10 @@ import io.jsonwebtoken.lang.Collections;
 import org.springframework.beans.factory.annotation.Autowired;
 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.Map;
 import java.util.Objects;
 
@@ -162,6 +166,24 @@ public class PromPlanCoreController {
         if (!oneSelf){
             throw new ParamException(RCode.ACTIVITY_PLAN_EMPLOYEE_ERROR);
         }
+        // 操作人如果是城市经理的话，操作人与归属人必需一致
+        boolean operIsSelf = manageEmployeeQueryService.isOneSelf(operVo.getOperNo());
+        if (operIsSelf && !operVo.getEmployeeNo().equals(operVo.getOperNo())){
+            throw new ParamException(RCode.ACTIVITY_PLAN_EMPLOYEE_CREATE);
+        }
+
+        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);
         return R.success();
     }

src/main/java/com/wangxiaolu/promotion/pojo/activity/planv2/vo/ActivityPlanOperVo.java

@@ -7,6 +7,7 @@ import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Date;
 import java.util.List;
 
@@ -57,11 +58,13 @@ public class ActivityPlanOperVo {
     /**
      * 上班时间
      */
+    private LocalTime inTime;
     private LocalDateTime clockInTime;
 
     /**
      * 下班时间
      */
+    private LocalTime outTime;
     private LocalDateTime clockOutTime;
 
     /**

src/main/java/com/wangxiaolu/promotion/service/activity/examine/impl/ExaPlanCoreServiceImpl.java

@@ -10,6 +10,7 @@ import com.wangxiaolu.promotion.service.activity.examine.ExaPlanCoreService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
@@ -32,6 +33,12 @@ public class ExaPlanCoreServiceImpl implements ExaPlanCoreService {
         if (Objects.isNull(planInfoDto)) {
             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.setManageName(planInfoDto.getEmployeeName());
         examineDto.setCity(planInfoDto.getCity());

src/main/java/com/wangxiaolu/promotion/service/activityplanv2/impl/PromPlanCoreServiceImpl.java

@@ -211,8 +211,9 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
                 }
                 LocalDate planDate = LocalDate.of(year, month, day);
 
+//                 && monthInt != monthValue
                 if (monthInt != nextMonthValue && monthInt != monthValue) {
-                    dto.setErrorMsg("月份只能是当月或次月；");
+                    dto.setErrorMsg("月份只能是次月；");
                 } else if (planDate.isBefore(LocalDate.now())) {
                     dto.setErrorMsg("日期不能是以前；");
                 } else {
@@ -229,10 +230,6 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
                         dto.setClockOutTime(LocalDateTime.of(planDate, outLocalTime));
                     }
                 }
-//                if (monthInt == nextMonthValue) {
-//                } else {
-//                    dto.setErrorMsg("月份必需是下个月；");
-//                }
 
                 // 8：工资
                 dto.setSalary(new BigDecimal(row.get(8).toString()));