diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/ProcessoDao.java b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/ProcessoDao.java index a751224..746cd75 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/ProcessoDao.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/ProcessoDao.java @@ -91,5 +91,34 @@ public interface ProcessoDao extends CitGenericDAO { * @return */ Boolean isProcessoAbertoEmOutrasUnidades(Processo processo); + + /** + *

Iniciativa(s): NUMERO_INICIATIVA

+ * + *

Regra(s) de negócio: NUMERO_REGRA_DE_NEGOCIO

+ * + * Método responsável por + * + * @author maycon.silva + * + * @param idProcessInstance + * @return + */ + Processo getProcessoByIdProcessInstance(Long idProcessInstance); + + + /** + *

Iniciativa(s): NUMERO_INICIATIVA

+ * + *

Regra(s) de negócio: NUMERO_REGRA_DE_NEGOCIO

+ * + * Método responsável por + * + * @author maycon.silva + * + * @param nup + * @return + */ + Processo getProcessoByProtocolo(String nup); } diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java index ff0b156..7c03b04 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java @@ -83,7 +83,7 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD return this.search(searchSeven); } - + /** * */ @@ -98,25 +98,29 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD criteria.add(Restrictions.eq("id", processo.getId())); criteria.add(Restrictions.ne("unidade.id", processo.getUnidade().getId())); - + Long quantidade = (Long) criteria.uniqueResult(); - - if(quantidade > 0) + + if (quantidade > 0) return Boolean.TRUE; - + return Boolean.FALSE; } - + /** * - *

Iniciativa(s): NUMERO_INICIATIVA

- * - *

Regra(s) de negócio: NUMERO_REGRA_DE_NEGOCIO

- * + *

+ * Iniciativa(s): NUMERO_INICIATIVA + *

+ * + *

+ * Regra(s) de negócio: NUMERO_REGRA_DE_NEGOCIO + *

+ * * Método responsável por - * + * * @author andre.silva - * + * * @param idProcesso * @param data * @return @@ -130,12 +134,39 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD criteria.setProjection(Projections.rowCount()); - criteria.add(Restrictions.between("dataCriacao", dataInicial, dataFinal)); return (Long) criteria.uniqueResult(); } - + /** + * + */ + @Override + public Processo getProcessoByIdProcessInstance(Long idProcessInstance) { + + SearchSeven search = new SearchSeven(persistentClass); + + search.addFilterEqual("idProcessInstance", idProcessInstance); + + search(search, Processo.class); + + return searchUnique(search); + } + + /** + * + */ + @Override + public Processo getProcessoByProtocolo(String nup) { + + SearchSeven search = new SearchSeven(persistentClass); + + search.addFilterEqual("nup", nup); + + search(search, Processo.class); + + return searchUnique(search); + } } diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java index e0f43a6..d5d073f 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java @@ -136,6 +136,7 @@ public class Processo extends PersistentObjectUnidade { private String tipoAssunto; /** Atributo idProcessInstance. */ + @JsonView({ Views.ProcessoList.class }) private Long idProcessInstance; /** Atributo nivelAcesso. */ diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/ProcessoService.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/ProcessoService.java index f8ebe10..62bfbf6 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/ProcessoService.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/ProcessoService.java @@ -4,6 +4,26 @@ import br.com.centralit.api.model.PlanoClassificacao; import br.com.centralit.api.model.Processo; import br.com.centralit.framework.service.arquitetura.GenericService; +/** + *

+ * + *

Company: Central IT - Governança Corporativa -

+ * + *

Title:

+ * + *

Description:

+ * + *

Iniciativa(s): NUMERO_INICIATIVA

+ * + *

Regra(s) de negócio: NUMERO_REGRA_DE_NEGOCIO

+ * + * @since 28/03/2016 - 09:15:34 + * + * @version 1.0.0 + * + * @author maycon.silva + * + */ public interface ProcessoService extends GenericService { /** @@ -94,6 +114,35 @@ public interface ProcessoService extends GenericService { */ Processo atualizarSigiloProcesso(Processo entity); + + /** + *

Iniciativa(s): NUMERO_INICIATIVA

+ * + *

Regra(s) de negócio: NUMERO_REGRA_DE_NEGOCIO

+ * + * Método responsável por devolver o processoSigad passando como parametro o id da instancia do BPE + * + * @author maycon.silva + * + * @param idProcessInstance + * @return + */ + Processo getProcessoByIdProcessInstance(Long idProcessInstance); + + /** + *

Iniciativa(s): NUMERO_INICIATIVA

+ * + *

Regra(s) de negócio: NUMERO_REGRA_DE_NEGOCIO

+ * + * Método responsável por + * + * @author maycon.silva + * + * @param nup + * @return + */ + Processo getProcessoByProtocolo(String nup); + diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java index ec73803..0bf06e5 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java @@ -36,6 +36,7 @@ import br.com.centralit.api.service.TemporalidadeService; import br.com.centralit.api.service.UnidadeProcessoService; import br.com.centralit.api.service.UnidadeService; import br.com.centralit.framework.esi.enumerated.VariableTypeEnum; +import br.com.centralit.framework.esi.environment.EnvironmentOutput; import br.com.centralit.framework.esi.environment.EnvironmentVariable; import br.com.centralit.framework.exception.BusinessException; import br.com.centralit.framework.exception.CodigoErro; @@ -287,7 +288,10 @@ public class ProcessoServiceImpl extends GenericServiceImpl impl throw new BusinessException("ECM.VALIDACAO.ERRO_VINCULO_FLUXO_BPE_ESI", CodigoErro.REGRA_NEGOCIO.getValue()); } - this.startBusinessProcess(processo.getTipoProcesso().getProcessoNegocio(), variaveis); + EnvironmentOutput environmentOutput = this.startBusinessProcess(processo.getTipoProcesso().getProcessoNegocio(), variaveis); + + processo.setIdProcessInstance(environmentOutput.getProcessInstanceId()); + } /** @@ -885,4 +889,25 @@ public class ProcessoServiceImpl extends GenericServiceImpl impl } } } + + /** + * + */ + @Override + public Processo getProcessoByIdProcessInstance(Long idProcessInstance) { + + // TODO Auto-generated method stub + return this.processoDao.getProcessoByIdProcessInstance(idProcessInstance); + } + + @Override + public Processo getProcessoByProtocolo(String nup) { + + // TODO Auto-generated method stub + return this.processoDao.getProcessoByProtocolo(nup); + } + + + + } diff --git a/cit-ecm-web/src/main/java/br/com/centralit/controller/ProcessoController.java b/cit-ecm-web/src/main/java/br/com/centralit/controller/ProcessoController.java index 60f3218..9e4d8c1 100644 --- a/cit-ecm-web/src/main/java/br/com/centralit/controller/ProcessoController.java +++ b/cit-ecm-web/src/main/java/br/com/centralit/controller/ProcessoController.java @@ -55,6 +55,25 @@ public class ProcessoController extends GenericController { return responseBody; } + + @RequestMapping(method = RequestMethod.GET, value = "/getProcessoByIdProcessInstance") + @ResponseBody + public ResponseBodyWrapper getProcessoByIdProcessInstance(@RequestParam(value = "idProcessInstance") Long idProcessInstance) { + + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.processoService.getProcessoByIdProcessInstance(idProcessInstance), this.getListView()); + + return responseBody; + } + + @RequestMapping(method = RequestMethod.GET, value = "/getProcessoByProtocolo") + @ResponseBody + public ResponseBodyWrapper getProcessoByProtocolo(@RequestParam(value = "nup") String nup) { + + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.processoService.getProcessoByProtocolo(nup), this.getListView()); + + return responseBody; + } + @Override public Class getEditView() { diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/ProcessoRepository.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/ProcessoRepository.js index 926b2f4..de4b565 100644 --- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/ProcessoRepository.js +++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/ProcessoRepository.js @@ -12,6 +12,14 @@ citApp.factory('ProcessoRepository', ['RestangularEcm', 'AbstractRepository', fu this.concluir = function(paramsGet) { return restangularEcm.one(this.route + "/concluir").get(paramsGet); }; + + this.getProcessoByIdProcessInstance = function (idProcessInstance){ + return restangularEcm.one(this.route + '/getProcessoByIdProcessInstance').get({"idProcessInstance": idProcessInstance}).then(); + }; + + this.getProcessoByProtocolo = function (nup){ + return restangularEcm.one(this.route + '/getProcessoByProtocolo').get({"nup": nup}).then(); + }; } AbstractRepository.extend(ProcessoRepository); diff --git a/cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html b/cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html index b9e829a..9110821 100644 --- a/cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html +++ b/cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html @@ -35,6 +35,16 @@ + +
+ +
+ +
+ +
@@ -50,15 +60,7 @@
-
- -
- -
-
-- libgit2 0.21.2