数据迁移的存储过程[7]

TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmchannel.sql

@@ -6,27 +6,27 @@ CREATE PROCEDURE p_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
-	DECLARE over INT DEFAULT 0;
+	DECLARE isover INT DEFAULT 0;
 
-  DECLARE f_CHANNELID int(11) DEFAULT 0;
-  DECLARE f_SITEID int(11) DEFAULT 0;
+  DECLARE f_CHANNELID int DEFAULT 0;
+  DECLARE f_SITEID int DEFAULT 0;
   DECLARE f_CHNLNAME varchar(200) DEFAULT 0;
   DECLARE f_CHNLDESC varchar(200) DEFAULT NULL;
   DECLARE f_CHNLTABLE varchar(200) DEFAULT NULL;
   DECLARE f_CHNLQUERY varchar(500) DEFAULT NULL;
-  DECLARE f_CHNLPROP int(11) DEFAULT NULL;
-  DECLARE f_PARENTID int(11) DEFAULT 0;
-  DECLARE f_CHNLORDER int(11) DEFAULT 0;
-  DECLARE f_SCHEDULE int(11) DEFAULT NULL;
+  DECLARE f_CHNLPROP int DEFAULT NULL;
+  DECLARE f_PARENTID int DEFAULT 0;
+  DECLARE f_CHNLORDER int DEFAULT 0;
+  DECLARE f_SCHEDULE int DEFAULT NULL;
   DECLARE f_CHNLDATAPATH varchar(200) DEFAULT NULL;
   DECLARE f_CHNLORDERBY varchar(200) DEFAULT NULL;
   DECLARE f_ATTRIBUTE varchar(500) DEFAULT NULL;
   DECLARE f_CRUSER varchar(50) DEFAULT NULL;
   DECLARE f_CRTIME datetime DEFAULT NULL;
-  DECLARE f_STATUS int(11) DEFAULT 0;
-  DECLARE f_CHNLTYPE int(11) DEFAULT 0;
-  DECLARE f_CHNLOUTLINETEMP int(11) DEFAULT 0;
-  DECLARE f_CHNLDETAILTEMP int(11) DEFAULT 0;
+  DECLARE f_STATUS int DEFAULT 0;
+  DECLARE f_CHNLTYPE int DEFAULT 0;
+  DECLARE f_CHNLOUTLINETEMP int DEFAULT 0;
+  DECLARE f_CHNLDETAILTEMP int DEFAULT 0;
   DECLARE f_PUBLISHPRO smallint(6) DEFAULT 1;
   DECLARE f_OPERUSER varchar(50) DEFAULT NULL;
   DECLARE f_OPERTIME datetime DEFAULT NULL;
@@ -44,14 +44,14 @@ CREATE PROCEDURE p_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
   DECLARE f_ADVANCEPROPS varchar(200) DEFAULT NULL;
   DECLARE f_TOOLBAR longtext;
   DECLARE f_ADVTOOLBAR longtext;
-  DECLARE f_ISCONTAINSCHILDREN int(11) DEFAULT 0;
+  DECLARE f_ISCONTAINSCHILDREN int DEFAULT 0;
   DECLARE f_METASYNFIELDS varchar(500) DEFAULT NULL;
   DECLARE f_FLUENCEXML longtext;
   DECLARE f_USEDOCLEVEL smallint(6) DEFAULT NULL;
   DECLARE f_lastmodifytime datetime DEFAULT NULL;
   DECLARE f_VIEWPROPS varchar(300) DEFAULT NULL;
   DECLARE f_NEEDEDPROPS varchar(300) DEFAULT NULL;
-  DECLARE f_INHERIT int(11) DEFAULT 0;
+  DECLARE f_INHERIT int DEFAULT 0;
   DECLARE f_IsSubscribe smallint(6) DEFAULT 0;
   DECLARE f_ISPUSHABLE tinyint(4) DEFAULT 0 ;
   DECLARE f_ISDISTRIBUTABLE tinyint(4) DEFAULT 0 ;
@@ -116,7 +116,7 @@ CREATE PROCEDURE p_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
     FROM v_wcm.wcmchannel
 		ORDER BY channelid asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -175,7 +175,7 @@ CREATE PROCEDURE p_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
 
 
 
-    WHILE over= 0 DO
+    WHILE isover = 0 DO
 
       # 断点续传
       IF (f_CHANNELID > prevChnlId)
