From 7b3fd1e8e37996a0a401a109e81386567fdcc86e Mon Sep 17 00:00:00 2001 From: "funcha.ahamadi" Date: Thu, 21 Oct 2021 16:54:04 +0200 Subject: [PATCH] Merge origin/master Conflicts: src/java/bdd/PompierMySql.java src/java/com/test/servlets/authentifServlet.java web/WEB-INF/CreaPompier.jsp --- src/java/bdd/PompierMySql.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/java/bdd/PompierMySql.java b/src/java/bdd/PompierMySql.java index bb7217d..bf610bd 100644 --- a/src/java/bdd/PompierMySql.java +++ b/src/java/bdd/PompierMySql.java @@ -101,14 +101,18 @@ public class PompierMySql { stmt.setString(2, p.getNom()); stmt.setString(3, p.getPrenom()); stmt.setInt(4, p.getStatut()); - stmt.setString(5, p.getMail()); - stmt.setString(6, p.getLogin()); - stmt.setString(7, p.getMdp()); - stmt.setInt(8, p.getAdrNo()); - stmt.setString(9, p.getAdrRue()); - stmt.setString(10, p.getAdrCP()); - stmt.setString(11, p.getAdrVille()); - stmt.setInt(12, p.getGrade()); + stmt.setInt(5, p.getTypePers()); + stmt.setString(6, p.getMail()); + stmt.setString(7, p.getLogin()); + stmt.setString(8, p.getMdp()); + stmt.setString(9, p.getAdresse()); + stmt.setString(10, p.getCp()); + stmt.setString(11, p.getVille()); + stmt.setInt(12, p.getBip()); + stmt.setInt(13, p.getNbGardes()); + stmt.setInt(14, p.getGrade()); + stmt.setString(15, p.getCommentaire()); + stmt.setInt(16, p.getIdEmployeur()); System.out.println("Requête : " + stmt.toString()); int status = stmt.executeUpdate();