Download as
Browse Code »

Commit 8e9d8b26c223025226f9c1535e4085aaae2bffc2

Authored by fabricio
2 parents 94850642 950045c1
Exists in master

Merge branch 'master' of https://softwarepublico.gov.br:443/gitlab/relatoriocirc… 

…unstanciado/relatoriocircunstanciado.git
Showing 2 changed files with 7 additions and 7 deletions   Show diff stats
src/br/com/controller/QuestionarioController.java
  Diff comments   View file @8e9d8b2
... ... @@ -54,9 +54,9 @@ public class QuestionarioController {
54 54  
55 55 @Path("/salvar-questionario")
56 56 public void questionarioSalvar(String emailDestinoOrgao, UploadedFile file, String noOrgao) {
57   -
58   - String codigoHash = noOrgao + DateUtil.dataHoraAtual().toString().replace("/", "").replace(" ", "").replace(":", "");
59   -
  57 + String[] codigo = emailDestinoOrgao.split("@");
  58 + String codigoHash = codigo[0] + DateUtil.dataHoraAtual().toString().replace("/", "").replace(" ", "").replace(":", "");
  59 + System.out.println(codigoHash);
60 60 Questionario questionario = new Questionario();
61 61 // BufferedReader reader = new BufferedReader(new InputStreamReader(file.getFile()));
62 62  
... ...
src/br/com/controller/formularioOrgaoController.java
  Diff comments   View file @8e9d8b2
... ... @@ -156,7 +156,7 @@ public class formularioOrgaoController {
156 156 }
157 157 if(nomeCampo.equalsIgnoreCase("hPagina24"))
158 158 {
159   - result.include("pagina23", valorCampo);
  159 + result.include("pagina24", valorCampo);
160 160 }
161 161  
162 162 //ambiente 3
... ... @@ -179,7 +179,7 @@ public class formularioOrgaoController {
179 179 }
180 180 if(nomeCampo.equalsIgnoreCase("hPagina34"))
181 181 {
182   - result.include("pagina33", valorCampo);
  182 + result.include("pagina34", valorCampo);
183 183 }
184 184  
185 185 //ambiente 4
... ... @@ -202,7 +202,7 @@ public class formularioOrgaoController {
202 202 }
203 203 if(nomeCampo.equalsIgnoreCase("hPagina44"))
204 204 {
205   - result.include("pagina43", valorCampo);
  205 + result.include("pagina44", valorCampo);
206 206 }
207 207  
208 208  
... ... @@ -226,7 +226,7 @@ public class formularioOrgaoController {
226 226 }
227 227 if(nomeCampo.equalsIgnoreCase("hPagina54"))
228 228 {
229   - result.include("pagina53", valorCampo);
  229 + result.include("pagina54", valorCampo);
230 230 }
231 231 }
232 232  
... ...