Download as
Browse Code »

Commit beb57d635a2457ea4d87a29abc524c4ee4c661f2

Authored by maycon.silva
1 parent 9ba783b8
Exists in master

Redmine #3700 Correção de atividades de Homologacao

Showing 8 changed files with 187 additions and 23 deletions   Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/dao/ProcessoDao.java
  Diff comments   View file @beb57d6
@@ -91,5 +91,34 @@ public interface ProcessoDao extends CitGenericDAO { @@ -91,5 +91,34 @@ public interface ProcessoDao extends CitGenericDAO {
91 * @return 91 * @return
92 */ 92 */
93 Boolean isProcessoAbertoEmOutrasUnidades(Processo processo); 93 Boolean isProcessoAbertoEmOutrasUnidades(Processo processo);
  94 +
  95 + /**
  96 + * <p><b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a></p>
  97 + *
  98 + * <p><b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a></p>
  99 + *
  100 + * Método responsável por
  101 + *
  102 + * @author maycon.silva
  103 + *
  104 + * @param idProcessInstance
  105 + * @return
  106 + */
  107 + Processo getProcessoByIdProcessInstance(Long idProcessInstance);
  108 +
  109 +
  110 + /**
  111 + * <p><b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a></p>
  112 + *
  113 + * <p><b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a></p>
  114 + *
  115 + * Método responsável por
  116 + *
  117 + * @author maycon.silva
  118 + *
  119 + * @param nup
  120 + * @return
  121 + */
  122 + Processo getProcessoByProtocolo(String nup);
94 123
95 } 124 }
cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java
  Diff comments   View file @beb57d6
@@ -83,7 +83,7 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD @@ -83,7 +83,7 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD
83 return this.search(searchSeven); 83 return this.search(searchSeven);
84 84
85 } 85 }
86 - 86 +
87 /** 87 /**
88 * 88 *
89 */ 89 */
@@ -98,25 +98,29 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD @@ -98,25 +98,29 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD
98 98
99 criteria.add(Restrictions.eq("id", processo.getId())); 99 criteria.add(Restrictions.eq("id", processo.getId()));
100 criteria.add(Restrictions.ne("unidade.id", processo.getUnidade().getId())); 100 criteria.add(Restrictions.ne("unidade.id", processo.getUnidade().getId()));
101 - 101 +
102 Long quantidade = (Long) criteria.uniqueResult(); 102 Long quantidade = (Long) criteria.uniqueResult();
103 -  
104 - if(quantidade > 0) 103 +
  104 + if (quantidade > 0)
105 return Boolean.TRUE; 105 return Boolean.TRUE;
106 - 106 +
107 return Boolean.FALSE; 107 return Boolean.FALSE;
108 } 108 }
109 - 109 +
110 /** 110 /**
111 * 111 *
112 - * <p><b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a></p>  
113 - *  
114 - * <p><b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a></p>  
115 - * 112 + * <p>
  113 + * <b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a>
  114 + * </p>
  115 + *
  116 + * <p>
  117 + * <b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a>
  118 + * </p>
  119 + *
116 * Método responsável por 120 * Método responsável por
117 - * 121 + *
118 * @author andre.silva 122 * @author andre.silva
119 - * 123 + *
120 * @param idProcesso 124 * @param idProcesso
121 * @param data 125 * @param data
122 * @return 126 * @return
@@ -130,12 +134,39 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD @@ -130,12 +134,39 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD
130 134
131 criteria.setProjection(Projections.rowCount()); 135 criteria.setProjection(Projections.rowCount());
132 136
133 -  
134 criteria.add(Restrictions.between("dataCriacao", dataInicial, dataFinal)); 137 criteria.add(Restrictions.between("dataCriacao", dataInicial, dataFinal));
135 138
136 return (Long) criteria.uniqueResult(); 139 return (Long) criteria.uniqueResult();
137 } 140 }
138 -  
139 141
  142 + /**
  143 + *
  144 + */
  145 + @Override
  146 + public Processo getProcessoByIdProcessInstance(Long idProcessInstance) {
  147 +
  148 + SearchSeven search = new SearchSeven(persistentClass);
  149 +
  150 + search.addFilterEqual("idProcessInstance", idProcessInstance);
  151 +
  152 + search(search, Processo.class);
  153 +
  154 + return searchUnique(search);
  155 + }
  156 +
  157 + /**
  158 + *
  159 + */
  160 + @Override
  161 + public Processo getProcessoByProtocolo(String nup) {
  162 +
  163 + SearchSeven search = new SearchSeven(persistentClass);
  164 +
  165 + search.addFilterEqual("nup", nup);
  166 +
  167 + search(search, Processo.class);
  168 +
  169 + return searchUnique(search);
  170 + }
