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

Merge pull request 'fixes bug#AL-3711' (!145) from AL-3711 into master 

Reviewed-on: adm/ModelWeb#145
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
master
Gleison da Cruz 2024-02-02 21:59:25 +00:00
parent ab6ceea190 e6445a5469
commit 0a1ee2b60d
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId>
<version>1.36.2</version>
<version>1.36.3</version>
<distributionManagement>
<repository>

2
src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java
View File

@ -549,7 +549,7 @@ public class TarifaOficialHibernateDAO extends GenericHibernateDAO<TarifaOficial
sql.append(" AND tof.ACTIVO = 1 ");
sql.append(" AND ta.ACTIVO = 1 ) ");
sql.append(" LEFT JOIN VIGENCIA_TARIFA vg on ta.VIGENCIATARIFA_ID=vg.VIGENCIATARIFA_ID");
sql.append(" INNER JOIN VIGENCIA_TARIFA vg on ta.VIGENCIATARIFA_ID=vg.VIGENCIATARIFA_ID");
sql.append(" and vg.FECINICIOVIGENCIA<= TO_DATE(:dataInicial,'DD/MM/YYYY hh24:mi') ");
sql.append(" and vg.FECFINVIGENCIA>= TO_DATE(:dataFinal,'DD/MM/YYYY hh24:mi')");
sql.append(" INNER JOIN PEAJE p");

4
src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java
View File

@ -8,6 +8,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -360,12 +361,13 @@ public class TarifaOficialServiceImpl implements TarifaOficialService {
List<TarifaOficialComComposicaoDoPedagioVo> lsTarifaOficialComComposicaoDoPedagioVo = tarifaOficialDAO.oberTarifaOficialComComposicaoDoPedagioVo(empresaId);
if (!lsTarifaOficialComComposicaoDoPedagioVo.isEmpty()) {
log.info("tamanho da lsTarifaOficialComComposicaoDoPedagioVo: " + lsTarifaOficialComComposicaoDoPedagioVo.size());
for (TarifaOficialComComposicaoDoPedagioVo tarifaOficialComComposicaoDoPedagioVo : lsTarifaOficialComComposicaoDoPedagioVo) {
log.info("tarifaOficiald:" + tarifaOficialComComposicaoDoPedagioVo.getTarifaOficialId() + " | composicao do pedágio no cálculo:" + tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje() + " | composicao do pedágio na tarifa:" + tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa());
if (tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa() == null) {
if (StringUtils.isBlank(tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa())|| tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa().equalsIgnoreCase("null") ) {
HashMap<Integer, Integer> mapComposicaoDoPedagioNaTarifaOficialComPeaje = new HashMap();
String[] parDeChavePeajeMaisCasetaPeaje1 = tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje().replace(" ", "").split(",");
montaMapComposicao(mapComposicaoDoPedagioNaTarifaOficialComPeaje, parDeChavePeajeMaisCasetaPeaje1);