diff --git a/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js b/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js index e210588e47d8813e30295c7bb229e222752d4491..0166a18e7c0aaf0b34bcec87d6da01914792eda4 100644 --- a/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js +++ b/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js @@ -6,9 +6,19 @@ import("system.vars"); var campaignId = vars.get("$param.CampaignId_param"); -var sqlSelect = "select CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, count(distinct CAMPAIGNPARTICIPANTID), MAXPARTICIPANTS, count(distinct CAMPAIGNPARTICIPANTLOGID) " - + "from CAMPAIGNSTEP left join CAMPAIGNPARTICIPANT on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID " - + "left join CAMPAIGNPARTICIPANTLOG on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANTLOG.CAMPAIGNSTEP_ID "; +var sqlSelect = "select CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, count(distinct CAMPAIGNPARTICIPANTID), MAXPARTICIPANTS, count(distinct CAMPAIGNPARTICIPANTLOGID) \n\ + from CAMPAIGNSTEP \n\ + left join CAMPAIGNPARTICIPANT on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID \n\ + left join CAMPAIGNPARTICIPANTLOG on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANTLOG.CAMPAIGNSTEP_ID \n\ + and exists ( \n\ + select 1 \n\ + from CAMPAIGNPARTICIPANTLOG NEXTSTEPLOG \n\ + join CAMPAIGNSTEP NEXTSTEP on NEXTSTEPLOG.CAMPAIGNSTEP_ID = NEXTSTEP.CAMPAIGNSTEPID \n\ + where CAMPAIGNSTEP.CAMPAIGNSTEPID != NEXTSTEP.CAMPAIGNSTEPID \n\ + and NEXTSTEPLOG.CAMPAIGNPARTICIPANT_ID = CAMPAIGNPARTICIPANTLOG.CAMPAIGNPARTICIPANT_ID \n\ + and NEXTSTEP.CAMPAIGN_ID = CAMPAIGNSTEP.CAMPAIGN_ID \n\ + and NEXTSTEP.SORTING > CAMPAIGNSTEP.SORTING \n\ + )"; var sqlGroupOrderBy = "group by CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, MAXPARTICIPANTS, CAMPAIGNSTEP.SORTING order by CAMPAIGNSTEP.SORTING"; var sqlQuery = SqlCondition.begin()