git-svn-id: https://192.168.57.71/svn/lyggkj@121 1a6f6e3a-4066-fe46-b609-79c204482ece

gkaq/yjpt-java/trunk/resources/sql/init/1.table.sql

@@ -9840,4 +9840,106 @@ COMMENT ON COLUMN T_YJPT_CGSY.tbdyid IS '同步对应ID';
 COMMENT ON COLUMN T_YJPT_CGSY.qylb IS '区域类别，省级还是市级';
 COMMENT ON COLUMN T_YJPT_CGSY.ssqy IS '所属区域，关联组织架构表的主键';
 COMMENT ON COLUMN T_YJPT_CGSY.szd IS '所在地';
-ALTER TABLE T_YJPT_CGSY ADD CONSTRAINT T_YJPT_CGSY_pk PRIMARY KEY (ID);
+ALTER TABLE T_YJPT_CGSY ADD CONSTRAINT T_YJPT_CGSY_pk PRIMARY KEY (ID);
+
+create table T_YJPT_CGQ
+(
+  id            NUMBER not null,
+  dwmc          VARCHAR2(40),
+  cgqmc         VARCHAR2(40),
+  cgqmj         NUMBER,
+  cggs          NUMBER,
+  cgrj          NUMBER,
+  jtwz          VARCHAR2(40),
+  gjzxjl        NUMBER,
+  tbr           VARCHAR2(100),
+  lxdh          VARCHAR2(40),
+  tbsj          DATE,
+  add_user      VARCHAR2(50),
+  add_date      TIMESTAMP(6),
+  update_user   VARCHAR2(50),
+  update_date   TIMESTAMP(6),
+  record_status NUMBER default 0,
+  sftb          CHAR(1),
+  tbzt          CHAR(1),
+  tbdyid        NUMBER,
+  qylb          CHAR(1),
+  szd           NUMBER,
+  ssqy          NUMBER,
+  gq            NUMBER,
+  record_code   VARCHAR2(30),
+  byzd1         VARCHAR2(100),
+  byzd2         VARCHAR2(100),
+  byzd3         VARCHAR2(100),
+  byzd4         VARCHAR2(100),
+  byzd5         VARCHAR2(100),
+  zdwxycggs     NUMBER,
+  zdwxycgrl     NUMBER
+)
+;
+comment on table T_YJPT_CGQ
+  is '储罐区信息';
+comment on column T_YJPT_CGQ.id
+  is 'ID';
+comment on column T_YJPT_CGQ.dwmc
+  is '单位名称';
+comment on column T_YJPT_CGQ.cgqmc
+  is '储罐区名称';
+comment on column T_YJPT_CGQ.jtwz
+  is '具体位置';
+comment on column T_YJPT_CGQ.cgqmj
+  is '储罐区面积';
+comment on column T_YJPT_CGQ.cggs
+  is '储罐个数';
+comment on column T_YJPT_CGQ.gjzxjl
+  is '罐间最小距离';
+comment on column T_YJPT_CGQ.cgrj
+  is '储罐容积';
+comment on column T_YJPT_CGQ.tbr
+  is '填表人';
+comment on column T_YJPT_CGQ.lxdh
+  is '联系电话';
+comment on column T_YJPT_CGQ.tbsj
+  is '填表时间';
+comment on column T_YJPT_CGQ.add_user
+  is 'ADD_USER';
+comment on column T_YJPT_CGQ.add_date
+  is 'ADD_DATE';
+comment on column T_YJPT_CGQ.update_user
+  is 'UPDATE_USER';
+comment on column T_YJPT_CG.update_date
+  is 'UPDATE_DATE';
+comment on column T_YJPT_CGQ.record_status
+  is 'RECORD_STATUS';
+comment on column T_YJPT_CGQ.sftb
+  is 'SFTB';
+comment on column T_YJPT_CGQ.tbzt
+  is 'TBZT';
+comment on column T_YJPT_CGQ.tbdyid
+  is 'TBDYID';
+comment on column T_YJPT_CGQ.qylb
+  is 'QYLB';
+comment on column T_YJPT_CGQ.szd
+  is 'SZD';
+comment on column T_YJPT_CGQ.ssqy
+  is 'SSQY';
+comment on column T_YJPT_CGQ.gq
+  is 'GQ';
+comment on column T_YJPT_CGQ.record_code
+  is 'RECORD_CODE';
+comment on column T_YJPT_CGQ.byzd1
+  is 'BYZD1';
+comment on column T_YJPT_CGQ.byzd2
+  is 'BYZD2';
+comment on column T_YJPT_CGQ.byzd3
+  is 'BYZD3';
+comment on column T_YJPT_CGQ.byzd4
+  is 'BYZD4';
+comment on column T_YJPT_CGQ.byzd5
+  is 'BYZD5';
+comment on column T_YJPT_CGQ.zdwxycggs
+  is '重大危险源储罐个数';
+comment on column T_YJPT_CGQ.zdwxycgrl
+  is '重大危险源储罐容量';
+alter table T_YJPT_CGQ
+  add constraint PK_T_YJPT_CGQ primary key (ID);

