Skip to content

A
aserver
Commit 05dd25c4 authored by 李德才's avatar 李德才
Browse files
Options

Merge branch 'SZDAS_V2.1.2' into master

parents 30c6955a 13811c41
Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 1 deletion
pom.xml
View file @ 05dd25c4
......@@ -28,7 +28,7 @@
<junit.version>3.8.1</junit.version>
<jfinal.version>5.1.4</jfinal.version>
<jfinal.version>5.1.4.1</jfinal.version>
<cos.version>2017.5</cos.version>
......
src/main/resources/DBUpdate/DM_UpdateSQL.xml
View file @ 05dd25c4
......@@ -3168,4 +3168,79 @@
</sql>
</version>
<version edition="154" description="卷内显示案卷字段规则">
<sql creator="huwenbin" createDate="20210414" note="卷内显示案卷字段规则">
CREATE TABLE "AS_RULE_AJ_COLUMN"
(
"ID" NUMBER(10,0) NOT NULL,
"ORGAN_ID" NUMBER(10,0),
"TABLE_ID" NUMBER(10,0),
"RULE" VARCHAR2(300),
"STAGE" VARCHAR2(50),
PRIMARY KEY("ID"));
</sql>
</version>
<version edition="155" description="保管期限表">
<sql creator="huwenbin" createDate="20210416" note="保管期限表">
CREATE TABLE "AS_RETENTION"
(
"ID" NUMBER(9,0) NOT NULL,
"NAME" VARCHAR2(200),
"DESCRIPTION" VARCHAR2(50),
"LIBRARY_ID" NUMBER(9,0),
"CREATOR_ID" NUMBER(9,0),
PRIMARY KEY("ID")
);
COMMENT ON COLUMN "AS_RETENTION"."CREATOR_ID" IS '创建人';
COMMENT ON COLUMN "AS_RETENTION"."DESCRIPTION" IS '描述';
COMMENT ON COLUMN "AS_RETENTION"."ID" IS '主键id';
COMMENT ON COLUMN "AS_RETENTION"."LIBRARY_ID" IS '档案门类';
COMMENT ON COLUMN "AS_RETENTION"."NAME" IS '名称';
CREATE TABLE "AS_RETENTION_PERIOD"
(
"ID" NUMBER(9,0) NOT NULL,
"PERIOD" VARCHAR2(50),
"DEPT" VARCHAR2(50),
"USE_RANGE" VARCHAR2(10),
"FILING_RANGE" VARCHAR2(1000),
"CREATOR_ID" NUMBER(9,0),
"CONDITION" VARCHAR2(3000),
PRIMARY KEY("ID"));
COMMENT ON TABLE "AS_RETENTION_PERIOD" IS '保管期限表';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."CONDITION" IS '条件';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."CREATOR_ID" IS '创建人id';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."DEPT" IS '部门';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."FILING_RANGE" IS '归档范围';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."ID" IS '主键';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."PERIOD" IS '保管期限';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."USE_RANGE" IS '使用范围';
CREATE SEQUENCE "SEQ_AS_RETENTION"
INCREMENT BY 1
START WITH 1
MAXVALUE 999999999999999999
MINVALUE 1
NOCYCLE
NOCACHE
ORDER
;
CREATE SEQUENCE "SEQ_AS_RETENTION_PERIOD"
INCREMENT BY 1
START WITH 1
MAXVALUE 9999999999999
MINVALUE 1
NOCYCLE
NOCACHE
NOORDER
;
</sql>
</version>
</update>
\ No newline at end of file
src/main/resources/DBUpdate/HG_UpdateSQL.xml
View file @ 05dd25c4
......@@ -3056,4 +3056,5 @@ commit;
alter table AS_SCAN_SETTING add WATERMARK_LEAN NUMBER(11,0);
</sql>
</version>
</update>
\ No newline at end of file
src/main/resources/DBUpdate/KINGBASE_UpdateSQL.xml
View file @ 05dd25c4
......@@ -3095,4 +3095,78 @@ commit;
alter table AS_SCAN_SETTING add WATERMARK_LEAN NUMBER(11,0);
</sql>
</version>
<version edition="151" description="卷内显示案卷字段规则">
<sql creator="huwenbin" createDate="20210414" note="卷内显示案卷字段规则">
CREATE TABLE "AS_RULE_AJ_COLUMN"
(
"ID" NUMBER(10,0) NOT NULL,
"ORGAN_ID" NUMBER(10,0),
"TABLE_ID" NUMBER(10,0),
"RULE" VARCHAR2(300),
"STAGE" VARCHAR2(50),
PRIMARY KEY("ID"));
</sql>
</version>
<version edition="152" description="保管期限表">
<sql creator="huwenbin" createDate="20210416" note="保管期限表">
CREATE TABLE "AS_RETENTION"
(
"ID" NUMBER(9,0) NOT NULL,
"NAME" VARCHAR2(200),
"DESCRIPTION" VARCHAR2(50),
"LIBRARY_ID" NUMBER(9,0),
"CREATOR_ID" NUMBER(9,0),
PRIMARY KEY("ID")
);
COMMENT ON COLUMN "AS_RETENTION"."CREATOR_ID" IS '创建人';
COMMENT ON COLUMN "AS_RETENTION"."DESCRIPTION" IS '描述';
COMMENT ON COLUMN "AS_RETENTION"."ID" IS '主键id';
COMMENT ON COLUMN "AS_RETENTION"."LIBRARY_ID" IS '档案门类';
COMMENT ON COLUMN "AS_RETENTION"."NAME" IS '名称';
CREATE TABLE "AS_RETENTION_PERIOD"
(
"ID" NUMBER(9,0) NOT NULL,
"PERIOD" VARCHAR2(50),
"DEPT" VARCHAR2(50),
"USE_RANGE" VARCHAR2(10),
"FILING_RANGE" VARCHAR2(1000),
"CREATOR_ID" NUMBER(9,0),
"CONDITION" VARCHAR2(3000),
PRIMARY KEY("ID"));
COMMENT ON TABLE "AS_RETENTION_PERIOD" IS '保管期限表';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."CONDITION" IS '条件';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."CREATOR_ID" IS '创建人id';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."DEPT" IS '部门';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."FILING_RANGE" IS '归档范围';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."ID" IS '主键';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."PERIOD" IS '保管期限';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."USE_RANGE" IS '使用范围';
CREATE SEQUENCE "SEQ_AS_RETENTION"
INCREMENT BY 1
START WITH 1
MAXVALUE 999999999999999999
MINVALUE 1
NOCYCLE
NOCACHE
ORDER
;
CREATE SEQUENCE "SEQ_AS_RETENTION_PERIOD"
INCREMENT BY 1
START WITH 1
MAXVALUE 9999999999999
MINVALUE 1
NOCYCLE
NOCACHE
NOORDER
;
</sql>
</version>
</update>
\ No newline at end of file
src/main/resources/DBUpdate/ST_UpdateSQL.xml
View file @ 05dd25c4
......@@ -3104,4 +3104,77 @@ commit;
alter table AS_SCAN_SETTING add WATERMARK_LEAN NUMBER(11,0);
</sql>
</version>
<version edition="151" description="卷内显示案卷字段规则">
<sql creator="huwenbin" createDate="20210414" note="卷内显示案卷字段规则">
CREATE TABLE "AS_RULE_AJ_COLUMN"
(
"ID" NUMBER(10,0) NOT NULL,
"ORGAN_ID" NUMBER(10,0),
"TABLE_ID" NUMBER(10,0),
"RULE" VARCHAR2(300),
"STAGE" VARCHAR2(50),
PRIMARY KEY("ID"));
</sql>
</version>
<version edition="152" description="保管期限表">
<sql creator="huwenbin" createDate="20210416" note="保管期限表">
CREATE TABLE "AS_RETENTION"
(
"ID" NUMBER(9,0) NOT NULL,
"NAME" VARCHAR2(200),
"DESCRIPTION" VARCHAR2(50),
"LIBRARY_ID" NUMBER(9,0),
"CREATOR_ID" NUMBER(9,0),
PRIMARY KEY("ID")
);
COMMENT ON COLUMN "AS_RETENTION"."CREATOR_ID" IS '创建人';
COMMENT ON COLUMN "AS_RETENTION"."DESCRIPTION" IS '描述';
COMMENT ON COLUMN "AS_RETENTION"."ID" IS '主键id';
COMMENT ON COLUMN "AS_RETENTION"."LIBRARY_ID" IS '档案门类';
COMMENT ON COLUMN "AS_RETENTION"."NAME" IS '名称';
CREATE TABLE "AS_RETENTION_PERIOD"
(
"ID" NUMBER(9,0) NOT NULL,
"PERIOD" VARCHAR2(50),
"DEPT" VARCHAR2(50),
"USE_RANGE" VARCHAR2(10),
"FILING_RANGE" VARCHAR2(1000),
"CREATOR_ID" NUMBER(9,0),
"CONDITION" VARCHAR2(3000),
PRIMARY KEY("ID"));
COMMENT ON TABLE "AS_RETENTION_PERIOD" IS '保管期限表';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."CONDITION" IS '条件';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."CREATOR_ID" IS '创建人id';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."DEPT" IS '部门';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."FILING_RANGE" IS '归档范围';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."ID" IS '主键';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."PERIOD" IS '保管期限';
COMMENT ON COLUMN "AS_RETENTION_PERIOD"."USE_RANGE" IS '使用范围';
CREATE SEQUENCE "SEQ_AS_RETENTION"
INCREMENT BY 1
START WITH 1
MAXVALUE 999999999999999999
MINVALUE 1
NOCYCLE
NOCACHE
ORDER
;
CREATE SEQUENCE "SEQ_AS_RETENTION_PERIOD"
INCREMENT BY 1
START WITH 1
MAXVALUE 9999999999999
MINVALUE 1
NOCYCLE
NOCACHE
NOORDER
;
</sql>
</version>
</update>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment