fix restriction count

This commit is contained in:
Ruslan 2025-04-22 15:05:52 +03:00
parent e39e394fd7
commit 70ca8385ca
6 changed files with 39 additions and 19 deletions

View file

@ -294,6 +294,8 @@ ids AS (
subpoena_data AS ( subpoena_data AS (
SELECT SELECT
s.id AS subpoena_id, s.id AS subpoena_id,
s.recruit_id,
rdi.status_applied,
s.create_date, s.create_date,
s.visit_date, s.visit_date,
s.department_id::uuid AS recruitment_id, s.department_id::uuid AS recruitment_id,
@ -328,6 +330,7 @@ subpoena_data AS (
SELECT SELECT
restriction_document_create_id, restriction_document_create_id,
restriction_document_cancel_id, restriction_document_cancel_id,
status_applied,
applied_date, applied_date,
id id
FROM ( FROM (
@ -360,6 +363,8 @@ subpoena_data AS (
season_separations AS ( season_separations AS (
SELECT distinct SELECT distinct
ls.recruitment_id, ls.recruitment_id,
ls.recruit_id,
ls.status_applied,
ls.create_date, ls.create_date,
ls.visit_date, ls.visit_date,
ls.sub_stat_hist, ls.sub_stat_hist,
@ -464,18 +469,18 @@ t7 AS (
SELECT SELECT
ss.recruitment_id, ss.recruitment_id,
ss.spring_autumn, ss.spring_autumn,
COUNT(DISTINCT ss.subpoena_id) AS count_restrictions_applied COUNT(distinct recruit_id) AS count_restrictions_applied
FROM season_separations ss FROM season_separations ss
WHERE restr_dc IS NULL WHERE rdi_id IS NOT NULL AND restr_dc IS NULL
GROUP BY ss.recruitment_id, ss.spring_autumn GROUP BY ss.recruitment_id, ss.spring_autumn
), ),
t8 AS ( t8 AS (
SELECT SELECT
ss.recruitment_id, ss.recruitment_id,
ss.spring_autumn, ss.spring_autumn,
COUNT(DISTINCT ss.subpoena_id) AS count_introduced_measures COUNT(distinct recruit_id) AS count_introduced_measures
FROM season_separations ss FROM season_separations ss
WHERE restr_dc IS NULL AND ap_date IS NOT NULL WHERE status_applied = '11'
GROUP BY ss.recruitment_id, ss.spring_autumn GROUP BY ss.recruitment_id, ss.spring_autumn
), ),
t9 AS ( t9 AS (

View file

@ -207,6 +207,7 @@ ids AS (
subpoena_data AS ( subpoena_data AS (
SELECT SELECT
s.id AS subpoena_id, s.id AS subpoena_id,
s.recruit_id,
s.department_id::uuid, s.department_id::uuid,
s.status_id, s.status_id,
(CASE (CASE
@ -220,6 +221,7 @@ subpoena_data AS (
rdi.restriction_document_cancel_id AS restr_dc, rdi.restriction_document_cancel_id AS restr_dc,
rdi.applied_date AS ap_date, rdi.applied_date AS ap_date,
rdi.id AS rdi_id, rdi.id AS rdi_id,
rdi.status_applied,
ssi.delivery_code AS d_code, ssi.delivery_code AS d_code,
ssi.act_number, ssi.act_number,
s.visit_date s.visit_date
@ -245,6 +247,7 @@ subpoena_data AS (
SELECT SELECT
restriction_document_create_id, restriction_document_create_id,
restriction_document_cancel_id, restriction_document_cancel_id,
status_applied,
applied_date, applied_date,
id id
FROM ( FROM (
@ -354,7 +357,7 @@ t7 AS (
SELECT SELECT
ls.mil_reg, ls.mil_reg,
ls.department_id, ls.department_id,
COUNT(rdi_id) AS count_restrictions_applied COUNT(distinct recruit_id) AS count_restrictions_applied
FROM subpoena_data ls FROM subpoena_data ls
WHERE rdi_id IS NOT NULL AND restr_dc IS NULL WHERE rdi_id IS NOT NULL AND restr_dc IS NULL
GROUP BY ls.department_id, ls.mil_reg GROUP BY ls.department_id, ls.mil_reg
@ -363,9 +366,9 @@ t8 AS (
SELECT SELECT
ls.mil_reg, ls.mil_reg,
ls.department_id, ls.department_id,
COUNT(rdi_id) AS count_introduced_measures COUNT(distinct recruit_id) AS count_introduced_measures
FROM subpoena_data ls FROM subpoena_data ls
WHERE rdi_id IS NOT NULL AND restr_dc IS NULL AND ap_date IS NOT NULL WHERE status_applied = '11'
GROUP BY ls.department_id, ls.mil_reg GROUP BY ls.department_id, ls.mil_reg
), ),
t9 AS ( t9 AS (

View file

@ -207,6 +207,7 @@ ids AS (
subpoena_data AS ( subpoena_data AS (
SELECT SELECT
s.id AS subpoena_id, s.id AS subpoena_id,
s.recruit_id,
s.department_id::uuid, s.department_id::uuid,
s.status_id, s.status_id,
(CASE (CASE
@ -220,6 +221,7 @@ subpoena_data AS (
rdi.restriction_document_cancel_id AS restr_dc, rdi.restriction_document_cancel_id AS restr_dc,
rdi.applied_date AS ap_date, rdi.applied_date AS ap_date,
rdi.id AS rdi_id, rdi.id AS rdi_id,
rdi.status_applied,
ssi.delivery_code AS d_code, ssi.delivery_code AS d_code,
ssi.act_number, ssi.act_number,
s.visit_date s.visit_date
@ -245,6 +247,7 @@ subpoena_data AS (
SELECT SELECT
restriction_document_create_id, restriction_document_create_id,
restriction_document_cancel_id, restriction_document_cancel_id,
status_applied,
applied_date, applied_date,
id id
FROM ( FROM (
@ -354,7 +357,7 @@ t7 AS (
SELECT SELECT
ls.mil_reg, ls.mil_reg,
ls.department_id, ls.department_id,
COUNT(rdi_id) AS count_restrictions_applied COUNT(distinct recruit_id) AS count_restrictions_applied
FROM subpoena_data ls FROM subpoena_data ls
WHERE rdi_id IS NOT NULL AND restr_dc IS NULL WHERE rdi_id IS NOT NULL AND restr_dc IS NULL
GROUP BY ls.department_id, ls.mil_reg GROUP BY ls.department_id, ls.mil_reg
@ -363,9 +366,9 @@ t8 AS (
SELECT SELECT
ls.mil_reg, ls.mil_reg,
ls.department_id, ls.department_id,
COUNT(rdi_id) AS count_introduced_measures COUNT(distinct recruit_id) AS count_introduced_measures
FROM subpoena_data ls FROM subpoena_data ls
WHERE rdi_id IS NOT NULL AND restr_dc IS NULL AND ap_date IS NOT NULL WHERE status_applied = '11'
GROUP BY ls.department_id, ls.mil_reg GROUP BY ls.department_id, ls.mil_reg
), ),
t9 AS ( t9 AS (

View file

@ -207,6 +207,7 @@ ids AS (
subpoena_data AS ( subpoena_data AS (
SELECT SELECT
s.id AS subpoena_id, s.id AS subpoena_id,
s.recruit_id,
s.department_id::uuid, s.department_id::uuid,
s.status_id, s.status_id,
(CASE (CASE
@ -220,6 +221,7 @@ subpoena_data AS (
rdi.restriction_document_cancel_id AS restr_dc, rdi.restriction_document_cancel_id AS restr_dc,
rdi.applied_date AS ap_date, rdi.applied_date AS ap_date,
rdi.id AS rdi_id, rdi.id AS rdi_id,
rdi.status_applied,
ssi.delivery_code AS d_code, ssi.delivery_code AS d_code,
ssi.act_number, ssi.act_number,
s.visit_date s.visit_date
@ -245,6 +247,7 @@ subpoena_data AS (
SELECT SELECT
restriction_document_create_id, restriction_document_create_id,
restriction_document_cancel_id, restriction_document_cancel_id,
status_applied,
applied_date, applied_date,
id id
FROM ( FROM (
@ -354,7 +357,7 @@ t7 AS (
SELECT SELECT
ls.mil_reg, ls.mil_reg,
ls.department_id, ls.department_id,
COUNT(rdi_id) AS count_restrictions_applied COUNT(distinct recruit_id) AS count_restrictions_applied
FROM subpoena_data ls FROM subpoena_data ls
WHERE rdi_id IS NOT NULL AND restr_dc IS NULL WHERE rdi_id IS NOT NULL AND restr_dc IS NULL
GROUP BY ls.department_id, ls.mil_reg GROUP BY ls.department_id, ls.mil_reg
@ -363,9 +366,9 @@ t8 AS (
SELECT SELECT
ls.mil_reg, ls.mil_reg,
ls.department_id, ls.department_id,
COUNT(rdi_id) AS count_introduced_measures COUNT(distinct recruit_id) AS count_introduced_measures
FROM subpoena_data ls FROM subpoena_data ls
WHERE rdi_id IS NOT NULL AND restr_dc IS NULL AND ap_date IS NOT NULL WHERE status_applied = '11'
GROUP BY ls.department_id, ls.mil_reg GROUP BY ls.department_id, ls.mil_reg
), ),
t9 AS ( t9 AS (

View file

@ -207,6 +207,7 @@ ids AS (
subpoena_data AS ( subpoena_data AS (
SELECT SELECT
s.id AS subpoena_id, s.id AS subpoena_id,
s.recruit_id,
s.department_id::uuid, s.department_id::uuid,
s.status_id, s.status_id,
(CASE (CASE
@ -220,6 +221,7 @@ subpoena_data AS (
rdi.restriction_document_cancel_id AS restr_dc, rdi.restriction_document_cancel_id AS restr_dc,
rdi.applied_date AS ap_date, rdi.applied_date AS ap_date,
rdi.id AS rdi_id, rdi.id AS rdi_id,
rdi.status_applied,
ssi.delivery_code AS d_code, ssi.delivery_code AS d_code,
ssi.act_number, ssi.act_number,
s.visit_date s.visit_date
@ -245,6 +247,7 @@ subpoena_data AS (
SELECT SELECT
restriction_document_create_id, restriction_document_create_id,
restriction_document_cancel_id, restriction_document_cancel_id,
status_applied,
applied_date, applied_date,
id id
FROM ( FROM (
@ -354,7 +357,7 @@ t7 AS (
SELECT SELECT
ls.mil_reg, ls.mil_reg,
ls.department_id, ls.department_id,
COUNT(rdi_id) AS count_restrictions_applied COUNT(distinct recruit_id) AS count_restrictions_applied
FROM subpoena_data ls FROM subpoena_data ls
WHERE rdi_id IS NOT NULL AND restr_dc IS NULL WHERE rdi_id IS NOT NULL AND restr_dc IS NULL
GROUP BY ls.department_id, ls.mil_reg GROUP BY ls.department_id, ls.mil_reg
@ -363,9 +366,9 @@ t8 AS (
SELECT SELECT
ls.mil_reg, ls.mil_reg,
ls.department_id, ls.department_id,
COUNT(rdi_id) AS count_introduced_measures COUNT(distinct recruit_id) AS count_introduced_measures
FROM subpoena_data ls FROM subpoena_data ls
WHERE rdi_id IS NOT NULL AND restr_dc IS NULL AND ap_date IS NOT NULL WHERE status_applied = '11'
GROUP BY ls.department_id, ls.mil_reg GROUP BY ls.department_id, ls.mil_reg
), ),
t9 AS ( t9 AS (

View file

@ -207,6 +207,7 @@ ids AS (
subpoena_data AS ( subpoena_data AS (
SELECT SELECT
s.id AS subpoena_id, s.id AS subpoena_id,
s.recruit_id,
s.department_id::uuid, s.department_id::uuid,
s.status_id, s.status_id,
(CASE (CASE
@ -220,6 +221,7 @@ subpoena_data AS (
rdi.restriction_document_cancel_id AS restr_dc, rdi.restriction_document_cancel_id AS restr_dc,
rdi.applied_date AS ap_date, rdi.applied_date AS ap_date,
rdi.id AS rdi_id, rdi.id AS rdi_id,
rdi.status_applied,
ssi.delivery_code AS d_code, ssi.delivery_code AS d_code,
ssi.act_number, ssi.act_number,
s.visit_date s.visit_date
@ -245,6 +247,7 @@ subpoena_data AS (
SELECT SELECT
restriction_document_create_id, restriction_document_create_id,
restriction_document_cancel_id, restriction_document_cancel_id,
status_applied,
applied_date, applied_date,
id id
FROM ( FROM (
@ -354,7 +357,7 @@ t7 AS (
SELECT SELECT
ls.mil_reg, ls.mil_reg,
ls.department_id, ls.department_id,
COUNT(rdi_id) AS count_restrictions_applied COUNT(distinct recruit_id) AS count_restrictions_applied
FROM subpoena_data ls FROM subpoena_data ls
WHERE rdi_id IS NOT NULL AND restr_dc IS NULL WHERE rdi_id IS NOT NULL AND restr_dc IS NULL
GROUP BY ls.department_id, ls.mil_reg GROUP BY ls.department_id, ls.mil_reg
@ -363,9 +366,9 @@ t8 AS (
SELECT SELECT
ls.mil_reg, ls.mil_reg,
ls.department_id, ls.department_id,
COUNT(rdi_id) AS count_introduced_measures COUNT(distinct recruit_id) AS count_introduced_measures
FROM subpoena_data ls FROM subpoena_data ls
WHERE rdi_id IS NOT NULL AND restr_dc IS NULL AND ap_date IS NOT NULL WHERE status_applied = '11'
GROUP BY ls.department_id, ls.mil_reg GROUP BY ls.department_id, ls.mil_reg
), ),
t9 AS ( t9 AS (