Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Aggiunto scelta tipo attività in pianificazione

Browse Source
This commit is contained in:
Marco Elefante
2024-03-22 15:10:00 +01:00
parent 42d6867be5
commit 354a1b8503
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ems-engine/src/main/java/it/integry/ems/activity/dto/PlanActivityDTO.java
View File

@@ -11,6 +11,7 @@ public class PlanActivityDTO {
@JsonProperty("creaAttivita") @JsonProperty("creaAttivita")
private String creaAttivita; private String creaAttivita;
private String description; private String description;
private String activityTypeId;
private List<User> users; private List<User> users;
private List<Agenda> agenda; private List<Agenda> agenda;
@@ -55,6 +56,15 @@ public class PlanActivityDTO {
this.creaAttivita = creaAttivita; this.creaAttivita = creaAttivita;
} }
public String getActivityTypeId() {
return activityTypeId;
}
public PlanActivityDTO setActivityTypeId(String activityTypeId) {
this.activityTypeId = activityTypeId;
return this;
}
public static class User { public static class User {
@JsonProperty("user_name") @JsonProperty("user_name")

16
ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java
View File

@@ -578,13 +578,15 @@ public class ActivityService {
Map<String, Object> dati = UtilityDB.executeSimpleQueryOnlyFirstRow(multiDBTransactionManager.getPrimaryConnection(), query); Map<String, Object> dati = UtilityDB.executeSimpleQueryOnlyFirstRow(multiDBTransactionManager.getPrimaryConnection(), query);
String activityTypeId = null; String activityTypeId = planActivityDTO.getActivityTypeId();
if (((Integer) dati.get("conta")).intValue() == 1) { if(activityTypeId == null){
activityTypeId = (String) dati.get("activity_type_id_next"); if (((Integer) dati.get("conta")).intValue() == 1) {
} else if ("OBIETTIVO".equalsIgnoreCase(parentStbActivity.getActivityTypeId())) { activityTypeId = (String) dati.get("activity_type_id_next");
activityTypeId = "PROGRAMMAZIONE"; } else if ("OBIETTIVO".equalsIgnoreCase(parentStbActivity.getActivityTypeId())) {
} else if ("TICKET".equalsIgnoreCase(parentStbActivity.getActivityTypeId())) { activityTypeId = "PROGRAMMAZIONE";
activityTypeId = "TEST,CORREZIONI"; } else if ("TICKET".equalsIgnoreCase(parentStbActivity.getActivityTypeId())) {
activityTypeId = "TEST,CORREZIONI";
}
} }
String description = planActivityDTO.getDescription(); String description = planActivityDTO.getDescription();