140 171
141 } 172 }
cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java
  Diff comments   View file @beb57d6
@@ -136,6 +136,7 @@ public class Processo extends PersistentObjectUnidade { @@ -136,6 +136,7 @@ public class Processo extends PersistentObjectUnidade {
136 private String tipoAssunto; 136 private String tipoAssunto;
137 137
138 /** Atributo idProcessInstance. */ 138 /** Atributo idProcessInstance. */
  139 + @JsonView({ Views.ProcessoList.class })
139 private Long idProcessInstance; 140 private Long idProcessInstance;
140 141
141 /** Atributo nivelAcesso. */ 142 /** Atributo nivelAcesso. */
cit-ecm-api/src/main/java/br/com/centralit/api/service/ProcessoService.java
  Diff comments   View file @beb57d6
@@ -4,6 +4,26 @@ import br.com.centralit.api.model.PlanoClassificacao; @@ -4,6 +4,26 @@ import br.com.centralit.api.model.PlanoClassificacao;
4 import br.com.centralit.api.model.Processo; 4 import br.com.centralit.api.model.Processo;
5 import br.com.centralit.framework.service.arquitetura.GenericService; 5 import br.com.centralit.framework.service.arquitetura.GenericService;
6 6
  7 +/**
  8 + * <p><img src="http://centralit.com.br/images/logo_central.png"></p>
  9 + *
  10 + * <p><b>Company: </b> Central IT - Governança Corporativa - </p>
  11 + *
  12 + * <p><b>Title: </b></p>
  13 + *
  14 + * <p><b>Description: </b></p>
  15 + *
  16 + * <p><b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a></p>
  17 + *
  18 + * <p><b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a></p>
  19 + *
  20 + * @since 28/03/2016 - 09:15:34
  21 + *
  22 + * @version 1.0.0
  23 + *
  24 + * @author maycon.silva
  25 + *
  26 + */
7 public interface ProcessoService extends GenericService<Processo, Long> { 27 public interface ProcessoService extends GenericService<Processo, Long> {
8 28
9 /** 29 /**
@@ -94,6 +114,35 @@ public interface ProcessoService extends GenericService&lt;Processo, Long&gt; { @@ -94,6 +114,35 @@ public interface ProcessoService extends GenericService&lt;Processo, Long&gt; {
94 */ 114 */
95 Processo atualizarSigiloProcesso(Processo entity); 115 Processo atualizarSigiloProcesso(Processo entity);
96 116
  117 +
  118 + /**
  119 + * <p><b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a></p>
  120 + *
  121 + * <p><b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a></p>
  122 + *
  123 + * Método responsável por devolver o processoSigad passando como parametro o id da instancia do BPE
  124 + *
  125 + * @author maycon.silva
  126 + *
  127 + * @param idProcessInstance
  128 + * @return
  129 + */
  130 + Processo getProcessoByIdProcessInstance(Long idProcessInstance);
  131 +
  132 + /**
  133 + * <p><b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a></p>
  134 + *
  135 + * <p><b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a></p>
  136 + *
  137 + * Método responsável por
  138 + *
  139 + * @author maycon.silva
  140 + *
  141 + * @param nup
  142 + * @return
  143 + */
  144 + Processo getProcessoByProtocolo(String nup);
  145 +
97 146
98 147
99 148
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java
  Diff comments   View file @beb57d6
@@ -36,6 +36,7 @@ import br.com.centralit.api.service.TemporalidadeService; @@ -36,6 +36,7 @@ import br.com.centralit.api.service.TemporalidadeService;
36 import br.com.centralit.api.service.UnidadeProcessoService; 36 import br.com.centralit.api.service.UnidadeProcessoService;
37 import br.com.centralit.api.service.UnidadeService; 37 import br.com.centralit.api.service.UnidadeService;
38 import br.com.centralit.framework.esi.enumerated.VariableTypeEnum; 38 import br.com.centralit.framework.esi.enumerated.VariableTypeEnum;
  39 +import br.com.centralit.framework.esi.environment.EnvironmentOutput;
39 import br.com.centralit.framework.esi.environment.EnvironmentVariable; 40 import br.com.centralit.framework.esi.environment.EnvironmentVariable;
40 import br.com.centralit.framework.exception.BusinessException; 41 import br.com.centralit.framework.exception.BusinessException;
41 import br.com.centralit.framework.exception.CodigoErro; 42 import br.com.centralit.framework.exception.CodigoErro;
@@ -287,7 +288,10 @@ public class ProcessoServiceImpl extends GenericServiceImpl&lt;Processo, Long&gt; impl @@ -287,7 +288,10 @@ public class ProcessoServiceImpl extends GenericServiceImpl&lt;Processo, Long&gt; impl
287 throw new BusinessException("ECM.VALIDACAO.ERRO_VINCULO_FLUXO_BPE_ESI", CodigoErro.REGRA_NEGOCIO.getValue()); 288 throw new BusinessException("ECM.VALIDACAO.ERRO_VINCULO_FLUXO_BPE_ESI", CodigoErro.REGRA_NEGOCIO.getValue());
288 } 289 }
289 290
290 - this.startBusinessProcess(processo.getTipoProcesso().getProcessoNegocio(), variaveis); 291 + EnvironmentOutput environmentOutput = this.startBusinessProcess(processo.getTipoProcesso().getProcessoNegocio(), variaveis);
  292 +
  293 + processo.setIdProcessInstance(environmentOutput.getProcessInstanceId());
  294 +
291 } 295 }
292 296
293 /** 297 /**
@@ -885,4 +889,25 @@ public class ProcessoServiceImpl extends GenericServiceImpl&lt;Processo, Long&gt; impl @@ -885,4 +889,25 @@ public class ProcessoServiceImpl extends GenericServiceImpl&lt;Processo, Long&gt; impl
885 } 889 }
886 } 890 }
887 } 891 }
  892 +
  893 + /**
  894 + *
  895 + */
  896 + @Override
  897 + public Processo getProcessoByIdProcessInstance(Long idProcessInstance) {
  898 +
  899 + // TODO Auto-generated method stub
  900 + return this.processoDao.getProcessoByIdProcessInstance(idProcessInstance);
  901 + }
  902 +
  903 + @Override
  904 + public Processo getProcessoByProtocolo(String nup) {
  905 +
  906 + // TODO Auto-generated method stub
  907 + return this.processoDao.getProcessoByProtocolo(nup);
  908 + }
  909 +
  910 +
  911 +
  912 +