gkaq/yjpt-java/trunk/resources/sql/init/2.seq-create.sql.ftl

@@ -117,3 +117,4 @@ CREATE SEQUENCE SEQ_T_YJPT_JYRSHXX MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalu
 CREATE SEQUENCE SEQ_T_YJPT_JZXYSBHZ MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
 CREATE SEQUENCE SEQ_T_YJPT_CGZT MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
 CREATE SEQUENCE SEQ_T_YJPT_CGSY MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
+CREATE SEQUENCE SEQ_T_YJPT_CGQ MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;

gkaq/yjpt-java/trunk/resources/sql/init/9.update.sql.ftl

@@ -8662,8 +8662,30 @@ alter table T_YJPT_GKSSSB modify tbr varchar2(100);
 alter table T_YJPT_QSK modify tbr varchar2(100);
 alter table T_YJPT_YJJYNLJBQK modify tbr varchar2(100);
 </#if>
-<#if versionDate?date("yyyyMMdd") lt "20160822"?date("yyyyMMdd") >
+<#if versionDate?date("yyyyMMdd") lt "20160901"?date("yyyyMMdd") >
+alter table T_YJPT_CGZT ADD gwwd varchar2(100);
+alter table T_YJPT_CGZT ADD dwwd varchar2(100);
+alter table T_YJPT_CGZT ADD wlrj varchar2(100);
+alter table T_YJPT_CGZT ADD cgrj varchar2(100);
+alter table T_YJPT_CGZT ADD md varchar2(100);
+alter table T_YJPT_CGZT ADD zl varchar2(100);
+alter table T_YJPT_CGZT ADD qtnd varchar2(100);
+alter table T_YJPT_CGZT ADD lhxz varchar2(2000);
+alter table T_YJPT_CGZT ADD aqffcs varchar2(2000);
+alter table T_YJPT_CGZT ADD bh varchar2(50);
+alter table T_YJPT_CGZT ADD xtbh varchar2(50);
+alter table T_YJPT_ZCYH ADD CG Number;
+
+</#if>
+
+<#if versionDate?date("yyyyMMdd") lt "20110909"?date("yyyyMMdd") >
+--港区所在水系
+Alter TABLE T_YJPT_GQ ADD SZSX NUMBER;
+-- 泊位结构子类型
+Alter TABLE T_YJPT_JYRXX_BW ADD JGXS2 NUMBER;
+
 --港区增加水系类型0701
