销售计划周类型按可选天执行

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;
@@ -16,6 +17,7 @@ import com.beecode.bap.scheduler.core.TaskContext;
 import com.beecode.bap.workflow.core.BizProcessState;
 import com.beecode.bcp.type.KObject;
 import com.beecode.inz.common.BaseConstants;
+import com.beecode.xlib.utils.StringUtil;
 import com.xyst.dinas.biz.dao.DinasOrganizationDao;
 import com.xyst.dinas.biz.enumeration.PlanningCycleEnum;
 import com.xyst.dinas.biz.service.PlanningCycleService;
@@ -59,6 +61,14 @@ public class SalesPlanAutoCreateTask implements Task{
 		for (KObject regionalCompany : allOrganization) {
 			String regionalCompanyName = regionalCompany.getString("name");
 			String planningCycle = regionalCompany.getString("planningCycle");
+
+			String oldWeek = regionalCompany.getString("generateSalePlanTime");
+			String weekDate = "";
+			if (StringUtil.isNotEmpty(oldWeek)) {
+			    weekDate = getWeekOfDate(new Date());
+			}
+			
+			if (oldWeek.equals(weekDate) || planningCycle.equalsIgnoreCase(PlanningCycleEnum.DAY.name())) {
 				PlanningCycleEnum planningCycleType = PlanningCycleEnum.DAY.name().equalsIgnoreCase(planningCycle)?PlanningCycleEnum.DAY:PlanningCycleEnum.WEEK;
 				KObject planningCycleObj = planningCycleService.getPlanningCycleObj(planningCycleType, new Date());
 				
@@ -150,6 +160,17 @@ public class SalesPlanAutoCreateTask implements Task{
 						+ "删除 "+contractForDelInPlan.size()+" 条销售明细,刷新 "+updateDetailCount+" 条销售明细;");
 			}
 		}
+	}
+	
+	public static String getWeekOfDate(Date dt) {
+        String[] weekDays = {"SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY"};
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(dt);
+        int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+        if (w < 0)
+            w = 0;
+        return weekDays[w];
+    }
 
 	
 	private void initService() {