888 } 913 }
cit-ecm-web/src/main/java/br/com/centralit/controller/ProcessoController.java
  Diff comments   View file @beb57d6
@@ -55,6 +55,25 @@ public class ProcessoController extends GenericController&lt;Processo&gt; { @@ -55,6 +55,25 @@ public class ProcessoController extends GenericController&lt;Processo&gt; {
55 55
56 return responseBody; 56 return responseBody;
57 } 57 }
  58 +
  59 + @RequestMapping(method = RequestMethod.GET, value = "/getProcessoByIdProcessInstance")
  60 + @ResponseBody
  61 + public ResponseBodyWrapper getProcessoByIdProcessInstance(@RequestParam(value = "idProcessInstance") Long idProcessInstance) {
  62 +
  63 + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.processoService.getProcessoByIdProcessInstance(idProcessInstance), this.getListView());
  64 +
  65 + return responseBody;
  66 + }
  67 +
  68 + @RequestMapping(method = RequestMethod.GET, value = "/getProcessoByProtocolo")
  69 + @ResponseBody
  70 + public ResponseBodyWrapper getProcessoByProtocolo(@RequestParam(value = "nup") String nup) {
  71 +
  72 + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.processoService.getProcessoByProtocolo(nup), this.getListView());
  73 +
  74 + return responseBody;
  75 + }
  76 +
