城市经理新增计划当月不可新增限制删除

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

@@ -135,6 +135,7 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
     private List<ActivityPlanInfoDto> getRowByCSJLUp(ActivityPlanVo planVo, List<Object> row,Map<String, Object> rMap) {
         List<ActivityPlanInfoDto> dtos = new ArrayList<>();
         LocalDate now = LocalDate.now();
+        int monthValue = now.getMonthValue();
         int nextMonthValue = now.plusMonths(1).getMonthValue();
 
         /**
@@ -203,13 +204,18 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
                  * 年份：当月份为1时，判定为跨年
                  */
                 int monthInt = Integer.parseInt(row.get(4).toString());
-                if (monthInt == nextMonthValue) {
-                    int year = DateUtil.thisYear();
-                    Month month = Month.of(monthInt);
-                    if (month.equals(Month.JANUARY)) {
-                        year += 1;
-                    }
-                    LocalDate planDate = LocalDate.of(year, month, day);
+                int year = DateUtil.thisYear();
+                Month month = Month.of(monthInt);
+                if (month.equals(Month.JANUARY)) {
+                    year += 1;
+                }
+                LocalDate planDate = LocalDate.of(year, month, day);
+
+                if (monthInt != nextMonthValue && monthInt != monthValue) {
+                    dto.setErrorMsg("月份只能是当月或次月；");
+                } else if (planDate.isBefore(LocalDate.now())) {
+                    dto.setErrorMsg("日期不能是以前；");
+                } else {
                     dto.setYear(year).setMonth(planDate.getMonthValue()).setDate(DateUtils.parseDateBylocalDate(planDate));
                     LocalTime inLocalTime = DateUtils.parseLocalTimeByEmdtime(row.get(6).toString());
                     LocalTime outLocalTime = DateUtils.parseLocalTimeByEmdtime(row.get(7).toString());
@@ -222,9 +228,11 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
                         dto.setClockInTime(LocalDateTime.of(planDate, inLocalTime));
                         dto.setClockOutTime(LocalDateTime.of(planDate, outLocalTime));
                     }
-                } else {
-                    dto.setErrorMsg("月份必需是下个月；");
                 }
+//                if (monthInt == nextMonthValue) {
+//                } else {
+//                    dto.setErrorMsg("月份必需是下个月；");
+//                }
 
                 // 8：工资
                 dto.setSalary(new BigDecimal(row.get(8).toString()));
@@ -498,16 +506,8 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
     @Override
     public void saveActivityPlan(ActivityPlanOperVo operVo) {
         ActivityPlanInfoDto planDto = new ActivityPlanInfoDto();
-
         StoreWrapper storeWrap = new StoreWrapper().setStoreCode(operVo.getStoreCode());
         QinCeClienteleStoreDto storeDto = qinCeClienteleStoreDao.getOneStore(storeWrap);
-//        if (ObjectUtil.isEmpty(storeDto)) {
-//            throw new ParamException(RCode.QINCE_STORE_CODE_ERROR);
-//        }
-//        if (StringUtils.isAnyBlank(storeDto.getLineName(), storeDto.getDealersName(), storeDto.getDealerId())) {
-//            throw new ParamException(RCode.ACTIVITY_PLAN_EXECUTE_ERROR);
-//        }
-
         ManageEmployeeInfoDto empDto = manageEmployeeInfoDao.selectOne(new ManageEmployeeWrapper().setEmployeeNo(operVo.getEmployeeNo()));
         LocalDate planDate = operVo.getDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
         planDto.setPlanFileId(0L)