Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop to main #72

Merged
merged 2 commits into from
Oct 24, 2024
Merged

Develop to main #72

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
722f658
FEAT ITEM-297-changement-de-rcr-en-retournant-a-letape-1-du-stepper-e…
EryneKL Oct 23, 2024
6b12a40
Merge pull request #69
jvk88511334 Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions web/src/main/java/fr/abes/item/web/DemandeRestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import fr.abes.item.core.constant.TYPE_DEMANDE;
import fr.abes.item.core.constant.TYPE_SUPPRESSION;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.entities.item.EtatDemande;
import fr.abes.item.core.entities.item.LigneFichier;
import fr.abes.item.core.exception.*;
import fr.abes.item.core.service.IDemandeService;
Expand Down Expand Up @@ -126,6 +127,7 @@ public DemandeWebDto modifDemande(@PathVariable("type") TYPE_DEMANDE type, @Path
if (rcr.isPresent()) {
demande.setRcr(rcr.get());
service.modifierShortNameDemande(demande);
demande.setEtatDemande(new EtatDemande(Constant.ETATDEM_PREPARATION)); // permet de remettre l'état de la demande à 1 (en préparation) lorsque le RCR est modifié
return builder.buildDemandeDto(service.save(demande), type);
}
if (type.equals(TYPE_DEMANDE.EXEMP) && typeExemp.isPresent()) {
Expand Down
Loading