58 77
59 @Override 78 @Override
60 public Class<Views.ProcessoEdit> getEditView() { 79 public Class<Views.ProcessoEdit> getEditView() {
cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/ProcessoRepository.js
  Diff comments   View file @beb57d6
@@ -12,6 +12,14 @@ citApp.factory(&#39;ProcessoRepository&#39;, [&#39;RestangularEcm&#39;, &#39;AbstractRepository&#39;, fu @@ -12,6 +12,14 @@ citApp.factory(&#39;ProcessoRepository&#39;, [&#39;RestangularEcm&#39;, &#39;AbstractRepository&#39;, fu
12 this.concluir = function(paramsGet) { 12 this.concluir = function(paramsGet) {
13 return restangularEcm.one(this.route + "/concluir").get(paramsGet); 13 return restangularEcm.one(this.route + "/concluir").get(paramsGet);
14 }; 14 };
  15 +
  16 + this.getProcessoByIdProcessInstance = function (idProcessInstance){
  17 + return restangularEcm.one(this.route + '/getProcessoByIdProcessInstance').get({"idProcessInstance": idProcessInstance}).then();
  18 + };
  19 +
  20 + this.getProcessoByProtocolo = function (nup){
  21 + return restangularEcm.one(this.route + '/getProcessoByProtocolo').get({"nup": nup}).then();
  22 + };
15 } 23 }
16 24
17 AbstractRepository.extend(ProcessoRepository); 25 AbstractRepository.extend(ProcessoRepository);
cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html
  Diff comments   View file @beb57d6
@@ -35,6 +35,16 @@ @@ -35,6 +35,16 @@
35 35
36 </div> 36 </div>
37 </div> 37 </div>
  38 +
  39 + <div class="row">
  40 +
  41 + <div class="col-md-8">
  42 + <auto-complete ng-id="documentoGed.tipoDocumento" ng-set-result="construirRelacionamento(item)" ng-label="ECM.LABEL.TIPODOCUMENTO" ng-model="documentoGed.tipoDocumento" form="documentoGedForm"
  43 + ng-obrigatorio="true" ng-acao-borracha='limparCamposTipoProcesso()' ng-disabled="!edit ||(documentoGed.id && documentoGed.formaCriacao.codigo == 1)"
  44 + ng-find="findAutoCompleteTipoDocumento(value)" ng-item="item.nome" />
  45 + </div>
  46 +
  47 + </div>
38 48
39 <div class="row"> 49 <div class="row">
40 <div class="col-md-4"> 50 <div class="col-md-4">
@@ -50,15 +60,7 @@ @@ -50,15 +60,7 @@
50 </div> 60 </div>
51 </div> 61 </div>
52 62
53 - <div class="row">  
54 -  
55 - <div class="col-md-8">  
56 - <auto-complete ng-id="documentoGed.tipoDocumento" ng-set-result="construirRelacionamento(item)" ng-label="ECM.LABEL.TIPODOCUMENTO" ng-model="documentoGed.tipoDocumento" form="documentoGedForm"  
57 - ng-obrigatorio="true" ng-acao-borracha='limparCamposTipoProcesso()' ng-disabled="!edit ||(documentoGed.id && documentoGed.formaCriacao.codigo == 1)"  
58 - ng-find="findAutoCompleteTipoDocumento(value)" ng-item="item.nome" />  
59 - </div>  
60 63
61 - </div>  
62 64
63 <div class="row"> 65 <div class="row">
64 66