@@ -355,5 +355,5 @@ CREATE PROCEDURE p_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
 
   SELECT '迁移 wcmchannel 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmchannelchildindexquote.sql

@@ -6,7 +6,7 @@ CREATE PROCEDURE p_data_migration_wcmchannelchildindexquote(IN templateIdOffset
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
-    DECLARE over INT DEFAULT 0;
+    DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_TEMPLATEID int(11) DEFAULT '0';
     DECLARE  f_FOLDERTYPE int(11) DEFAULT '0';
@@ -22,7 +22,7 @@ CREATE PROCEDURE p_data_migration_wcmchannelchildindexquote(IN templateIdOffset
       QUOTECHANNELID
     FROM v_wcm.wcmchannelchildindexquote;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -35,10 +35,10 @@ CREATE PROCEDURE p_data_migration_wcmchannelchildindexquote(IN templateIdOffset
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
 
-      SET f_TEMPID = f_TEMPID + templateIdOffset;
+      SET f_TEMPLATEID = f_TEMPLATEID + templateIdOffset;
       SET f_QUOTECHANNELID = f_QUOTECHANNELID + templateIdOffset;
 
       IF (f_FOLDERTYPE = 103)
@@ -80,5 +80,5 @@ CREATE PROCEDURE p_data_migration_wcmchannelchildindexquote(IN templateIdOffset
 
   SELECT '迁移 wcmchannelchildindexquote 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmchannelsyn.sql

@@ -6,7 +6,7 @@ CREATE PROCEDURE p_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
                                                   IN channelIdOffset BIGINT(20))
 	BEGIN
 	
-    DECLARE over INT DEFAULT 0;
+    DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_CHANNELSYNID int(11) DEFAULT NULL;
     DECLARE  f_SRCCHANNEL int(11) DEFAULT NULL;
@@ -41,7 +41,7 @@ CREATE PROCEDURE p_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
     FROM v_wcm.wcmchannelsyn
     ORDER BY CHANNELSYNID ASC ;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -63,7 +63,7 @@ CREATE PROCEDURE p_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_CHANNELSYNID > prevChannelSynId)
@@ -135,5 +135,5 @@ CREATE PROCEDURE p_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
 
   SELECT '迁移 wcmchannelsyn 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmchnldoc.sql

@@ -8,7 +8,7 @@ CREATE PROCEDURE p_data_migration_wcmchnldoc(IN prevRecId BIGINT(20),
                                                   IN channelIdOffset BIGINT(20))
 	BEGIN
 	
-    DECLARE over INT DEFAULT 0;
+    DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_CHNLID int(11)  DEFAULT '0';
     DECLARE  f_DOCID int(11)  DEFAULT '0';
@@ -97,7 +97,7 @@ CREATE PROCEDURE p_data_migration_wcmchnldoc(IN prevRecId BIGINT(20),
     FROM v_wcm.wcmchnldoc
     ORDER BY RECID ASC ;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -146,7 +146,7 @@ CREATE PROCEDURE p_data_migration_wcmchnldoc(IN prevRecId BIGINT(20),
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_RECID > prevRecId)
@@ -299,5 +299,5 @@ CREATE PROCEDURE p_data_migration_wcmchnldoc(IN prevRecId BIGINT(20),
 
   SELECT '迁移 wcmchnldoc 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmdocument.sql

@@ -9,7 +9,7 @@ CREATE PROCEDURE p_data_migration_wcmdocument(IN prevDocId BIGINT(20),
 
 	BEGIN 
 	
-	DECLARE over INT DEFAULT 0;	
+	DECLARE isover INT DEFAULT 0;	
 	
   DECLARE f_DOCID int(11) DEFAULT 0;
   DECLARE f_DOCCHANNEL int(11) DEFAULT 0;
@@ -181,7 +181,7 @@ CREATE PROCEDURE p_data_migration_wcmdocument(IN prevDocId BIGINT(20),
     where docid <= 1000
 		ORDER BY docid asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur_doc;
 	
@@ -271,7 +271,7 @@ CREATE PROCEDURE p_data_migration_wcmdocument(IN prevDocId BIGINT(20),
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_DOCID > prevDocId)
@@ -551,5 +551,5 @@ CREATE PROCEDURE p_data_migration_wcmdocument(IN prevDocId BIGINT(20),
 
   SELECT '迁移 wcmdocument 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmfolderpublishconfig.sql

@@ -7,7 +7,7 @@ CREATE PROCEDURE p_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCon
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
-    DECLARE over INT DEFAULT 0;
+    DECLARE isover INT DEFAULT 0;
 
     DECLARE f_FOLDERPUBLISHCONFIGID int(11) DEFAULT 0;
     DECLARE f_FOLDERTYPE int(11) DEFAULT 0;
@@ -38,7 +38,7 @@ CREATE PROCEDURE p_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCon
     FROM v_wcm.wcmfolderpublishconfig
 		ORDER BY FOLDERPUBLISHCONFIGID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -58,7 +58,7 @@ CREATE PROCEDURE p_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCon
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_FOLDERPUBLISHCONFIGID > prevFolderPublishConfigId)
@@ -128,5 +128,5 @@ CREATE PROCEDURE p_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCon
 
   SELECT '迁移 wcmfolderpublishconfig 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmmetatable.sql

@@ -8,23 +8,29 @@ CREATE PROCEDURE p_data_migration_wcmmetatable(IN prevTableInfoId VARCHAR(100),
 
 	BEGIN
 
+    DECLARE isover INT DEFAULT 0;
+    DECLARE f_TABLEINFOID INT DEFAULT 0;
+    DECLARE f_TABLENAME VARCHAR(200) DEFAULT NULL;
+
     DECLARE cur CURSOR FOR
       SELECT
+        TABLEINFOID,
         TABLENAME
       FROM v_wcm.xwcmtableinfo
       ORDER BY TABLEINFOID asc;
 
-    DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 
     OPEN cur;
 
     FETCH cur INTO
+      f_TABLEINFOID,
       f_TABLENAME
     ;
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_TABLEINFOID > prevTableInfoId)
@@ -47,6 +53,7 @@ CREATE PROCEDURE p_data_migration_wcmmetatable(IN prevTableInfoId VARCHAR(100),
       END IF ;
 
     FETCH cur INTO
+      f_TABLEINFOID,
       f_TABLENAME
     ;
 
@@ -56,5 +63,5 @@ CREATE PROCEDURE p_data_migration_wcmmetatable(IN prevTableInfoId VARCHAR(100),
 
     SELECT concat('升级 wcmmetatable', f_TABLENAME, ' 完毕');
 
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplate.sql

@@ -7,7 +7,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
-    DECLARE over INT DEFAULT 0;
+    DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_TEMPID int(11) DEFAULT '0';
     DECLARE  f_TEMPNAME varchar(150) DEFAULT '0';
@@ -56,7 +56,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
     FROM v_wcm.wcmtemplate
 		ORDER BY FOLDERPUBLISHCONFIGID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -85,7 +85,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_TEMPID > prevTemplateId)
@@ -190,5 +190,5 @@ CREATE PROCEDURE p_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
 
   SELECT '迁移 wcmtemplate 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplateargument.sql

@@ -7,7 +7,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGIN
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
-    DECLARE over INT DEFAULT 0;
+    DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_TEMPLATEARGUMENTID int(11) DEFAULT '0';
     DECLARE  f_EMPLOYERTYPE int(11) DEFAULT '0';
@@ -30,7 +30,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGIN
     FROM v_wcm.wcmtemplateargument
 		ORDER BY TEMPLATEARGUMENTID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -46,7 +46,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGIN
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_TEMPLATEARGUMENTID > prevTemplateArgId)
@@ -57,11 +57,11 @@ CREATE PROCEDURE p_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGIN
             SET f_TEMPLATEID = f_TEMPLATEID + baseTemplateId;
 
             IF (f_EMPLOYERTYPE = 103)
-              THEN SET EMPLOYERID = EMPLOYERID + siteIdOffset;
+              THEN SET f_EMPLOYERID = f_EMPLOYERID + siteIdOffset;
             END IF ;
 
             IF (f_EMPLOYERTYPE = 101)
-              THEN SET EMPLOYERID = EMPLOYERID + channelIdOffset;
+              THEN SET f_EMPLOYERID = f_EMPLOYERID + channelIdOffset;
             END IF ;
 
 
@@ -106,5 +106,5 @@ CREATE PROCEDURE p_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGIN
 
   SELECT '迁移 wcmtemplateargument 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplateemploy.sql

@@ -7,7 +7,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIGI
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
-    DECLARE over INT DEFAULT 0;
+    DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_TEMPLATEEMPLOYID int(11) DEFAULT '0';
     DECLARE  f_EMPLOYERTYPE int(11) DEFAULT '0';
@@ -28,7 +28,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIGI
     FROM v_wcm.wcmtemplateemploy
 		ORDER BY TEMPLATEEMPLOYID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -43,7 +43,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIGI
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_TEMPLATEEMPLOYID > prevTemplateEmployId)
@@ -100,5 +100,5 @@ CREATE PROCEDURE p_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIGI
 
   SELECT '迁移 wcmtemplateemploy 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplatenest.sql

@@ -5,7 +5,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(2
                                               IN templateNestIdOffset BIGINT(20))
 	BEGIN 
 	
-    DECLARE over INT DEFAULT 0;
+    DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_TEMPLATEID int(11) DEFAULT 0;
     DECLARE  f_NESTEDTEMPLATEID int(11) DEFAULT 0;
@@ -19,7 +19,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(2
     FROM v_wcm.wcmtemplatenest
 		ORDER BY TEMPLATENESTID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -31,7 +31,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(2
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_TEMPLATENESTID > prevTemplateNestId)
@@ -39,8 +39,8 @@ CREATE PROCEDURE p_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(2
         THEN
 
             SET f_TEMPLATENESTID = f_TEMPLATENESTID + templateNestIdOffset;
-            SET f_TEMPLATEID = f_TEMPLATEID + baseTemplateId;
-            SET NESTEDTEMPLATEID = NESTEDTEMPLATEID + baseTemplateId;
+            SET f_TEMPLATEID = f_TEMPLATEID + templateNestIdOffset;
+            SET f_NESTEDTEMPLATEID = f_NESTEDTEMPLATEID + templateNestIdOffset;
 
             insert into trs_hycloud_iip.wcmtemplatenest
               (
@@ -70,5 +70,5 @@ CREATE PROCEDURE p_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(2
 
   SELECT '迁移 wcmtemplatenest 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplatequote.sql

@@ -7,7 +7,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGINT
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
-    DECLARE over INT DEFAULT 0;
+    DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_TEMPLATEQUOTEID int(11) DEFAULT '0';
     DECLARE  f_TEMPLATEID int(11) DEFAULT '0';
@@ -30,7 +30,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGINT
     FROM v_wcm.wcmtemplatequote
 		ORDER BY TEMPLATEQUOTEID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -46,7 +46,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGINT
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_TEMPLATEQUOTEID > prevTemplateQuoteId)
@@ -106,5 +106,5 @@ CREATE PROCEDURE p_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGINT
 
   SELECT '迁移 wcmtemplatequote 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmwebsite.sql

@@ -4,7 +4,7 @@ DELIMITER $$
 CREATE PROCEDURE p_data_migration_wcmwebsite(IN prevSiteId BIGINT(20), IN siteIdOffset BIGINT(20))
 	BEGIN 
 	
-	DECLARE over INT DEFAULT 0;
+	DECLARE isover INT DEFAULT 0;
 	
   DECLARE f_SITEID int(11) DEFAULT 0;
   DECLARE f_SITENAME varchar(200) DEFAULT 0;
@@ -95,7 +95,7 @@ CREATE PROCEDURE p_data_migration_wcmwebsite(IN prevSiteId BIGINT(20), IN siteId
 		FROM v_wcm.wcmwebsite
 		ORDER BY siteid asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -145,7 +145,7 @@ CREATE PROCEDURE p_data_migration_wcmwebsite(IN prevSiteId BIGINT(20), IN siteId
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 支持断点续传
       IF (f_SITEID > prevSiteId)
@@ -296,5 +296,5 @@ CREATE PROCEDURE p_data_migration_wcmwebsite(IN prevSiteId BIGINT(20), IN siteId
 
   SELECT '迁移 wcmwebsite 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmclassinfo.sql

@@ -5,7 +5,7 @@ CREATE PROCEDURE p_data_migration_xwcmclassinfo(IN prevClassInfoId BIGINT(20),
                                               IN classInfoIdOffset BIGINT(20))
 	BEGIN 
 	
-	  DECLARE over INT DEFAULT 0;
+	  DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_CLASSINFOID int(11) DEFAULT NULL;
     DECLARE  f_CLASSORDER int(11) DEFAULT NULL;
@@ -32,7 +32,7 @@ CREATE PROCEDURE p_data_migration_xwcmclassinfo(IN prevClassInfoId BIGINT(20),
     FROM v_wcm.xwcmclassinfo
 		ORDER BY CLASSINFOID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -50,7 +50,7 @@ CREATE PROCEDURE p_data_migration_xwcmclassinfo(IN prevClassInfoId BIGINT(20),
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_CLASSINFOID > prevClassInfoId)
@@ -113,5 +113,5 @@ CREATE PROCEDURE p_data_migration_xwcmclassinfo(IN prevClassInfoId BIGINT(20),
 
   SELECT '迁移 xwcmclassinfo 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmclassinfoview.sql

@@ -7,7 +7,7 @@ CREATE PROCEDURE p_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGIN
                                               IN viewIdOffset BIGINT(20))
 	BEGIN
 	
-	  DECLARE over INT DEFAULT 0;
+	  DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_CLASSINFOVIEWID int(11) DEFAULT NULL;
     DECLARE  f_CLASSINFOID int(11) DEFAULT NULL;
@@ -28,7 +28,7 @@ CREATE PROCEDURE p_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGIN
     FROM v_wcm.xwcmclassinfoview
 		ORDER BY CLASSINFOVIEWID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -43,7 +43,7 @@ CREATE PROCEDURE p_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGIN
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_CLASSINFOID > prevClassInfoId)
@@ -94,5 +94,5 @@ CREATE PROCEDURE p_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGIN
 
   SELECT '迁移 xwcmclassinfoview 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmdbinfo.sql

@@ -8,7 +8,7 @@ CREATE PROCEDURE p_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
                                               IN tableIdOffset BIGINT(20))
 	BEGIN
 	
-	  DECLARE over INT DEFAULT 0;
+	  DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_DBFIELDINFOID int(11) DEFAULT NULL;
     DECLARE  f_TABLENAME varchar(50) DEFAULT '0';
@@ -55,7 +55,7 @@ CREATE PROCEDURE p_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
     FROM v_wcm.xwcmdbfieldinfo
 		ORDER BY DBFIELDINFOID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -83,7 +83,7 @@ CREATE PROCEDURE p_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_DBFIELDINFOID > prevFieldId)
@@ -171,5 +171,5 @@ CREATE PROCEDURE p_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
 
   SELECT '迁移 xwcmdbfieldinfo 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmmetaviewemployer.sql

@@ -7,13 +7,15 @@ CREATE PROCEDURE p_data_migration_xwcmmetaviewemployer(IN prevMetaViewEmployerId
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
-    DECLARE over INT DEFAULT 0;
+    DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_VIEWID int(11) DEFAULT '0';
     DECLARE  f_CHANNELID int(11) DEFAULT '0';
     DECLARE  f_METAVIEWEMPLOYERID int(11) DEFAULT '0';
     DECLARE  f_EmployerType int(11) DEFAULT '101';
     DECLARE  f_EmployerId int(11) DEFAULT '0';
+    DECLARE  f_FOLDERTYPE int(11) DEFAULT '101';
+    DECLARE  f_FOLDERID int(11) DEFAULT '0';
 
 
     DECLARE cur CURSOR FOR
@@ -26,7 +28,7 @@ CREATE PROCEDURE p_data_migration_xwcmmetaviewemployer(IN prevMetaViewEmployerId
     FROM v_wcm.xwcmmetaviewemployer
 		ORDER BY METAVIEWEMPLOYERID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -40,7 +42,7 @@ CREATE PROCEDURE p_data_migration_xwcmmetaviewemployer(IN prevMetaViewEmployerId
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_METAVIEWEMPLOYERID > prevMetaViewEmployerId)
@@ -93,5 +95,5 @@ CREATE PROCEDURE p_data_migration_xwcmmetaviewemployer(IN prevMetaViewEmployerId
 
   SELECT '迁移 xwcmmetaviewemployer 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmmetaviewfieldgroup.sql

@@ -6,7 +6,7 @@ CREATE PROCEDURE p_data_migration_xwcmmetaviewfieldgroup(IN prevMetaViewFieldGro
                                               IN viewIdOffset BIGINT(20))
 	BEGIN
 	
-	  DECLARE over INT DEFAULT 0;
+	  DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_METAVIEWFIELDGROUPID int(11) DEFAULT NULL;
     DECLARE  f_GROUPNAME varchar(50) DEFAULT '0';
@@ -29,7 +29,7 @@ CREATE PROCEDURE p_data_migration_xwcmmetaviewfieldgroup(IN prevMetaViewFieldGro
     FROM v_wcm.xwcmmetaviewfieldgroup
 		ORDER BY METAVIEWFIELDGROUPID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -45,7 +45,7 @@ CREATE PROCEDURE p_data_migration_xwcmmetaviewfieldgroup(IN prevMetaViewFieldGro
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_METAVIEWFIELDGROUPID > prevMetaViewFieldGroupId)
@@ -97,5 +97,5 @@ CREATE PROCEDURE p_data_migration_xwcmmetaviewfieldgroup(IN prevMetaViewFieldGro
 
   SELECT '迁移 xwcmmetaviewfieldgroup 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmtableinfo.sql

@@ -6,7 +6,7 @@ CREATE PROCEDURE p_data_migration_xwcmtableinfo(IN citySuffix VARCHAR(20),
                                               IN tableInfoIdOffset BIGINT(20))
 	BEGIN 
 	
-	  DECLARE over INT DEFAULT 0;
+	  DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_TABLEINFOID int(11) DEFAULT NULL;
     DECLARE  f_TABLENAME varchar(50) DEFAULT NULL;
@@ -31,7 +31,7 @@ CREATE PROCEDURE p_data_migration_xwcmtableinfo(IN citySuffix VARCHAR(20),
     FROM v_wcm.xwcmtableinfo
 		ORDER BY TABLEINFOID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -48,7 +48,7 @@ CREATE PROCEDURE p_data_migration_xwcmtableinfo(IN citySuffix VARCHAR(20),
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_TABLEINFOID > prevTableInfoId)
@@ -101,5 +101,5 @@ CREATE PROCEDURE p_data_migration_xwcmtableinfo(IN citySuffix VARCHAR(20),
 
   SELECT '迁移 xwcmtableinfo 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmviewfieldinfo.sql

@@ -12,7 +12,7 @@ CREATE PROCEDURE p_data_migration_xwcmviewfieldinfo(IN citySuffix VARCHAR(20),
                                               IN viewIdOffset BIGINT(20))
 	BEGIN
 	
-	  DECLARE over INT DEFAULT 0;
+	  DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_VIEWFIELDINFOID int(11) DEFAULT NULL;
     DECLARE  f_TABLENAME varchar(50) DEFAULT NULL;
@@ -105,7 +105,7 @@ CREATE PROCEDURE p_data_migration_xwcmviewfieldinfo(IN citySuffix VARCHAR(20),
     FROM v_wcm.xwcmviewfieldinfo
 		ORDER BY VIEWFIELDINFOID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -156,7 +156,7 @@ CREATE PROCEDURE p_data_migration_xwcmviewfieldinfo(IN citySuffix VARCHAR(20),
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_VIEWFIELDINFOID > prevViewFieldId)
@@ -318,5 +318,5 @@ CREATE PROCEDURE p_data_migration_xwcmviewfieldinfo(IN citySuffix VARCHAR(20),
 
   SELECT '迁移 xwcmviewfieldinfo 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmviewinfo.sql

@@ -7,7 +7,7 @@ CREATE PROCEDURE p_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
                                               IN mainTableIdOffset BIGINT(20))
 	BEGIN 
 	
-	DECLARE over INT DEFAULT 0;
+	DECLARE isover INT DEFAULT 0;
 
     DECLARE  f_VIEWINFOID int(11) DEFAULT NULL;
     DECLARE  f_VIEWNAME varchar(100) DEFAULT NULL;
@@ -54,7 +54,7 @@ CREATE PROCEDURE p_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
     FROM v_wcm.xwcmviewinfo
 		ORDER BY VIEWINFOID asc;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET over = 1;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
 	OPEN cur;
 	
@@ -82,7 +82,7 @@ CREATE PROCEDURE p_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
 
 
 
-    WHILE over= 0 DO
+    WHILE isover= 0 DO
 
       # 断点续传
       IF (f_VIEWINFOID > prevViewId)
@@ -169,5 +169,5 @@ CREATE PROCEDURE p_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
 
   SELECT '迁移 xwcmviewinfo 完毕';
 		
-	END$$
+	END $$
 DELIMITER ;