Kaynağa Gözat

履职任务生成,非营业时间的任务时间非生成问题

jiawuxian 2 yıl önce
ebeveyn
işleme
be49e904f1

+ 2 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -13,6 +13,7 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
 import com.xunmei.common.core.enums.CycleCommonEnum;
+import com.xunmei.common.core.enums.ExecTimeCommonEnum;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.Ymd;
 import com.xunmei.core.TaskCreatingServiceImplBase;
@@ -373,7 +374,7 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
         DateTime time2 = new DateTime(dateTime);
         time2.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
 
-        if (appPlan.getPlanExec() == 1) {//全天 上班时间-下班时间 00:00:00-23:59:59
+        if (appPlan.getPlanExec() == 1 || appPlan.getPlanExec().equals(ExecTimeCommonEnum.NoBusiness.getCode())) {//全天 上班时间-下班时间 00:00:00-23:59:59
             planstartTime = time1.setField(DateField.HOUR_OF_DAY, 0).setField(DateField.MINUTE, 0).setField(DateField.SECOND, 0).setField(DateField.MILLISECOND, 0);
             planendTime = DateUtil.endOfDay(time2).setField(DateField.MILLISECOND, 0);
         } else if (appPlan.getPlanExec() == 2) {//营业前 上班时间-营业时间