TP- Ajusta querys que pega numero maximo de requisição ou de missão

projeto-siga · May 29, 2024 · 8bf0f8d · 8bf0f8d
1 parent 988f852
commit 8bf0f8d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/sigatp/src/main/java/br/gov/jfrj/siga/tp/model/Missao.java b/sigatp/src/main/java/br/gov/jfrj/siga/tp/model/Missao.java
@@ -228,19 +228,15 @@ public String getSequence() {
 	public void setSequence(Object cpOrgaoUsuarioObject) {
 		CpOrgaoUsuario cpOrgaoUsuarioObj = (CpOrgaoUsuario) cpOrgaoUsuarioObject;
 		int year = Calendar.getInstance().get(Calendar.YEAR);
-		String qrl = "SELECT m FROM Missao m where m.numero = ";
-		qrl = qrl + "(SELECT MAX(t.numero) FROM Missao t";
+		String qrl = "select max(t.numero) from Missao t";
 		qrl = qrl + " where cpOrgaoUsuario.id = " + cpOrgaoUsuarioObj.getId();
 		qrl = qrl + " and YEAR(dataHora) = " + year;
-		qrl = qrl + " and m.cpOrgaoUsuario.id = t.cpOrgaoUsuario.id";
-		qrl = qrl + " and YEAR(m.dataHora) = YEAR(t.dataHora)";
-		qrl = qrl + ") order by m.numero desc";
 		Query qry = AR.em().createQuery(qrl);
 		try {
-			Object obj = qry.getResultList().get(0);
-			this.numero = ((Missao) obj).numero + 1;
+	        Long i = (Long) qry.getSingleResult();
+	        this.setNumero((i == null ? 0 : i) + 1);
 		} catch (IndexOutOfBoundsException ex) {
-			this.numero = Long.valueOf(1L);
+			this.setNumero(Long.valueOf(1L));
 		}
 	}
 

diff --git a/sigatp/src/main/java/br/gov/jfrj/siga/tp/model/RequisicaoTransporte.java b/sigatp/src/main/java/br/gov/jfrj/siga/tp/model/RequisicaoTransporte.java
@@ -381,20 +381,16 @@ public void setSequence(Object cpOrgaoUsuarioObject) {
         int year = Calendar.getInstance().get(Calendar.YEAR);
 
         StringBuilder query = new StringBuilder();
-        query.append("SELECT req FROM RequisicaoTransporte req WHERE req.id = ");
-        query.append("(SELECT MAX(r.id) FROM RequisicaoTransporte r WHERE r.numero = ");
-        query.append("(SELECT MAX(rt.numero) FROM RequisicaoTransporte rt ");
-        query.append("WHERE cpOrgaoUsuario.id = " + orgaoUsuario.getId());
-        query.append(" AND YEAR(dataHora) = " + year);
-        query.append(" AND r.cpOrgaoUsuario.id = rt.cpOrgaoUsuario.id");
-        query.append(" AND YEAR(r.dataHora) = YEAR(rt.dataHora)))");
+        query.append("select max(req.numero) FROM RequisicaoTransporte req ");
+        query.append("WHERE req.cpOrgaoUsuario.id = " + orgaoUsuario.getId());
+        query.append("AND YEAR(req.dataHora) = " + year);
 
         Query qry = AR.em().createQuery(query.toString());
         try {
-            Object obj = qry.getSingleResult();
-            this.numero = ((RequisicaoTransporte) obj).numero + 1;
+	        Long i = (Long) qry.getSingleResult();
+	        this.setNumero((i == null ? 0 : i) + 1);
         } catch (NoResultException ex) {
-            this.numero = Long.valueOf(1);
+            this.setNumero(Long.valueOf(1));
         }
     }