+DELETE FROM T_YJPT_GGDM WHERE ID>=2204 AND ID<=2207;
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (2204,null,'SXLX',null,1,'SXLX.CJGL',null,null,null,null,1,null,null,null,null,null,' 长江干流',null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (2205,null,'SXLX',null,2,'SXLX.HHSX',null,null,null,null,1,null,null,null,null,null,' 淮河水系',null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (2206,null,'SXLX',null,3,'SXLX.CJZL',null,null,null,null,1,null,null,null,null,null,' 长江支流',null,null,'0',null,null,null,null,null);
@@ -8677,10 +8699,125 @@ Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_US
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000006,null,'BWXS','BWXS',5,'BWXS.GBZXPT',null,null,null,null,1,null,null,null,null,null,'泊位型式.过驳装卸平台',null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000007,null,'BWXS','BWXS',6,'BWXS.QT',null,null,null,null,1,null,null,null,null,null,'泊位型式.其他',null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000008,10000002,'BWXS2','BWXS2',1,'BWXS2.ZLS',null,null,null,null,1,null,null,null,null,null,'泊位型式2.重力式',null,null,'0',null,null,null,null,null);
-Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000009,10000002,'BWXS2','BWXS2',2,'BWXS2.BZ',null,null,null,null,1,null,null,null,null,null,'泊位型式2.板桩',null,null,'0',null,null,null,null,null);
-Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000010,10000002,'BWXS2','BWXS2',3,'BWXS2.GZ',null,null,null,null,1,null,null,null,null,null,'泊位型式2.高桩',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000009,10000002,'BWXS2','BWXS2',2,'BWXS2.BZ',null,null,null,null,1,null,null,null,null,null,'泊位型式2.板桩式',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000010,10000002,'BWXS2','BWXS2',3,'BWXS2.GZ',null,null,null,null,1,null,null,null,null,null,'泊位型式2.高桩式',null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000011,10000002,'BWXS2','BWXS2',4,'BWXS2.QT',null,null,null,null,1,null,null,null,null,null,'泊位型式2.其他',null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10001004,10000003,'BWXS','BWXS',1,'BWXS2.PDJXP',null,null,null,null,1,null,null,null,null,null,'泊位型式2.皮带机斜坡',null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10001005,10000003,'BWXS','BWXS',2,'BWXS2.LCMT',null,null,null,null,1,null,null,null,null,null,'泊位型式2.缆车码头',null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10001006,10000003,'BWXS','BWXS',3,'BWXS2.QT',null,null,null,null,1,null,null,null,null,null,'泊位型式2.其他',null,null,'0',null,null,null,null,null);
-</#if>
+--更新泊位的所在水系 数据
+update  t_yjpt_jyrxx_bw b set b.bwszsx=2205 where b.bwszsx=10000611;
+update  t_yjpt_jyrxx_bw b set b.bwszsx=2204 where b.bwszsx=10000612;
+</#if>
+<#if versionDate?date("yyyyMMdd") lt "20110919"?date("yyyyMMdd") >
+--储罐区
+create table T_YJPT_CGQ
+(
+  id            NUMBER not null,
+  dwmc          VARCHAR2(40),
+  cgqmc         VARCHAR2(40),
+  cgqmj         NUMBER,
+  cggs          NUMBER,
+  cgrj          NUMBER,
+  jtwz          VARCHAR2(40),
+  gjzxjl        NUMBER,
+  tbr           VARCHAR2(100),
+  lxdh          VARCHAR2(40),
+  tbsj          DATE,
+  add_user      VARCHAR2(50),
+  add_date      TIMESTAMP(6),
+  update_user   VARCHAR2(50),
+  update_date   TIMESTAMP(6),
+  record_status NUMBER default 0,
+  sftb          CHAR(1),
+  tbzt          CHAR(1),
+  tbdyid        NUMBER,
+  qylb          CHAR(1),
+  szd           NUMBER,
+  ssqy          NUMBER,
+  gq            NUMBER,
+  record_code   VARCHAR2(30),
+  byzd1         VARCHAR2(100),
+  byzd2         VARCHAR2(100),
+  byzd3         VARCHAR2(100),
+  byzd4         VARCHAR2(100),
+  byzd5         VARCHAR2(100),
+  zdwxycggs     NUMBER,
+  zdwxycgrl     NUMBER
+)
+;
+comment on table T_YJPT_CGQ
+  is '储罐区信息';
+comment on column T_YJPT_CGQ.id
+  is 'ID';
+comment on column T_YJPT_CGQ.dwmc
+  is '单位名称';
+comment on column T_YJPT_CGQ.cgqmc
+  is '储罐区名称';
+comment on column T_YJPT_CGQ.jtwz
+  is '具体位置';
+comment on column T_YJPT_CGQ.cgqmj
+  is '储罐区面积';
+comment on column T_YJPT_CGQ.cggs
+  is '储罐个数';
+comment on column T_YJPT_CGQ.gjzxjl
+  is '罐间最小距离';
+comment on column T_YJPT_CGQ.cgrj
+  is '储罐容积';
+comment on column T_YJPT_CGQ.tbr
+  is '填表人';
+comment on column T_YJPT_CGQ.lxdh
+  is '联系电话';
+comment on column T_YJPT_CGQ.tbsj
+  is '填表时间';
+comment on column T_YJPT_CGQ.add_user
+  is 'ADD_USER';
+comment on column T_YJPT_CGQ.add_date
+  is 'ADD_DATE';
+comment on column T_YJPT_CGQ.update_user
+  is 'UPDATE_USER';
+comment on column T_YJPT_CG.update_date
+  is 'UPDATE_DATE';
+comment on column T_YJPT_CGQ.record_status
+  is 'RECORD_STATUS';
+comment on column T_YJPT_CGQ.sftb
+  is 'SFTB';
+comment on column T_YJPT_CGQ.tbzt
+  is 'TBZT';
+comment on column T_YJPT_CGQ.tbdyid
+  is 'TBDYID';
+comment on column T_YJPT_CGQ.qylb
+  is 'QYLB';
+comment on column T_YJPT_CGQ.szd
+  is 'SZD';
+comment on column T_YJPT_CGQ.ssqy
+  is 'SSQY';
+comment on column T_YJPT_CGQ.gq
+  is 'GQ';
+comment on column T_YJPT_CGQ.record_code
+  is 'RECORD_CODE';
+comment on column T_YJPT_CGQ.byzd1
+  is 'BYZD1';
+comment on column T_YJPT_CGQ.byzd2
+  is 'BYZD2';
+comment on column T_YJPT_CGQ.byzd3
+  is 'BYZD3';
+comment on column T_YJPT_CGQ.byzd4
+  is 'BYZD4';
+comment on column T_YJPT_CGQ.byzd5
+  is 'BYZD5';
+comment on column T_YJPT_CGQ.zdwxycggs
+  is '重大危险源储罐个数';
+comment on column T_YJPT_CGQ.zdwxycgrl
+  is '重大危险源储罐容量';
+alter table T_YJPT_CGQ
+  add constraint PK_T_YJPT_CGQ primary key (ID);
+  
+ CREATE SEQUENCE SEQ_T_YJPT_CGQ MINVALUE 2000000001 MAXVALUE 32000000000 INCREMENT BY 1 START WITH 2000000001 CACHE 20 NOORDER NOCYCLE;
+  
+ --更新危化品记忆
+  UPDATE  T_YJPT_MEM m SET m.R_CHAR= (SELECT b.aqffcs from T_YJPT_WXHWPMB b where m.R_NUM=b."ID") where  m.type='aqffcs';
+--储罐增加储罐区
+alter  table t_yjpt_cg add cgq number;
+
+</#if>