From 86611989cbda2c9252309421e53f61348f28331b Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@outlook.com>
Date: Fri, 18 Oct 2019 15:50:20 +0800
Subject: [PATCH] import export process define contains crontab error bug fix
 (#1054)

* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml

* .escheduler_env.sh to dolphinscheduler_env.sh

* dao yml assembly to conf directory

* table name modify

* entity title table  name modify

* logback log name modify

* running through the big process

* running through the big process error modify

* logback log name modify

* data_source.properties rename

* logback log name modify

* install.sh optimization

* install.sh optimization

* command count modify

* command state update

* countCommandState sql update

* countCommandState sql update

* remove application.yml file

* master.properties modify

* install.sh modify

* install.sh modify

* api server startup modify

* the current user quits and the session is completely emptied. bug fix

* remove pom package resources

* checkQueueNameExist method update

* checkQueueExist

* install.sh error output update

* signOut error update

* ProcessDao is null bug fix

* install.sh add mail.user

* request url variables replace

* process define import bug fix

* process define import export bug fix

* processdefine import export bug fix

* down log suffix format modify

* import export process define contains crontab error bug fix
---
 .../api/service/ProcessDefinitionService.java                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
index fdfd000414..319beeb7d8 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
@@ -589,8 +589,8 @@ public class ProcessDefinitionService extends BaseDAGService {
                     Schedule schedule = schedules.get(0);
                     row.put("scheduleWarningType", schedule.getWarningType());
                     row.put("scheduleWarningGroupId", schedule.getWarningGroupId());
-                    row.put("scheduleStartTime", schedule.getStartTime());
-                    row.put("scheduleEndTime", schedule.getEndTime());
+                    row.put("scheduleStartTime", DateUtils.dateToString(schedule.getStartTime()));
+                    row.put("scheduleEndTime", DateUtils.dateToString(schedule.getEndTime()));
                     row.put("scheduleCrontab", schedule.getCrontab());
                     row.put("scheduleFailureStrategy", schedule.getFailureStrategy());
                     row.put("scheduleReleaseState", ReleaseState.OFFLINE);
@@ -749,6 +749,7 @@ public class ProcessDefinitionService extends BaseDAGService {
                     scheduleObj.setUserId(loginUser.getId());
                     scheduleObj.setUserName(loginUser.getUserName());
 
+
                     scheduleCrontab = json.get("scheduleCrontab").toString();
                     scheduleObj.setCrontab(scheduleCrontab);
                     if (ObjectUtils.allNotNull(json.get("scheduleStartTime"))) {