参数包装

byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowServiceImpl.java

 package com.byit.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
@@ -1396,6 +1397,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
 
         //校验时间
         for (String repairTime : repairTimeList) {
+            List<WaitingTask> waitingTaskDateList = new ArrayList<>();
             try {
                 SimpleDateFormat sdf = new SimpleDateFormat(timeFormatName);
                 Date repairDate = sdf.parse(repairTime);
@@ -1405,7 +1407,34 @@ public class ApiFlowServiceImpl implements ApiFlowService {
                 ValidationUtil.isTrueValidation(true, "补批日期不符合规范，例：" + timeFormatName);
             }
 
-            result.put(repairTime, waitingTaskList);
+            waitingTaskList.forEach(waitingTask -> {
+                String runParam = waitingTask.getRunParam();
+                ScriptParamAndPlaceholderDto scriptParamAndPlaceholderDto = JSON.parseObject(runParam, ScriptParamAndPlaceholderDto.class);
+                if (scriptParamAndPlaceholderDto == null) {
+                    scriptParamAndPlaceholderDto = new ScriptParamAndPlaceholderDto();
+                }
+                Map<String, String> param = scriptParamAndPlaceholderDto.getParam();
+                if(param == null){
+                    param = new HashMap<>(8);
+                }
+                Map<String, String> placeholder = scriptParamAndPlaceholderDto.getPlaceholder();
+                if(placeholder == null){
+                    placeholder = new HashMap<>(8);
+                }
+                param.put(PlaceholderEnum.DATE_PLACEHOLDER.getName(), repairTime);
+                param.put(PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName(), repairTime);
+                placeholder.put(PlaceholderEnum.DATE_PLACEHOLDER.getName(), repairTime);
+                placeholder.put(PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName(), repairTime);
+
+                scriptParamAndPlaceholderDto.setParam(param);
+                scriptParamAndPlaceholderDto.setPlaceholder(placeholder);
+                WaitingTask waitingTaskCopy = new WaitingTask();
+                BeanUtil.copyProperties(waitingTask, waitingTaskCopy);
+                waitingTaskCopy.setRunParam(JSON.toJSONString(scriptParamAndPlaceholderDto));
+                waitingTaskDateList.add(waitingTaskCopy);
+            });
+
+            result.put(repairTime, waitingTaskDateList);
 
         }