Fix/handel approval status of mt

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.iemr.common.flw</groupId>
     <artifactId>flw-api</artifactId>
-    <version>3.8.2</version>
+    <version>3.10.0</version>
     <packaging>war</packaging>
 
     <name>FLW-API</name>

src/main/java/com/iemr/flw/domain/iemr/IncentiveActivity.java

@@ -65,9 +65,4 @@ public class IncentiveActivity {
 
 
 
-
-    @Column(name = "state_activity_code")
-    private Integer stateActivityCode;
-
-
 }

src/main/java/com/iemr/flw/masterEnum/IncentiveApprovalStatus.java

@@ -5,7 +5,8 @@ public enum IncentiveApprovalStatus {
     VERIFIED(101, "Verified"),
     PENDING(102, "Pending"),
     REJECTED(103, "Rejected"),
-    OVERDUE(104, "Overdue");
+    OVERDUE(104, "Overdue"),
+    APPROVED(105, "Approved");
 
     private final int code;
     private final String label;

src/main/java/com/iemr/flw/repo/iemr/AshaSupervisorLoginRepo.java

@@ -55,6 +55,70 @@ List<Object[]> getAshasAtFacility(
 			@Param("endDate") Timestamp endDate);
 
 
+	@Query(value = "SELECT DISTINCT asm.ashaUserID, u.FirstName, u.LastName, "
+			+ "COALESCE(u.AgentID,'') AS agentID, "
+			+ "COALESCE(u.EmergencyContactNo,'') AS mobile, "
+			+ "COALESCE(g.GenderName,'') AS gender "
+			+ "FROM asha_supervisor_mapping asm "
+			+ "JOIN m_User u ON u.UserID = asm.ashaUserID "
+			+ "AND u.Deleted = false "
+			+ "LEFT JOIN m_gender g ON g.GenderID = u.GenderID "
+			+ "JOIN incentive_activity_record iar "
+			+ "ON iar.asha_id = asm.ashaUserID "
+			+ "WHERE asm.supervisorUserID = :supervisorUserID "
+			+ "AND asm.facilityID = :facilityID "
+			+ "AND asm.deleted = false "
+			+ "AND iar.is_claimed = true "
+			+ "AND iar.start_date >= :startDate "
+			+ "AND iar.end_date < :endDate "
+			+ "AND ("
+			+ "    :approvalStatus = 0 "
+			+ " OR (:approvalStatus = 105 AND iar.approval_status IN (101,105)) "
+			+ " OR (:approvalStatus = 106 AND iar.approval_status = 102) "
+			+ " OR (:approvalStatus NOT IN (105,106) AND iar.approval_status = :approvalStatus)"
+			+ ")",
+			nativeQuery = true)
+	List<Object[]> getAshasAtFacilityCg(
+			@Param("supervisorUserID") Integer supervisorUserID,
+			@Param("facilityID") Integer facilityID,
+			@Param("approvalStatus") Integer approvalStatus,
+			@Param("startDate") Timestamp startDate,
+			@Param("endDate") Timestamp endDate);
+
+
+	@Query(value = "SELECT DISTINCT asm.ashaUserID, u.FirstName, u.LastName, "
+			+ "COALESCE(u.AgentID,'') AS agentID, "
+			+ "COALESCE(u.EmergencyContactNo,'') AS mobile, "
+			+ "COALESCE(g.GenderName,'') AS gender "
+			+ "FROM asha_supervisor_mapping asm "
+			+ "JOIN m_User u ON u.UserID = asm.ashaUserID "
+			+ "AND u.Deleted = false "
+			+ "LEFT JOIN m_gender g ON g.GenderID = u.GenderID "
+			+ "JOIN incentive_activity_record iar "
+			+ "ON iar.asha_id = asm.ashaUserID "
+			+ "WHERE asm.supervisorUserID = :supervisorUserID "
+			+ "AND asm.deleted = false "
+			+ "AND ("
+			+ "     (:approvalStatus = 106 AND (iar.is_claimed = false OR iar.is_claimed IS NULL)) "
+			+ "  OR (:approvalStatus <> 106 AND iar.is_claimed = true)"
+			+ ") "
+			+ "AND iar.start_date >= :startDate "
+			+ "AND iar.end_date < :endDate "
+			+ "AND ("
+			+ "    :approvalStatus = 0 "
+			+ " OR (:approvalStatus = 105 AND iar.approval_status IN (101,105)) "
+			+ " OR (:approvalStatus = 106 AND iar.approval_status = 102) "
+			+ " OR (:approvalStatus NOT IN (105,106) AND iar.approval_status = :approvalStatus)"
+			+ ")",
+			nativeQuery = true)
+	List<Object[]> getAshasAtFacilityCg(
+			@Param("supervisorUserID") Integer supervisorUserID,
+			@Param("approvalStatus") Integer approvalStatus,
+			@Param("startDate") Timestamp startDate,
+			@Param("endDate") Timestamp endDate);
+
+
+
 	@Query(value = "SELECT DISTINCT asm.ashaUserID, "
 			+ "u.FirstName, "
 			+ "u.LastName, "

src/main/java/com/iemr/flw/repo/iemr/IncentiveRecordRepo.java

@@ -72,7 +72,7 @@ IncentiveActivityRecord findRecordByActivityIdCreatedDateBenId(
             "SUM(CASE WHEN record.approvalStatus = 101 THEN 1 ELSE 0 END), " +
             "SUM(CASE WHEN record.approvalStatus = 102 THEN 1 ELSE 0 END), " +
             "SUM(CASE WHEN record.approvalStatus = 103 THEN 1 ELSE 0 END), " +
-            "SUM(CASE WHEN record.approvalStatus = 104 THEN 1 ELSE 0 END) " +
+            "SUM(CASE WHEN record.approvalStatus = 105 THEN 1 ELSE 0 END) " +
             "FROM IncentiveActivityRecord record " +
             "WHERE record.ashaId = :ashaId " +
             "AND record.isClaimed = true " +
@@ -88,19 +88,54 @@ List<Object[]> getStatusCountByAshaId(
             "SUM(CASE WHEN record.approvalStatus = 101 THEN 1 ELSE 0 END), " +
             "SUM(CASE WHEN record.approvalStatus = 102 THEN 1 ELSE 0 END), " +
             "SUM(CASE WHEN record.approvalStatus = 103 THEN 1 ELSE 0 END), " +
-            "SUM(CASE WHEN record.approvalStatus = 104 THEN 1 ELSE 0 END) " +
+            "SUM(CASE WHEN record.approvalStatus IN (102,105) THEN 1 ELSE 0 END) " +
             "FROM IncentiveActivityRecord record " +
             "WHERE record.ashaId = :ashaId " +
             "AND record.isClaimed = true " +
-            "AND record.isDefaultActivity = true " +
             "AND record.createdDate >= :startDate " +
             "AND record.createdDate < :endDate")
+    List<Object[]> getStatusCountByAshaIdANM(
+            @Param("ashaId") Integer ashaId,
+            @Param("startDate") Timestamp startDate,
+            @Param("endDate") Timestamp endDate);
+
+    @Query("""
+SELECT
+    SUM(CASE WHEN record.approvalStatus = 101 THEN 1 ELSE 0 END),
+    SUM(CASE WHEN record.approvalStatus = 102 THEN 1 ELSE 0 END),
+    SUM(CASE WHEN record.approvalStatus = 103 THEN 1 ELSE 0 END),
+    SUM(CASE WHEN record.approvalStatus IN (101,105) THEN 1 ELSE 0 END)
+FROM IncentiveActivityRecord record
+WHERE record.ashaId = :ashaId
+AND record.isClaimed = true
+AND record.isDefaultActivity = true
+AND record.createdDate >= :startDate
+AND record.createdDate < :endDate
+""")
     List<Object[]> getStatusCountByAshaIdOfDefaultActivity(
             @Param("ashaId") Integer ashaId,
             @Param("startDate") Timestamp startDate,
             @Param("endDate") Timestamp endDate);
 
 
+    @Query("""
+SELECT
+    SUM(CASE WHEN record.approvalStatus = 101 THEN 1 ELSE 0 END),
+    SUM(CASE WHEN record.approvalStatus = 102 THEN 1 ELSE 0 END),
+    SUM(CASE WHEN record.approvalStatus = 103 THEN 1 ELSE 0 END),
+    SUM(CASE WHEN record.approvalStatus IN (101,105) THEN 1 ELSE 0 END)
+FROM IncentiveActivityRecord record
+WHERE record.ashaId = :ashaId
+AND record.isClaimed = false
+AND record.createdDate >= :startDate
+AND record.createdDate < :endDate
+""")
+    List<Object[]> getStatusUnclaimedCountByAshaId(
+            @Param("ashaId") Integer ashaId,
+            @Param("startDate") Timestamp startDate,
+            @Param("endDate") Timestamp endDate);
+
+
 
     @Query("SELECT COALESCE(SUM(record.amount), 0) " +
             "FROM IncentiveActivityRecord record " +
@@ -118,6 +153,66 @@ Long getTotalAmountByAsha(
             @Param("approvalStatus") Integer approvalStatus,
             @Param("stateCode") Integer stateCode);
 
+
+    @Query("""
+    SELECT COALESCE(SUM(record.amount), 0)
+    FROM IncentiveActivityRecord record
+    JOIN IncentiveActivity master ON record.activityId = master.id
+    WHERE record.ashaId = :ashaId
+      AND master.state = :stateCode
+      AND record.isClaimed = true
+      AND record.startDate >= :fromDate
+      AND record.endDate <= :toDate
+      AND (
+            :approvalStatus = 0
+            OR (
+                :approvalStatus = 102
+                AND record.approvalStatus IN (102, 105)
+            )
+            OR (
+                :approvalStatus <> 102
+                AND record.approvalStatus = :approvalStatus
+            )
+      )
+""")
+    Long getTotalAmountByAshaANM(
+            @Param("ashaId") Integer ashaId,
+            @Param("fromDate") Timestamp fromDate,
+            @Param("toDate") Timestamp toDate,
+            @Param("approvalStatus") Integer approvalStatus,
+            @Param("stateCode") Integer stateCode
+    );
+
+    @Query("""
+    SELECT COALESCE(SUM(record.amount), 0)
+    FROM IncentiveActivityRecord record
+    JOIN IncentiveActivity master ON record.activityId = master.id
+    WHERE record.ashaId = :ashaId
+      AND master.state = :stateCode
+      AND record.isClaimed = true
+      AND record.isDefaultActivity = false
+      AND record.startDate >= :fromDate
+      AND record.endDate <= :toDate
+      AND (
+            :approvalStatus = 0
+            OR (
+                :approvalStatus = 102
+                AND record.approvalStatus IN (102, 105)
+            )
+            OR (
+                :approvalStatus <> 102
+                AND record.approvalStatus = :approvalStatus
+            )
+      )
+""")
+    Long getTotalAmountByAshaANMbeforeClaimedHour(
+            @Param("ashaId") Integer ashaId,
+            @Param("fromDate") Timestamp fromDate,
+            @Param("toDate") Timestamp toDate,
+            @Param("approvalStatus") Integer approvalStatus,
+            @Param("stateCode") Integer stateCode
+    );
+
     @Query("SELECT COALESCE(SUM(record.amount), 0) " +
             "FROM IncentiveActivityRecord record " +
             "JOIN IncentiveActivity master ON record.activityId = master.id " +
@@ -127,7 +222,11 @@ Long getTotalAmountByAsha(
             "AND record.isDefaultActivity = true " +
             "AND record.startDate >= :fromDate " +
             "AND record.endDate <= :toDate " +
-            "AND (:approvalStatus = 0 OR record.approvalStatus = :approvalStatus)")
+            "AND (" +
+            "     :approvalStatus = 0 " +
+            "     OR (:approvalStatus = 101 AND record.approvalStatus IN (101,105)) " +
+            "     OR (:approvalStatus <> 101 AND record.approvalStatus = :approvalStatus)" +
+            ")")
     Long getDefaultActivityTotalAmountByAsha(
             @Param("ashaId") Integer ashaId,
             @Param("fromDate") Timestamp fromDate,
@@ -188,31 +287,11 @@ int updateApprovalStatusByAshaAndDateRange(
 UPDATE IncentiveActivityRecord iar
 SET
     iar.approvalStatus = :approvalStatus,
-
-    iar.verifiedByUserId =
-        CASE
-            WHEN iar.isDefaultActivity = false
-            THEN :ashaSupervisorUserId
-            ELSE iar.verifiedByUserId
-        END,
-
-    iar.verifiedByUserName =
-        CASE
-            WHEN iar.isDefaultActivity = false
-            THEN :ashaSupervisorUserName
-            ELSE iar.verifiedByUserName
-        END,
-
-    iar.approvalDate =
-        CASE
-            WHEN iar.isDefaultActivity = false
-            THEN :approvalDate
-            ELSE iar.approvalDate
-        END,
-
+    iar.verifiedByUserId = :ashaSupervisorUserId,
+    iar.verifiedByUserName = :ashaSupervisorUserName,
+    iar.approvalDate = :approvalDate,
     iar.reason = NULL,
     iar.otherReason = NULL
-
 WHERE iar.ashaId = :ashaId
 AND iar.isClaimed = true
 AND iar.createdDate >= :startDate
@@ -238,9 +317,11 @@ int updateApprovalStatusByAshaAndDateRangeForDefaultActivity(
             + "iar.otherReason = :otherReason, "
             + "iar.approvalDate = :approvalDate, "
             + "iar.verifiedByUserName = :ashaSupervisorUserName "
-            + "WHERE iar.isClaimed = true")
+            + "WHERE iar.isClaimed = true "
+            + "AND iar.ashaId = :ashaId")
     int updateApprovalStatusById(
             @Param("status") Integer status,
+            @Param("ashaId") Integer ashaId,
             @Param("ashaSupervisorUserId") Integer ashaSupervisorUserId,
             @Param("ashaSupervisorUserName") String ashaSupervisorUserName,
             @Param("reason") String reason,

src/main/java/com/iemr/flw/repo/iemr/SupervisorDashboardRepo.java

@@ -80,6 +80,19 @@ List<Object[]> getUnclaimedCountByAshaIds(
 			@Param("startDate") Timestamp startDate,
 			@Param("endDate") Timestamp endDate);
 
+
+	@Query(value = "SELECT COUNT(*) " +
+			"FROM incentive_activity_record iar " +
+			"WHERE iar.asha_id = :ashaId " +
+			"AND iar.created_date >= :startDate " +
+			"AND iar.created_date < :endDate " +
+			"AND (iar.is_claimed = false OR iar.is_claimed IS NULL)",
+			nativeQuery = true)
+	Long getUnclaimedCountByAshaId(
+			@Param("ashaId") Integer ashaId,
+			@Param("startDate") Timestamp startDate,
+			@Param("endDate") Timestamp endDate);
+
 	// Get facility details with geo names
 	@Query(value = "SELECT DISTINCT f.FacilityID, f.FacilityName, "
 			+ "COALESCE(s.StateName,'') AS stateName, "
@@ -107,7 +120,8 @@ List<Object[]> getUnclaimedCountByAshaIds(
 			+ "COUNT(*) AS totalRecords, "
 			+ "SUM(CASE WHEN iar.approval_status = 101 THEN 1 ELSE 0 END) AS verified, "
 			+ "SUM(CASE WHEN iar.approval_status = 103 THEN 1 ELSE 0 END) AS rejected, "
-			+ "SUM(CASE WHEN iar.approval_status = 102 THEN 1 ELSE 0 END) AS pending "
+			+ "SUM(CASE WHEN iar.approval_status = 102 THEN 1 ELSE 0 END) AS pending, "
+			+ "SUM(CASE WHEN iar.approval_status IN (101, 105) THEN 1 ELSE 0 END) AS approved "
 			+ "FROM incentive_activity_record iar "
 			+ "WHERE iar.asha_id IN (:ashaIds) "
 			+ "AND iar.created_date >= :startDate "
@@ -120,11 +134,32 @@ List<Object[]> getIncentiveStatusByAshaIds(
 			@Param("startDate") Timestamp startDate,
 			@Param("endDate") Timestamp endDate);
 
+
+
+	@Query(value = "SELECT iar.asha_id, "
+			+ "COUNT(*) AS totalRecords, "
+			+ "SUM(CASE WHEN iar.approval_status = 101 THEN 1 ELSE 0 END) AS verified, "
+			+ "SUM(CASE WHEN iar.approval_status = 103 THEN 1 ELSE 0 END) AS rejected, "
+			+ "SUM(CASE WHEN iar.approval_status = 102 THEN 1 ELSE 0 END) AS pending, "
+			+ "SUM(CASE WHEN iar.approval_status IN (102,105) THEN 1 ELSE 0 END) AS approved "
+			+ "FROM incentive_activity_record iar "
+			+ "WHERE iar.asha_id IN (:ashaIds) "
+			+ "AND iar.created_date >= :startDate "
+			+ "AND iar.is_claimed = true "
+			+ "AND iar.created_date < :endDate "
+			+ "GROUP BY iar.asha_id",
+			nativeQuery = true)
+	List<Object[]> getIncentiveStatusByAshaIdsForAnm(
+			@Param("ashaIds") List<Integer> ashaIds,
+			@Param("startDate") Timestamp startDate,
+			@Param("endDate") Timestamp endDate);
+
 	@Query(value = "SELECT iar.asha_id, "
 			+ "COUNT(*) AS totalRecords, "
 			+ "SUM(CASE WHEN iar.approval_status = 101 THEN 1 ELSE 0 END) AS verified, "
 			+ "SUM(CASE WHEN iar.approval_status = 103 THEN 1 ELSE 0 END) AS rejected, "
-			+ "SUM(CASE WHEN iar.approval_status = 102 THEN 1 ELSE 0 END) AS pending "
+			+ "SUM(CASE WHEN iar.approval_status = 102 THEN 1 ELSE 0 END) AS pending, "
+			+ "SUM(CASE WHEN iar.approval_status IN (101, 105) THEN 1 ELSE 0 END) AS approved "
 			+ "FROM incentive_activity_record iar "
 			+ "WHERE iar.asha_id IN (:ashaIds) "
 			+ "AND iar.created_date >= :startDate "

src/main/java/com/iemr/flw/service/impl/ChildCareServiceImpl.java

@@ -709,7 +709,8 @@ public List<IfaDistribution> saveAllIfa(List<IfaDistributionDTO> dtoList, Intege
         savedList.forEach(data -> {
             Timestamp visitTimestamp =
                     Timestamp.valueOf(data.getIfaProvisionDate().atStartOfDay());
-            if(data.getIfaBottleCount().equals("10.0")){
+
+            if(data!=null){
                 incentiveLogicService.incentiveForGiveingIFA(
                         data.getBeneficiaryId(),
                         visitTimestamp,
@@ -774,8 +775,10 @@ private IfaDistributionDTO mapToDTO(IfaDistribution entity) {
             fields.setIfa_provision_date(entity.getIfaProvisionDate().format(FORMATTER));
         }
         fields.setMcp_card_upload(entity.getMcpCardUpload());
-        fields.setIfa_bottle_count(Double.valueOf(entity.getIfaBottleCount()));
+        if(entity.getIfaBottleCount()!=null){
+            fields.setIfa_bottle_count(Double.valueOf(entity.getIfaBottleCount()));
 
+        }
         dto.setFields(fields);
         return dto;
     }
@@ -803,7 +806,10 @@ private IfaDistribution mapToEntity(IfaDistributionDTO dto, Integer userId) {
                     entity.setIfaProvisionDate(null);
                 }
             }
-            entity.setIfaBottleCount(dto.getFields().getIfa_bottle_count().toString());
+            if(dto.getFields().getIfa_bottle_count()!=null){
+                entity.setIfaBottleCount(dto.getFields().getIfa_bottle_count().toString());
+
+            }
             entity.setMcpCardUpload(dto.getFields().getMcp_card_upload());
         }