Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
SalidasAutomaticas
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Billy Larru
SalidasAutomaticas
Commits
989dbc46
Commit
989dbc46
authored
Sep 21, 2018
by
Billy Larru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[EDIT quitando inner join con la tabla asistencia para obtener los horarios del personal]
parent
e0ea947c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
16 deletions
+4
-16
SalidasMysqlDAO.java
src/salidasautomaticas/mysqldao/SalidasMysqlDAO.java
+4
-16
No files found.
src/salidasautomaticas/mysqldao/SalidasMysqlDAO.java
View file @
989dbc46
...
@@ -40,19 +40,11 @@ public class SalidasMysqlDAO implements SalidasDAO {
...
@@ -40,19 +40,11 @@ public class SalidasMysqlDAO implements SalidasDAO {
+
"SELECT"
+
"SELECT"
+
" p.salidaLV, "
+
" p.salidaLV, "
+
" p.salidaS "
+
" p.salidaS "
+
"FROM"
+
"FROM "
+
" asistencia a "
+
"personal p "
+
"INNER JOIN personal p ON a.codper = p.codper "
// + "INNER JOIN salidas_update su ON p.codcargo = su.codcargo "
+
"WHERE "
+
"WHERE "
+
"estado in (1, 2, 5) "
//Que sean asistencias 1=Asistio, 2=No marco y 5=Tardanza
+
"p.codtipo!=3 "
//Que registren asistencia
+
"AND p.codtipo!=3 "
//Que registren asistencia
+
"AND a.fecha_asis=? "
+
"AND p.retirado = 0 "
+
"AND p.retirado = 0 "
// + "AND p.horaing = su.horaLV "
// + "AND p.mining = su.minutoLV "
// + "AND p.horaingsabado = su.sabadoLV "
// + "AND p.miningsabado = su.sabadoS "
+
"AND NOT p.codlocal IN ('L035', 'L053', 'L038') "
//Que no sea profesores por horas, pronoe belisario y grupo MH
+
"AND NOT p.codlocal IN ('L035', 'L053', 'L038') "
//Que no sea profesores por horas, pronoe belisario y grupo MH
+
"AND NOT p.pronoe = 1 "
//Que no sea pronoe
+
"AND NOT p.pronoe = 1 "
//Que no sea pronoe
+
"AND NOT p.codcargo IN (71, 13, 96, 41) "
//Que no sea policia ni de cafeteria ni vigilante ni interna psicologa
+
"AND NOT p.codcargo IN (71, 13, 96, 41) "
//Que no sea policia ni de cafeteria ni vigilante ni interna psicologa
...
@@ -65,11 +57,7 @@ public class SalidasMysqlDAO implements SalidasDAO {
...
@@ -65,11 +57,7 @@ public class SalidasMysqlDAO implements SalidasDAO {
}
else
if
(
diaSemana
==
6
)
{
}
else
if
(
diaSemana
==
6
)
{
query
=
query
.
replaceAll
(
"\\{campo_salida\\}"
,
"tabla.salidaS"
);
query
=
query
.
replaceAll
(
"\\{campo_salida\\}"
,
"tabla.salidaS"
);
}
}
jsonArray
=
EstandarDAO
.
getInstance
().
consultar
(
cn
,
query
);
JSONArray
parametrosQuery
=
new
JSONArray
();
parametrosQuery
.
put
(
getFechaHoy
());
jsonArray
=
EstandarDAO
.
getInstance
().
consultar
(
cn
,
query
,
parametrosQuery
);
return
jsonArray
;
return
jsonArray
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment