diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index efa6b2048..38a332e67 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -2458,7 +2458,6 @@
-
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index f1a7059b0..2af1322f7 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -1175,7 +1175,6 @@ CREATE TABLE `APP_CACHE_VIEW`
`APP_FINISH_DATE` DATETIME,
`APP_UPDATE_DATE` DATETIME NOT NULL,
`APP_OVERDUE_PERCENTAGE` DOUBLE NOT NULL,
- `TAS_DURATION` DOUBLE default 0 NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
KEY `indexAppNumber`(`APP_NUMBER`),
KEY `protitle`(`APP_PRO_TITLE`),
diff --git a/workflow/engine/methods/setup/setupSchemas/app_cache_view.sql b/workflow/engine/methods/setup/setupSchemas/app_cache_view.sql
index bffb45cba..74cf64bbb 100755
--- a/workflow/engine/methods/setup/setupSchemas/app_cache_view.sql
+++ b/workflow/engine/methods/setup/setupSchemas/app_cache_view.sql
@@ -31,7 +31,6 @@ CREATE TABLE `APP_CACHE_VIEW`
`APP_FINISH_DATE` DATETIME,
`APP_UPDATE_DATE` DATETIME NOT NULL,
`APP_OVERDUE_PERCENTAGE` DOUBLE NOT NULL,
- `TAS_DURATION` DOUBLE default 0 NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
KEY `indexAppNumber`(`APP_NUMBER`),
KEY `indexAppUser`(`USR_UID`, `APP_STATUS`)
diff --git a/workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql b/workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql
index 42ede2e57..e3e4ccdf9 100755
--- a/workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql
+++ b/workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql
@@ -33,8 +33,7 @@ INSERT INTO APP_CACHE_VIEW (
APP_FINISH_DATE,
APP_UPDATE_DATE,
APP_OVERDUE_PERCENTAGE,
- DEL_LAST_INDEX,
- TAS_DURATION
+ DEL_LAST_INDEX
)
SELECT
@@ -78,8 +77,7 @@ SELECT
IF (APPLICATION.APP_STATUS = 'COMPLETED', APPLICATION.APP_FINISH_DATE, NULL),
APPLICATION.APP_UPDATE_DATE,
APP_DELEGATION.APP_OVERDUE_PERCENTAGE,
- APP_DELEGATION.DEL_LAST_INDEX,
- if (TASK.TAS_TIMEUNIT = "DAYS", TASK.TAS_DURATION, (TASK.TAS_DURATION/24))
+ APP_DELEGATION.DEL_LAST_INDEX
FROM
APPLICATION FORCE INDEX (PRIMARY)
LEFT JOIN APP_DELEGATION ON (APPLICATION.APP_UID=APP_DELEGATION.APP_UID)
diff --git a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql
index d6e79b344..2e142025e 100755
--- a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql
+++ b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql
@@ -12,7 +12,6 @@ BEGIN
DECLARE PREVIOUS_USR_UID VARCHAR(32);
DECLARE APP_DEL_PREVIOUS_USER VARCHAR(255);
DECLARE APP_THREAD_STATUS VARCHAR(32);
- DECLARE TAS_DURATION DOUBLE;
SET @DEFAULT_LANG = '{lang}';
SET @APP_CURRENT_USER = '';
SELECT APPLICATION.APP_NUMBER into @APP_NUMBER FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
@@ -43,8 +42,7 @@ BEGIN
SET @APP_THREAD_STATUS = 'OPEN';
END IF;
SET @TAS_TYPE = (SELECT TAS_TYPE FROM TASK WHERE TAS_UID = NEW.TAS_UID LIMIT 1);
- SELECT IF (TASK.TAS_TIMEUNIT = "DAYS", TASK.TAS_DURATION, (TASK.TAS_DURATION/24)) into @TAS_DURATION FROM TASK WHERE TAS_UID = NEW.TAS_UID LIMIT 1;
- UPDATE APP_CACHE_VIEW SET DEL_LAST_INDEX = 0 WHERE APP_UID = NEW.APP_UID;
+ UPDATE APP_CACHE_VIEW SET DEL_LAST_INDEX = 0 WHERE APP_UID = NEW.APP_UID;
IF( @TAS_TYPE != 'SUBPROCESS') THEN
INSERT INTO `APP_CACHE_VIEW` (
APP_UID,
@@ -77,8 +75,7 @@ BEGIN
APP_FINISH_DATE,
APP_UPDATE_DATE,
APP_OVERDUE_PERCENTAGE,
- DEL_LAST_INDEX,
- TAS_DURATION
+ DEL_LAST_INDEX
)
VALUES (
NEW.APP_UID,
@@ -111,8 +108,7 @@ BEGIN
NULL,
NOW(),
NEW.APP_OVERDUE_PERCENTAGE,
- NEW.DEL_LAST_INDEX,
- @TAS_DURATION
+ NEW.DEL_LAST_INDEX
);
END IF;
END
diff --git a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql
index cf2b124c7..f5592c526 100755
--- a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql
+++ b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql
@@ -12,7 +12,6 @@ BEGIN
DECLARE PREVIOUS_USR_UID VARCHAR(32);
DECLARE APP_DEL_PREVIOUS_USER VARCHAR(255);
DECLARE APP_THREAD_STATUS VARCHAR(32);
- DECLARE TAS_DURATION DOUBLE;
SET @DEFAULT_LANG = '{lang}';
SET @APP_CURRENT_USER = '';
SELECT APPLICATION.APP_NUMBER into @APP_NUMBER FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
@@ -43,7 +42,6 @@ BEGIN
SET @APP_THREAD_STATUS = 'OPEN';
END IF;
SET @TAS_TYPE = (SELECT TAS_TYPE FROM TASK WHERE TAS_UID = NEW.TAS_UID LIMIT 1);
- SELECT IF (TASK.TAS_TIMEUNIT = "DAYS", TASK.TAS_DURATION, (TASK.TAS_DURATION/24)) into @TAS_DURATION FROM TASK WHERE TAS_UID = NEW.TAS_UID LIMIT 1;
IF( @TAS_TYPE != 'SUBPROCESS') THEN
UPDATE `APP_CACHE_VIEW`
SET
@@ -73,8 +71,7 @@ BEGIN
DEL_DELAYED = NEW.DEL_DELAYED,
APP_FINISH_DATE = NULL,
APP_OVERDUE_PERCENTAGE = NEW.APP_OVERDUE_PERCENTAGE,
- DEL_LAST_INDEX = NEW.DEL_LAST_INDEX,
- TAS_DURATION = @TAS_DURATION
+ DEL_LAST_INDEX = NEW.DEL_LAST_INDEX
WHERE
APP_UID = NEW.APP_UID
AND DEL_INDEX = NEW.DEL_INDEX;