analysis details and edit requested amount

fiterlatam · Oct 5, 2023 · f10a24a · f10a24a
1 parent 6dd6372
commit f10a24a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...neract/organisation/prequalification/service/PrequalificationReadPlatformServiceImpl.java b/...neract/organisation/prequalification/service/PrequalificationReadPlatformServiceImpl.java
@@ -388,7 +388,10 @@ private static final class PrequalificationsGroupMapper implements RowMapper<Gro
                     LEFT JOIN m_group pc ON
                     	pc.id = g.center_id
                     LEFT JOIN m_prequalification_status_log sl ON
-                    	sl.prequalification_id = g.id AND sl.to_status=g.status
+                    	sl.prequalification_id = g.id AND sl.to_status=g.status 
+                    	AND sl.id = 
+                    	(SELECT MAX(id) 
+                    	FROM m_prequalification_status_log WHERE prequalification_id = g.id AND sl.to_status=g.status )
                     LEFT JOIN m_appuser mu ON
                     	mu.id = sl.updatedby_id
                     INNER JOIN m_appuser fa ON

diff --git a/...eract/organisation/prequalification/service/PrequalificationWritePlatformServiceImpl.java b/...eract/organisation/prequalification/service/PrequalificationWritePlatformServiceImpl.java
@@ -665,10 +665,11 @@ public CommandProcessingResult processAnalysisRequest(Long entityId, JsonCommand
                 .findOneWithNotFoundDetection(entityId);
         Integer fromStatus = prequalificationGroup.getStatus();
         PrequalificationStatus prequalificationStatus = resolveStatus(action);
-        if (fromStatus == prequalificationStatus.getValue()) {
+        if (fromStatus.equals(prequalificationStatus.getValue())) {
             throw new PrequalificationStatusNotChangedException(prequalificationStatus.toString());
         }
         prequalificationGroup.updateStatus(prequalificationStatus);
+        prequalificationGroup.updateComments(comments);
         // this.prequalificationGroupRepositoryWrapper.save(prequalificationGroup);
 
         PrequalificationStatusLog statusLog = PrequalificationStatusLog.fromJson(addedBy, fromStatus, prequalificationGroup.getStatus(),