Skip to content

fix: corrige consulta da carga horaria cumprida por aluno #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masakik merged 1 commit into from
Jun 3, 2026
+59 −11
Merged

fix: corrige consulta da carga horaria cumprida por aluno #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 59 additions & 11 deletions app/Replicado/Graduacao.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,7 @@ public static function obterCargaHorariaCumpridaAluno($codpes)
SELECT
v.codpes,
v.nompes,
e.codema AS email,
em.codema AS email,
v.codcurgrd AS codcur,
v.codhab AS codhab,
YEAR(v.dtainivin) AS ano_ingresso,
Expand All @@ -1047,27 +1047,75 @@ public static function obterCargaHorariaCumpridaAluno($codpes)
) AS carga_horaria_total_cumprida
FROM VINCULOPESSOAUSP v
INNER JOIN HISTESCOLARGR h ON h.codpes = v.codpes
INNER JOIN DISCIPLINAGR d ON d.coddis = h.coddis
LEFT JOIN EMAILPESSOA e ON e.codpes = v.codpes AND e.stamtr = 'S'
WHERE v.codpes = :codpes

-- Subquery para garantir a versão correta da disciplina
LEFT JOIN DISCIPLINAGR d
ON d.coddis = h.coddis
AND d.dtaatvdis = (
SELECT TOP 1 d2.dtaatvdis
FROM DISCIPLINAGR d2
WHERE d2.coddis = h.coddis
AND (
(
d2.dtaatvdis <= ISNULL(h.dtavalfim, h.dtacrihst)
AND (
d2.dtadtvdis IS NULL
OR ISNULL(h.dtavalfim, h.dtacrihst) <= d2.dtadtvdis
)
)
OR NOT EXISTS (
SELECT 1
FROM DISCIPLINAGR d3
WHERE d3.coddis = h.coddis
AND d3.dtaatvdis <= ISNULL(h.dtavalfim, h.dtacrihst)
AND (
d3.dtadtvdis IS NULL
OR ISNULL(h.dtavalfim, h.dtacrihst) <= d3.dtadtvdis
)
)
)
ORDER BY
CASE
WHEN d2.dtaatvdis <= ISNULL(h.dtavalfim, h.dtacrihst)
AND (
d2.dtadtvdis IS NULL
OR ISNULL(h.dtavalfim, h.dtacrihst) <= d2.dtadtvdis
)
THEN 0 ELSE 1
END ASC,
d2.dtaatvdis DESC
)

LEFT JOIN EMAILPESSOA em ON em.codpes = v.codpes AND em.stamtr = 'S'

WHERE v.codpes = :codpes
AND v.tipvin = 'ALUNOGR'
AND v.sitatl = 'A'
AND h.rstfim IS NOT NULL
AND h.rstfim = 'A'
AND h.rstfim NOT IN ('RA', 'RF', 'RN', 'T')
AND h.stamtr NOT IN ('E', 'R')
AND h.discrl IN ('O', 'L')
AND d.dtaatvdis <= ISNULL(h.dtavalfim, h.dtacrihst)
AND h.discrl IN ('O', 'L', 'C')
AND (
d.dtadtvdis IS NULL
OR ISNULL(h.dtavalfim, h.dtacrihst) <= d.dtadtvdis
ISNULL(h.dtavalfim, h.dtacrihst) >= v.dtainivin
OR h.rstfim = 'D'
)
AND NOT EXISTS (
SELECT 1
FROM REQUERHISTESC r
INNER JOIN EQUIVEXTERNAGR eq
ON eq.codrqm = r.codrqm
AND eq.codpes = r.codpes
WHERE r.codpes = h.codpes
AND r.coddis = h.coddis
)

GROUP BY
YEAR(v.dtainivin),
v.codpes,
v.nompes,
v.codcurgrd,
v.codhab,
v.nompes,
e.codema
em.codema
";

$param = ['codpes' => $codpes];
Expand Down