[修改] 销售计划生成逻辑调整

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/task/SalesPlanAutoCreateTask.java

 package com.xyst.dinas.sales.task;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
-
 import com.beecode.amino.core.Amino;
 import com.beecode.bap.scheduler.core.Task;
 import com.beecode.bap.scheduler.core.TaskContext;
@@ -25,6 +14,11 @@ import com.xyst.dinas.contract.internal.dao.ContractDao;
 import com.xyst.dinas.sales.constant.SalesPlanConstant;
 import com.xyst.dinas.sales.dao.SalesPlanDao;
 import com.xyst.dinas.sales.service.SalesPlanService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
+
+import java.util.*;
 /**
  * 销售计划自动创建任务
  *
@@ -68,7 +62,7 @@ public class SalesPlanAutoCreateTask implements Task{
 			    weekDate = getWeekOfDate(new Date());
 			}
 			
-			if (oldWeek.equals(weekDate) || planningCycle.equalsIgnoreCase(PlanningCycleEnum.DAY.name())) {
+			if (weekDate.equals(oldWeek) || planningCycle.equalsIgnoreCase(PlanningCycleEnum.DAY.name())) {
 				PlanningCycleEnum planningCycleType = PlanningCycleEnum.DAY.name().equalsIgnoreCase(planningCycle)?PlanningCycleEnum.DAY:PlanningCycleEnum.WEEK;
 				KObject planningCycleObj = planningCycleService.getPlanningCycleObj(planningCycleType, new Date());
 				

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/task/SalesPlanAutoCreateTaskRegister.java

 package com.xyst.dinas.sales.task;
 
-import java.util.Optional;
-
-import javax.annotation.PostConstruct;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import com.beecode.amino.metadata.context.ApplicationMetadataContext;
 import com.beecode.amino.metadata.runtime.ServiceInitializer;
 import com.beecode.bap.scheduler.entity.ScheduleDetail;
 import com.beecode.bap.scheduler.entity.TaskDetail;
 import com.beecode.bap.scheduler.service.ScheduleService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.annotation.PostConstruct;
+import java.util.Optional;
 
 public class SalesPlanAutoCreateTaskRegister implements ServiceInitializer{
 	
@@ -38,8 +36,8 @@ public class SalesPlanAutoCreateTaskRegister implements ServiceInitializer{
 		TaskDetail TaskDetail = new TaskDetail(TASK_NAME, SalesPlanAutoCreateTask.class.getName());
 		// 每天凌晨12点执行调度，如测试可修改为每十五秒：*/15 * * * * ?（表达式由至少6个由空格分隔的时间元素，从左至右可分为秒，分，时，日，月，星期）
 		scheduleService.scheduleTask(TaskDetail, "0 0 0 * * ?");
-		// 测试调度时进行调用
-//		scheduleService.scheduleTask(TaskDetail, "0 */5 * * * ?");
+		// 测试调度时进行调用 测试时每3分钟一次
+//		scheduleService.scheduleTask(TaskDetail, "0 */3 * * * ?");
 		
 		logger.info("销售计划自动创建任务初始化成功!");
 	}