|
@@ -7,6 +7,9 @@ import java.nio.file.Files;
|
|
|
import java.nio.file.Paths;
|
|
import java.nio.file.Paths;
|
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
+import java.time.LocalDate;
|
|
|
|
|
+import java.time.ZoneId;
|
|
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
import java.util.Calendar;
|
|
import java.util.Calendar;
|
|
@@ -489,6 +492,7 @@ public class AdminController {
|
|
|
@RequestParam(name = "informe[]", required = false) List<Boolean> informe)
|
|
@RequestParam(name = "informe[]", required = false) List<Boolean> informe)
|
|
|
throws NumberFormatException, ParseException {
|
|
throws NumberFormatException, ParseException {
|
|
|
|
|
|
|
|
|
|
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DDMMYYYY);
|
|
|
Proces p = new Proces();
|
|
Proces p = new Proces();
|
|
|
p.setIdProces(Integer.parseInt(params.get("idProces")));
|
|
p.setIdProces(Integer.parseInt(params.get("idProces")));
|
|
|
p.setNomProces(params.get("nomProces"));
|
|
p.setNomProces(params.get("nomProces"));
|
|
@@ -524,7 +528,7 @@ public class AdminController {
|
|
|
nomEvidenciaCas.get(i).equals(".") ? "" : nomEvidenciaCas.get(i).replace("[comma]", ","));
|
|
nomEvidenciaCas.get(i).equals(".") ? "" : nomEvidenciaCas.get(i).replace("[comma]", ","));
|
|
|
t.setNomEvidenciaVal(
|
|
t.setNomEvidenciaVal(
|
|
|
nomEvidenciaVal.get(i).equals(".") ? "" : nomEvidenciaVal.get(i).replace("[comma]", ","));
|
|
nomEvidenciaVal.get(i).equals(".") ? "" : nomEvidenciaVal.get(i).replace("[comma]", ","));
|
|
|
- t.setDataLim(new SimpleDateFormat(DDMMYYYY).parse(dataLimit.get(i)));
|
|
|
|
|
|
|
+ t.setDataLim(LocalDate.parse(dataLimit.get(i), formatter));
|
|
|
t.setTipus(tps.findOne(Integer.parseInt(tipus.get(i))));
|
|
t.setTipus(tps.findOne(Integer.parseInt(tipus.get(i))));
|
|
|
if (t.getTipus().getTipus() == 11 || t.getTipus().getTipus() == 15) {
|
|
if (t.getTipus().getTipus() == 11 || t.getTipus().getTipus() == 15) {
|
|
|
t.setCodiEvidencia(idPlantilla.get(i));
|
|
t.setCodiEvidencia(idPlantilla.get(i));
|
|
@@ -562,6 +566,7 @@ public class AdminController {
|
|
|
@RequestParam(name = "informe[]", required = false) List<Boolean> informe)
|
|
@RequestParam(name = "informe[]", required = false) List<Boolean> informe)
|
|
|
throws NumberFormatException, ParseException {
|
|
throws NumberFormatException, ParseException {
|
|
|
|
|
|
|
|
|
|
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DDMMYYYY);
|
|
|
Proces p = ps.findByID(Integer.parseInt(params.get("idProces")));
|
|
Proces p = ps.findByID(Integer.parseInt(params.get("idProces")));
|
|
|
p.setNomProces(params.get("nomProces"));
|
|
p.setNomProces(params.get("nomProces"));
|
|
|
p.setVersio(params.get("versio"));
|
|
p.setVersio(params.get("versio"));
|
|
@@ -614,7 +619,7 @@ public class AdminController {
|
|
|
nomEvidenciaCas.get(i).equals(".") ? "" : nomEvidenciaCas.get(i).replace("[comma]", ","));
|
|
nomEvidenciaCas.get(i).equals(".") ? "" : nomEvidenciaCas.get(i).replace("[comma]", ","));
|
|
|
t.setNomEvidenciaVal(
|
|
t.setNomEvidenciaVal(
|
|
|
nomEvidenciaVal.get(i).equals(".") ? "" : nomEvidenciaVal.get(i).replace("[comma]", ","));
|
|
nomEvidenciaVal.get(i).equals(".") ? "" : nomEvidenciaVal.get(i).replace("[comma]", ","));
|
|
|
- t.setDataLim(new SimpleDateFormat(DDMMYYYY).parse(dataLimit.get(i)));
|
|
|
|
|
|
|
+ t.setDataLim(LocalDate.parse(dataLimit.get(i), formatter));
|
|
|
t.setTipus(tps.findOne(Integer.parseInt(tipus.get(i))));
|
|
t.setTipus(tps.findOne(Integer.parseInt(tipus.get(i))));
|
|
|
if (t.getTipus().getTipus() == 11 || t.getTipus().getTipus() == 15) {
|
|
if (t.getTipus().getTipus() == 11 || t.getTipus().getTipus() == 15) {
|
|
|
t.setCodiEvidencia(idPlantilla.get(i));
|
|
t.setCodiEvidencia(idPlantilla.get(i));
|
|
@@ -649,7 +654,7 @@ public class AdminController {
|
|
|
UsuarisRol u = urs.findActive(idRol, usuari, lugar, tlugar);
|
|
UsuarisRol u = urs.findActive(idRol, usuari, lugar, tlugar);
|
|
|
if (u != null) {
|
|
if (u != null) {
|
|
|
u.setVigent(false);
|
|
u.setVigent(false);
|
|
|
- u.setFin(Calendar.getInstance().getTime());
|
|
|
|
|
|
|
+ u.setFin(Calendar.getInstance().getTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
|
|
|
urs.save(u);
|
|
urs.save(u);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -703,7 +708,7 @@ public class AdminController {
|
|
|
if (!u.getVigent()) {
|
|
if (!u.getVigent()) {
|
|
|
UsuarisRol r = new UsuarisRol();
|
|
UsuarisRol r = new UsuarisRol();
|
|
|
r.setFin(null);
|
|
r.setFin(null);
|
|
|
- r.setInici(Calendar.getInstance().getTime());
|
|
|
|
|
|
|
+ r.setInici(Calendar.getInstance().getTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
|
|
|
r.setUsuari(u.getUsuari());
|
|
r.setUsuari(u.getUsuari());
|
|
|
r.setOrgan(u.getOrgan());
|
|
r.setOrgan(u.getOrgan());
|
|
|
r.setRol(u.getRol());
|
|
r.setRol(u.getRol());
|
|
@@ -719,7 +724,7 @@ public class AdminController {
|
|
|
} else {
|
|
} else {
|
|
|
UsuarisRol r = new UsuarisRol();
|
|
UsuarisRol r = new UsuarisRol();
|
|
|
r.setFin(null);
|
|
r.setFin(null);
|
|
|
- r.setInici(Calendar.getInstance().getTime());
|
|
|
|
|
|
|
+ r.setInici(Calendar.getInstance().getTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
|
|
|
r.setUsuari(us.findByUsername(usuari));
|
|
r.setUsuari(us.findByUsername(usuari));
|
|
|
r.setOrgan(os.findByID(tlugar, lugar));
|
|
r.setOrgan(os.findByID(tlugar, lugar));
|
|
|
r.setRol(rs.findOne(idRol));
|
|
r.setRol(rs.findOne(idRol));
|
|
@@ -739,7 +744,7 @@ public class AdminController {
|
|
|
if (!u.getVigent()) {
|
|
if (!u.getVigent()) {
|
|
|
UsuarisRol r = new UsuarisRol();
|
|
UsuarisRol r = new UsuarisRol();
|
|
|
r.setFin(null);
|
|
r.setFin(null);
|
|
|
- r.setInici(Calendar.getInstance().getTime());
|
|
|
|
|
|
|
+ r.setInici(Calendar.getInstance().getTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
|
|
|
r.setUsuari(u.getUsuari());
|
|
r.setUsuari(u.getUsuari());
|
|
|
r.setOrgan(u.getOrgan());
|
|
r.setOrgan(u.getOrgan());
|
|
|
r.setRol(u.getRol());
|
|
r.setRol(u.getRol());
|
|
@@ -755,7 +760,7 @@ public class AdminController {
|
|
|
} else {
|
|
} else {
|
|
|
UsuarisRol r = new UsuarisRol();
|
|
UsuarisRol r = new UsuarisRol();
|
|
|
r.setFin(null);
|
|
r.setFin(null);
|
|
|
- r.setInici(Calendar.getInstance().getTime());
|
|
|
|
|
|
|
+ r.setInici(Calendar.getInstance().getTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
|
|
|
r.setUsuari(us.findByUsername(usuari));
|
|
r.setUsuari(us.findByUsername(usuari));
|
|
|
r.setOrgan(os.findByID(tlugar, idTitulacio));
|
|
r.setOrgan(os.findByID(tlugar, idTitulacio));
|
|
|
r.setRol(rs.findOne(idRol));
|
|
r.setRol(rs.findOne(idRol));
|
|
@@ -880,10 +885,10 @@ public class AdminController {
|
|
|
a.setGrupCurs(grupCurs);
|
|
a.setGrupCurs(grupCurs);
|
|
|
a.setGrupNum(grupNum);
|
|
a.setGrupNum(grupNum);
|
|
|
a.setGrup(acreditaGroups.get(grupNum));
|
|
a.setGrup(acreditaGroups.get(grupNum));
|
|
|
- a.setDataAcred(new SimpleDateFormat(DDMMYYYY).parse(dataAcred));
|
|
|
|
|
- a.setDataRenov(new SimpleDateFormat(DDMMYYYY).parse(dataRenov));
|
|
|
|
|
- a.setDataSegui(new SimpleDateFormat(DDMMYYYY).parse(dataSegui));
|
|
|
|
|
- a.setDataVerif(new SimpleDateFormat(DDMMYYYY).parse(dataVerif));
|
|
|
|
|
|
|
+ a.setDataAcred(new SimpleDateFormat(DDMMYYYY).parse(dataAcred).toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
|
|
|
|
|
+ a.setDataRenov(new SimpleDateFormat(DDMMYYYY).parse(dataRenov).toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
|
|
|
|
|
+ a.setDataSegui(new SimpleDateFormat(DDMMYYYY).parse(dataSegui).toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
|
|
|
|
|
+ a.setDataVerif(new SimpleDateFormat(DDMMYYYY).parse(dataVerif).toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
|
|
|
a.setCursImpla(cursImpla);
|
|
a.setCursImpla(cursImpla);
|
|
|
a.setRecom(recom);
|
|
a.setRecom(recom);
|
|
|
a.setSegui(segui);
|
|
a.setSegui(segui);
|