From 2a96eca12104870ac9e2d7a0102d4ac2eae65255 Mon Sep 17 00:00:00 2001 From: liujiaji Date: Mon, 11 Jun 2018 15:00:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=A1=A8=20=E8=99=9A=E6=8B=9F=20flowAction?= =?UTF-8?q?=20=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml | 23 +++++++++++++++----- sql/APP_INIT.sql | 23 ++++++++++++++++++++ src/com/amarsoft/app/flow/FlowAction.java | 3 +-- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml b/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml index 2f914758f..5f3f39b17 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml @@ -394,12 +394,23 @@ length="1000" /> - - - - - - + + + + + + + + + + + + + + + + + diff --git a/sql/APP_INIT.sql b/sql/APP_INIT.sql index f81c79794..7dfb400ce 100644 --- a/sql/APP_INIT.sql +++ b/sql/APP_INIT.sql @@ -104,6 +104,22 @@ CREATE TABLE `APP_VERSION` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +DROP TABLE IF EXISTS APP_BUSINESS_START; +CREATE TABLE `APP_BUSINESS_START` ( + `CARATTRIBUTES` VARCHAR(1000) COLLATE UTF8_UNICODE_CI NOT NULL, + `LEASEHOLD` VARCHAR(1000) COLLATE UTF8_UNICODE_CI DEFAULT NULL, + `PRODUCTMODEL` VARCHAR(1000) COLLATE UTF8_UNICODE_CI DEFAULT NULL, + `CARSERIES` VARCHAR(1000) COLLATE UTF8_UNICODE_CI DEFAULT NULL, + `CARSYSTEM` VARCHAR(1000) COLLATE UTF8_UNICODE_CI DEFAULT NULL, + +`PRODUCTID` VARCHAR(1000) COLLATE UTF8_UNICODE_CI DEFAULT NULL, +`PRODUCTNAME` VARCHAR(1000) COLLATE UTF8_UNICODE_CI DEFAULT NULL, +`CUSTOMERID` VARCHAR(1000) COLLATE UTF8_UNICODE_CI DEFAULT NULL, +`CUSTOMERNAME` VARCHAR(1000) COLLATE UTF8_UNICODE_CI DEFAULT NULL, +`CUSTOMER_TYPE` VARCHAR(1000) COLLATE UTF8_UNICODE_CI DEFAULT NULL, +`CERTTYPE` VARCHAR(1000) COLLATE UTF8_UNICODE_CI DEFAULT NULL, +`CERTID` VARCHAR(1000) COLLATE UTF8_UNICODE_CI DEFAULT NULL +) ENGINE=INNODB DEFAULT CHARSET=UTF8 COLLATE=UTF8_UNICODE_CI; -- user_info ALTER ADD/DROP column ALTER TABLE USER_INFO ADD DEV_ID VARCHAR(100) not Null; @@ -126,3 +142,10 @@ ALTER TABLE PRD_NODEINFO_MIDDLE_APP ADD (ISINUSE VARCHAR(1) DEFAULT 1); ALTER TABLE PRD_NODEINFO_MIDDLE_APP ADD (DOWNLOAD_PARAM VARCHAR(2000) DEFAULT NULL); ALTER TABLE PRD_NODEINFO_MIDDLE_APP ADD (ENABLE_DOWNLOAD VARCHAR(1) DEFAULT 'N'); +ALTER TABLE PRD_NODEINFO_LIBRARY_APP ADD (REBUILD_JBO_CLASS VARCHAR(1000) DEFAULT NULL); +ALTER TABLE PRD_NODEINFO_LIBRARY_APP ADD (FATHER_ID VARCHAR(100) DEFAULT NULL); +ALTER TABLE PRD_NODEINFO_LIBRARY_APP ADD (DISPLAY_MANAGE_CLASS VARCHAR(1000) DEFAULT NULL); +ALTER TABLE PRD_NODEINFO_LIBRARY_APP ADD (SAVE_MANAGE_CLASS VARCHAR(1000) DEFAULT NULL); +ALTER TABLE PRD_NODEINFO_LIBRARY_APP ADD (DELETE_MANAGE_CLASS VARCHAR(1000) DEFAULT NULL); +ALTER TABLE PRD_NODEINFO_LIBRARY_APP ADD (ENABLE_CONDITION VARCHAR(1) DEFAULT 'N'); +ALTER TABLE PRD_NODEINFO_LIBRARY_APP ADD (OPEN_CONDITION VARCHAR(1000) DEFAULT NULL); diff --git a/src/com/amarsoft/app/flow/FlowAction.java b/src/com/amarsoft/app/flow/FlowAction.java index fd4ecc404..748ed9b8a 100644 --- a/src/com/amarsoft/app/flow/FlowAction.java +++ b/src/com/amarsoft/app/flow/FlowAction.java @@ -21,8 +21,6 @@ import jbo.sys.FLOW_TASK_USER_HIS; import org.apache.commons.lang.StringUtils; -import apx.com.amarsoft.als.base.util.DateUtil; - import com.amarsoft.app.lc.util.DateAssistant; import com.amarsoft.are.ARE; import com.amarsoft.are.jbo.BizObject; @@ -46,6 +44,7 @@ import com.amarsoft.biz.workflow.FlowTask; import com.amarsoft.biz.workflow.TaskDataObject; import com.amarsoft.context.ASUser; import com.amarsoft.dict.als.manage.NameManager; +import com.base.util.DateUtil; import com.tenwa.app.manage.constant.PushMessageConstant; import com.tenwa.app.manage.util.PushMessageUtil; import com.tenwa.comm.util.jboutil.DataOperatorUtil;