取消异常

byit-myth-core/myth-admin-core/src/main/java/com/byit/task/ScriptExecutorJobTask.java

@@ -11,6 +11,7 @@ import com.byit.dto.plugin.RunLog;
 import com.byit.enums.*;
 import com.byit.enums.task.RunResultEnum;
 import com.byit.enums.task.RunTypeEnum;
+import com.byit.job.utils.DateUtil;
 import com.byit.job.utils.PlaceholderUtils;
 import com.byit.model.JobTaskRunLogWithBLOBs;
 import com.byit.model.JobTaskSchedule;
@@ -98,7 +99,14 @@ public class ScriptExecutorJobTask implements TimerTask {
             if (ScheduleTypeEnum.NORMAL.getCode().equals(mythJobTaskSchedule.getScheduleType())
                 || ScheduleTypeEnum.REAL.getCode().equals(mythJobTaskSchedule.getScheduleType())) {
                 privateParam = PlaceholderUtils.formatBizDateParam(privateParam, PlaceholderEnum.DATE_PLACEHOLDER.getName(), 1);
-                privateParam = PlaceholderUtils.formatBizDateParam(privateParam, PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName(), 0);
+                ScriptParamAndPlaceholderDto scriptParamAndPlaceholderDto = JSON.parseObject(runParam,ScriptParamAndPlaceholderDto.class);
+                Map<String, String> placeholder = scriptParamAndPlaceholderDto.getPlaceholder();
+                if(placeholder.containsKey(PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName())){
+                    String nowDateFormatName = placeholder.get(PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName());
+                    String dateFormat = DateUtil.dateFormat(new Date(), nowDateFormatName);
+                    privateParam = PlaceholderUtils.formatBizDateParam(privateParam, PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName(), dateFormat,0);
+                }
+
                 runParamWrapped.setPrivateParam(privateParam);
                 mythJobTaskSchedule.setRunParam(JSON.toJSONString(runParamWrapped));
             }