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

Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2025-03-17 17:07:09 +01:00
parent afd0ae8fae 985fc1244f
commit 1d00736d7c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -458,13 +458,18 @@ public class ActivityService {
public ActivityTaskDTO insSubactivity(StbActivity stbActivity) throws Exception { public ActivityTaskDTO insSubactivity(StbActivity stbActivity) throws Exception {
try { try {
String whereCond = "";
if (!UtilityString.isNullOrEmpty(stbActivity.getActivityDescription())){
whereCond = " AND stb_activity.activity_description = " + UtilityDB.valueToString(stbActivity.getActivityDescription());
}
String sql = String sql =
Query.format( Query.format(
"SELECT activity_id " + "SELECT activity_id " +
" FROM stb_activity " + " FROM stb_activity " +
" WHERE stb_activity.parent_activity_id = %s AND " + " WHERE stb_activity.parent_activity_id = %s AND " +
"stb_activity.user_name = %s AND " + "stb_activity.user_name = %s AND " +
"( stb_activity.estimated_time = %s OR (stb_activity.effective_date is null AND stb_activity.activity_result_id = 'DA FARE'))", "( stb_activity.estimated_time = %s OR (stb_activity.effective_date is null AND stb_activity.activity_result_id = 'DA FARE'))\n"+
whereCond,
stbActivity.getParentActivityId(), stbActivity.getParentActivityId(),
stbActivity.getUserName(), stbActivity.getUserName(),
stbActivity.getEstimatedTime()); stbActivity.getEstimatedTime());