Browse Source

Last changes

ailton 8 years ago
parent
commit
c6abfc12d5

+ 0 - 1
src/main/java/org/develop/officialjournal/controllers/ProcessController.java

46
 		if(daoProcess == null)
46
 		if(daoProcess == null)
47
 			daoProcess = Database.get().getDaoProcess();
47
 			daoProcess = Database.get().getDaoProcess();
48
 		
48
 		
49
-		System.out.println("DAOPROCESS " +daoProcess);
50
 		DOProcess process = this.daoProcess.getAllInfo(id, LuceneConnector.getSearcherDisk());
49
 		DOProcess process = this.daoProcess.getAllInfo(id, LuceneConnector.getSearcherDisk());
51
 		
50
 		
52
 		return process;
51
 		return process;

+ 2 - 1
src/main/java/org/develop/officialjournal/controllers/SearchController.java

57
 
57
 
58
 		if(daoLawyer.contains(lawyer, LuceneConnector.getSearcherDisk()))
58
 		if(daoLawyer.contains(lawyer, LuceneConnector.getSearcherDisk()))
59
 		{
59
 		{
60
+			
60
 			lawyer = daoLawyer.get(lawyer, LuceneConnector.getSearcherDisk());
61
 			lawyer = daoLawyer.get(lawyer, LuceneConnector.getSearcherDisk());
61
 			return lawyer;
62
 			return lawyer;
62
 		}
63
 		}
77
 	
78
 	
78
 	
79
 	
79
 	@RequestMapping("/search/info")
80
 	@RequestMapping("/search/info")
80
-	public Info getEntityInfo(@RequestParam String type, @RequestParam Integer entityId ) {
81
+	public Info getEntityInfo(@RequestParam String type, @RequestParam Long entityId ) {
81
 				
82
 				
82
 		return daoSearch.getInfo(type, entityId);
83
 		return daoSearch.getInfo(type, entityId);
83
 			
84
 			

+ 0 - 3
src/main/java/org/develop/officialjournal/services/Database.java

1
 package org.develop.officialjournal.services;
1
 package org.develop.officialjournal.services;
2
 
2
 
3
-import java.sql.Connection;
4
-
5
-import dao.connection.Connector;
6
 import dao.lucene.search.DAOSearch;
3
 import dao.lucene.search.DAOSearch;
7
 import dao.lucene.tables.DAOEntity;
4
 import dao.lucene.tables.DAOEntity;
8
 import dao.lucene.tables.DAOJudge;
5
 import dao.lucene.tables.DAOJudge;

+ 1 - 1
src/main/resources/static/index.html

123
 					<td><div >{{process.processType.type}} </div></td>
123
 					<td><div >{{process.processType.type}} </div></td>
124
 					<td >
124
 					<td >
125
 						<md-button class="md-primary md-raised" ng-click="showVerdict(this)"   >
125
 						<md-button class="md-primary md-raised" ng-click="showVerdict(this)"   >
126
-						     {{process.typeVerdict.name}}
126
+						     {{process.typeVerdict}}
127
     					</md-button>
127
     					</md-button>
128
 					</td>
128
 					</td>
129
 					<td >
129
 					<td >