fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Ajsutes de referencia no objeto' (!217) from AL-2901 into master 

Reviewed-on: adm/VentaBoletosAdm#217
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master
gleimar 2023-07-07 14:50:52 +00:00
parent 7fc8067f2f 2a5f718d22
commit cf9afda6c4
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -8,7 +8,7 @@
<packaging>war</packaging>
<properties>
<modelWeb.version>1.6.9</modelWeb.version>
<modelWeb.version>1.6.10</modelWeb.version>
<flyway.version>1.5.2</flyway.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

16
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionCorridaJob.java
View File

@ -20,24 +20,16 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext;
public class GeneracionCorridaJob implements Job {
private static Logger log = Logger.getLogger(GeneracionCorridaJob.class);
private CorridaService corridaService;
public CorridaService getCorridaService() {
return corridaService;
}
public void setCorridaService(CorridaService corridaService) {
this.corridaService = corridaService;
}
@Override
public void execute(JobExecutionContext jec) throws JobExecutionException {
log.info("Inicio do job de geração de corridas.");
log.info("Inicio do job de geração de corridas.");
ApplicationContext appContext = AppContext.getApplicationContext();
CorridaService cs = (CorridaService) appContext.getBean("corridaService");
cs.generarCorridaAutomatica();
log.info("Fim do job de geração de corridas.");
log.info("Fim do job de geração de corridas.");
}
}

10
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionRetencaoDiariaComissaoJob.java
View File

@ -21,12 +21,14 @@ public class GeneracionRetencaoDiariaComissaoJob implements Job {
private static Logger log = Logger.getLogger(GeneracionRetencaoDiariaComissaoJob.class);
private CalculoComissaoService calculoComissaoService;
private CtrlFechamentoCaixaService ctrlFechamentoCaixaService;
private ConstanteService constanteService;
@Override
public void execute(JobExecutionContext arg0) throws JobExecutionException {
CalculoComissaoService calculoComissaoService;
CtrlFechamentoCaixaService ctrlFechamentoCaixaService;
ConstanteService constanteService;
ApplicationContext appContext = AppContext.getApplicationContext();
calculoComissaoService = (CalculoComissaoService) appContext.getBean("calculoComissaoService");
ctrlFechamentoCaixaService = (CtrlFechamentoCaixaService) appContext.getBean("ctrlFechamentoCaixaService");
@ -44,7 +46,7 @@ public class GeneracionRetencaoDiariaComissaoJob implements Job {
log.info("Verificando fechamento dos caixas, data: " + DateUtil.getStringDate(feccorte, "dd/MM/yyyy"));
if(!ctrlFechamentoCaixaService.autorizarExecutarRotinaRetencao(feccorte)) {
log.info("Fechamento dos caixas não disponiveis para retencao da comissao");
log.info("Fechamento dos caixas não disponiveis para retencao da comissao");
return;
}
log.info("fechamento dos caixas concluido, executar rotina de retencao da comissao");