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

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

@@ -8661,4 +8661,26 @@ alter table T_YJPT_ZDSGYHPCZGBA modify tbr varchar2(100);
 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") >
+--港区增加水系类型0701
+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);
+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 (2207,null,'SXLX',null,4,'SXLX.QTSX',null,null,null,null,1,null,null,null,null,null,' 其他水系',null,null,'0',null,null,null,null,null);
+--更新泊位型式
+DELETE FROM T_YJPT_GGDM WHERE GROUPCODE LIKE 'BWXS%';
+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 (10000002,null,'BWXS','BWXS',1,'BWXS.ZLS',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 (10000003,null,'BWXS','BWXS',2,'BWXS.XP',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 (10000004,null,'BWXS','BWXS',3,'BWXS.FMT',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 (10000005,null,'BWXS','BWXS',4,'BWXS.DDXB',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 (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 (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>

gkaq/yjpt-java/trunk/resources/sql/init/yxqvalid.sql

@@ -30,13 +30,13 @@ BEGIN
     CURSOR CUR_EXPIRED_FZ IS
       SELECT ID,BAFZRQ FROM T_YJPT_JYRJCXX WHERE BAFZRQ<TRUNC(SYSDATE, 'DD')-WARN_DAYS AND RECORD_STATUS<>9; --附证过期的经营人
     CURSOR CUR_NS_JYR_1 IS
-      SELECT ID FROM T_YJPT_JYRJCXX jyr WHERE GKWXHWZYFZBH IS NOT NULL AND RECORD_STATUS<>9
-      AND ADD_MONTHS(FZYXQ,-25)<SYSDATE AND ADD_MONTHS(FZYXQ,-24)>SYSDATE
-      AND NOT EXISTS (SELECT 1 FROM T_YJPT_JYRXX_NSB ns WHERE ns.JYR=jyr.ID AND ns.FZBH=jyr.GKWXHWZYFZBH AND ns.NSNS=1 AND ns.RECORD_STATUS<>9); --需要进行第一次年审的经营人
+     SELECT ID FROM T_YJPT_JYRJCXX jyr WHERE   jyr.RECORD_STATUS<>9    
+   	AND  EXISTS (SELECT 1 FROM  T_YJPT_GKWXHWZYFZBLHHZ hz  WHERE hz.JYR=jyr.ID AND  hz.RECORD_STATUS =2 AND hz.FZSJ IS NOT NULL AND ADD_MONTHS(hz.FZSJ,13)>SYSDATE AND ADD_MONTHS(hz.FZSJ,12)<SYSDATE 
+	AND HZ.BYZD1 NOT IN (SELECT NS.FZBH FROM T_YJPT_JYRXX_NSB NS WHERE  NS.JYR=jyr.ID AND NS.NSNS=1 AND NS.RECORD_STATUS<>9));--需要进行第一次年审的经营人
     CURSOR CUR_NS_JYR_2 IS
-      SELECT ID FROM T_YJPT_JYRJCXX jyr WHERE GKWXHWZYFZBH IS NOT NULL AND RECORD_STATUS<>9
-      AND ADD_MONTHS(FZYXQ,-13)<SYSDATE AND ADD_MONTHS(FZYXQ,-12)>SYSDATE
-      AND NOT EXISTS (SELECT 1 FROM T_YJPT_JYRXX_NSB ns WHERE ns.JYR=jyr.ID AND ns.FZBH=jyr.GKWXHWZYFZBH AND ns.NSNS=2 AND ns.RECORD_STATUS<>9); --需要进行第二次年审的经营人
+     SELECT ID FROM T_YJPT_JYRJCXX jyr WHERE   jyr.RECORD_STATUS<>9    
+   	AND  EXISTS (SELECT 1 FROM  T_YJPT_GKWXHWZYFZBLHHZ hz  WHERE hz.JYR=jyr.ID AND  hz.RECORD_STATUS =2 AND hz.FZSJ IS NOT NULL AND ADD_MONTHS(hz.FZSJ,25)>SYSDATE AND ADD_MONTHS(hz.FZSJ,24)<SYSDATE 
+	AND HZ.BYZD1 NOT IN (SELECT NS.FZBH FROM T_YJPT_JYRXX_NSB NS WHERE  NS.JYR=jyr.ID AND NS.NSNS=2AND NS.RECORD_STATUS<>9)); --需要进行第二次年审的经营人
     CURSOR CUR_EXPIRED_ZC IS
       SELECT zc.ID,jyr.ID,jyr.GKJYR,TO_CHAR(zc.JCSJ,'yyyy-mm-dd') FROM T_YJPT_ZCYH yh JOIN T_YJPT_ZC zc ON yh.SSZC= zc.ID JOIN T_YJPT_JYRJCXX jyr ON zc.QYMC=jyr.ID
       WHERE yh.JHWCSJ<=TRUNC(SYSDATE, 'DD') AND yh.MQZT='-1' AND yh.RECORD_STATUS<>9 AND zc.RECORD_STATUS<>9 AND jyr.RECORD_STATUS<>9; --到期的自查隐患