Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.98_4.9.99_sqlserver.sql =================================================================== diff -u -r34410 -r35028 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.98_4.9.99_sqlserver.sql (.../4.9.98_4.9.99_sqlserver.sql) (revision 34410) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.98_4.9.99_sqlserver.sql (.../4.9.98_4.9.99_sqlserver.sql) (revision 35028) @@ -1,4 +1,4 @@ -select * into TousseInstanceId_WashRecordId from (select ti.id tousseInstanceId, max(wdr.id) washRecordId from WashAndDisinfectRecord wdr join ClassifyBasket_WashRecord cbwr on cbwr.WashAndDisinfectRecord_ID = wdr.id join ClassifyBasket_RecyclingRecord cbrr on cbrr.ClassifyBasket_ID = cbwr.ClassifyBasket_ID join TousseInstance ti on ti.recyclingRecordId = cbrr.RecyclingRecord_ID where ti.packingRecord_id is null and ti.disinfectProgram is null group by ti.id) rs; +select * into TousseInstanceId_WashRecordId from (select top 10000 ti.id tousseInstanceId, max(wdr.id) washRecordId from WashAndDisinfectRecord wdr join ClassifyBasket_WashRecord cbwr on cbwr.WashAndDisinfectRecord_ID = wdr.id join ClassifyBasket_RecyclingRecord cbrr on cbrr.ClassifyBasket_ID = cbwr.ClassifyBasket_ID join TousseInstance ti on ti.recyclingRecordId = cbrr.RecyclingRecord_ID where ti.packingRecord_id is null and ti.disinfectProgram is null group by ti.id) rs; select * into TousseInstanceWashRecordTable from (select tousseInstanceId, wdr.disinfectIdentification, wdr.disinfectProgram, wdr.operatorCode, wdr.operator, CONVERT(varchar(100),wdr.startDate,120) startDateStr, CONVERT(varchar(100),wdr.endDate,120) endDateStr from TousseInstanceId_WashRecordId tiwdr join WashAndDisinfectRecord wdr on wdr.id = tiwdr.washRecordId) rs; update TousseInstance set disinfectIdentification = (select disinfectIdentification from TousseInstanceWashRecordTable po where po.tousseInstanceId = TousseInstance.id), disinfectProgram = (select disinfectProgram from TousseInstanceWashRecordTable po where po.tousseInstanceId = TousseInstance.id), washOperatorCode = (select operatorCode from TousseInstanceWashRecordTable po where po.tousseInstanceId = TousseInstance.id), washOperator = (select operator from TousseInstanceWashRecordTable po where po.tousseInstanceId = TousseInstance.id), washStartTime = (select startDateStr from TousseInstanceWashRecordTable po where po.tousseInstanceId = TousseInstance.id), washEndTime = (select endDateStr from TousseInstanceWashRecordTable po where po.tousseInstanceId = TousseInstance.id) where id in (select tousseInstanceId from TousseInstanceWashRecordTable); update Tousseinstance set recyclingOperator = (select operator from Recyclingrecord where id = Tousseinstance.Recyclingrecordid), recyclingUser = (select recyclingUser from Recyclingrecord where id = Tousseinstance.Recyclingrecordid) where id in (select tousseInstanceId from TousseInstanceWashRecordTable); Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.98_4.9.99_oracle.sql =================================================================== diff -u -r34410 -r35028 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.98_4.9.99_oracle.sql (.../4.9.98_4.9.99_oracle.sql) (revision 34410) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.98_4.9.99_oracle.sql (.../4.9.98_4.9.99_oracle.sql) (revision 35028) @@ -1,4 +1,4 @@ -execute immediate 'create table TousseInstanceIdWashRecordId as (select ti.id tousseInstanceId, max(wdr.id) washRecordId from WashAndDisinfectRecord wdr join ClassifyBasket_WashRecord cbwr on cbwr.WashAndDisinfectRecord_ID = wdr.id join ClassifyBasket_RecyclingRecord cbrr on cbrr.ClassifyBasket_ID = cbwr.ClassifyBasket_ID join TousseInstance ti on ti.recyclingRecordId = cbrr.RecyclingRecord_ID where ti.packingRecord_id is null and ti.disinfectProgram is null group by ti.id)'; +execute immediate 'create table TousseInstanceIdWashRecordId as (select ti.id tousseInstanceId, max(wdr.id) washRecordId from WashAndDisinfectRecord wdr join ClassifyBasket_WashRecord cbwr on cbwr.WashAndDisinfectRecord_ID = wdr.id join ClassifyBasket_RecyclingRecord cbrr on cbrr.ClassifyBasket_ID = cbwr.ClassifyBasket_ID join TousseInstance ti on ti.recyclingRecordId = cbrr.RecyclingRecord_ID where ti.packingRecord_id is null and ti.disinfectProgram is null and rownum <= 10000 group by ti.id)'; execute immediate 'commit'; execute immediate 'create table TousseInstanceWashRecordTable as (select tiwdr.tousseInstanceId, wdr.disinfectIdentification, wdr.disinfectProgram, wdr.operatorCode, wdr.operator, to_char(wdr.startDate,''yyyy-mm-dd HH24:MI:SS'') startDateStr, to_char(wdr.endDate,''yyyy-mm-dd HH24:MI:SS'') endDateStr from TousseInstanceIdWashRecordId tiwdr join WashAndDisinfectRecord wdr on wdr.id = tiwdr.washRecordId)'; execute immediate 'commit';