Commit 1e776281 by Billy Larru

obtener asistencia de personal con tipo de asistencia diferente de 3

parent 9f3ad403
......@@ -52,7 +52,7 @@ public class SalidasMysqlDAO implements SalidasDAO {
+ "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.codcargo IN (71, 13, 96, 41) "//Que no sea policia ni de cafeteria ni vigilante ni interna psicologa
+ "AND p.tmp_id not in (99998, 9998, 99999, 9888) "//Que esten en planilla
// + "AND p.tmp_id not in (99998, 9998, 99999, 9888) "//Que esten en planilla
+ "AND NOT p.horaing > 19 "
+ "AND NOT p.salidaS = '') as tabla WHERE NULLIF( {campo_salida} , '') is NOT null GROUP BY {campo_salida} ";
......@@ -130,7 +130,7 @@ public class SalidasMysqlDAO implements SalidasDAO {
+ "AND (WEEKDAY(asistencia.fecha_asis) + 1) !=7 " //Que no sea domingo
+ "AND NOT ( (WEEKDAY(asistencia.fecha_asis) + 1)=6 and personal.codcargo in ({cod_cargo_primaria}) ) " //Que no sean de primaria los sabados
+ "AND asistencia.estado in (1, 2, 5) "//Que sean asistio, tardanza y no marco
+ "AND p.tmp_id not in (99998, 9998, 99999, 9888) "//Que esten en planilla
// + "AND personal.tmp_id not in (99998, 9998, 99999, 9888) "//Que esten en planilla
+ "AND personal.retirado=0) as tabla "
+ "where tabla.salida!=''";
......@@ -259,6 +259,7 @@ public class SalidasMysqlDAO implements SalidasDAO {
+ " AND NOT pronoe=1 "
+ " AND not p.codcargo in (71, 13, 96, 41) "//Que no sea policia, cafeteria, vigilante ni interna psicologa
// + " AND p.tmp_id not in (99998, 9998, 99999, 9888) "//Que esten en planilla
+ " AND p.codtipo!=3 "//Que si registren asistencia
+ " and horaing < 19 and (nullif(p.salidaLV,'') is null and nullif(p.salidaS, '') is null) "
+ " ) as tbl "
+ "SET p.salidaLV=tbl.salidaLV, "
......@@ -271,11 +272,7 @@ public class SalidasMysqlDAO implements SalidasDAO {
}
public static void main(String[] args) {
try {
System.out.println(new SalidasMysqlDAO().actualizarSalida("11:00"));
} catch (Exception ex) {
log.error("error", ex);
}
}
}
......@@ -29,13 +29,12 @@ public class ProgramarSalidasTask extends TimerTask {
public void run() {
try {
JSONArray listaHorarios = service.obtenerHorariosSalida();
// JSONArray listaHorarios = new JSONArray();
// String[] arraySalidas = {"08:42", "14:46", "14:50", "17:00", "17:30", "18:00"};
// for (String salida : arraySalidas) {
// listaHorarios.put(new JSONObject().put("salida", salida));
// }
// JSONArray listaHorarios = service.obtenerHorariosSalida();
JSONArray listaHorarios = new JSONArray();
String[] arraySalidas = {"15:26", "14:46", "14:50", "17:00", "17:30", "18:00"};
for (String salida : arraySalidas) {
listaHorarios.put(new JSONObject().put("salida", salida));
}
Timer timer;
TimerTask task;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment