Feature/grievence/changes

src/main/environment/common_ci.properties

@@ -148,7 +148,7 @@ logging.file.name=@env.COMMON_API_LOGGING_FILE_NAME@
 
 
 ##grievance API call
-updateGrievanceDetails = @env.GRIEVANCE_API_BASE_URL@/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list
+updateGrievanceDetails = @env.GRIEVANCE_API_BASE_URL@/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list?page=PageNumber&currentpage=1
 updateGrievanceTransactionDetails=@env.GRIEVANCE_API_BASE_URL@/grsbepro/igemr1097/public/api/v1/grievance_details/
 ## grievance variables
 
@@ -162,4 +162,7 @@ springdoc.swagger-ui.enabled=false
 
 grievanceAllocationRetryConfiguration=3
 
+start-grievancedatasync-scheduler=false
+cron-scheduler-grievancedatasync=0 0/2 * * * ?
+
 

src/main/environment/common_dev.properties

@@ -118,7 +118,7 @@ nhm.agent.real.time.data.cron.flag=true
 ##----------------------------------------------------#grievance data sync-----------------------------------------------------------
 
 start-grievancedatasync-scheduler=false
-cron-scheduler-grievancedatasync=0 0/5 * * * ? *
+cron-scheduler-grievancedatasync=0 0/2 * * * ?
 
 carestream_socket_ip = 192.168.43.39
 carestream_socket_port = 1235
@@ -173,7 +173,7 @@ fileBasePath =<Enter your required basepath here>/Doc
 jwt.secret=
 
 ##grievance API call
-updateGrievanceDetails = <ENTER GRIEVANCE_API_BASE_URL>/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list
+updateGrievanceDetails = <ENTER GRIEVANCE_API_BASE_URL>/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list?page=PageNumber&currentpage=1
 updateGrievanceTransactionDetails=<ENTER GRIEVANCE_API_BASE_URL>/grsbepro/igemr1097/public/api/v1/grievance_details/
 
 ## grievance variables

src/main/environment/common_example.properties

@@ -88,7 +88,7 @@ cron-scheduler-nhmdashboard=0 1 * * * ? *
 ##----------------------------------------------------#grievance data sync-----------------------------------------------------------
 
 start-grievancedatasync-scheduler=false
-cron-scheduler-grievancedatasync=0 0/5 * * * ? *
+cron-scheduler-grievancedatasync=0 0/2 * * * ?
 
 ### Redis IP
 spring.redis.host=localhost
@@ -173,7 +173,7 @@ jwt.secret=
 
 fileBasePath =<Enter your required basepath here>/Doc
 ##grievance API call
-updateGrievanceDetails = <ENTER GRIEVANCE_API_BASE_URL>/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list
+updateGrievanceDetails = <ENTER GRIEVANCE_API_BASE_URL>/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list?page=PageNumber&currentpage=1
 updateGrievanceTransactionDetails=<ENTER GRIEVANCE_API_BASE_URL>/grsbepro/igemr1097/public/api/v1/grievance_details/
 
 ## grievance variables

src/main/environment/common_test.properties

@@ -84,7 +84,7 @@ cron-scheduler-everwelldatasync=0 0/5 * * * ? *
 ##----------------------------------------------------#grievance data sync-----------------------------------------------------------
 
 start-grievancedatasync-scheduler=false
-cron-scheduler-grievancedatasync=0 0/5 * * * ? *
+cron-scheduler-grievancedatasync=0 0/2 * * * ?
 ##-----------------------------------------------#NHM data dashboard schedular----------------------------------------------------------------
 # run at everyday 12:01AM
 start-nhmdashboard-scheduler=true
@@ -175,7 +175,7 @@ jwt.secret=
 
 
 ##grievance API call
-updateGrievanceDetails = <ENTER GRIEVANCE_API_BASE_URL>/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list
+updateGrievanceDetails = <ENTER GRIEVANCE_API_BASE_URL>/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list?page=PageNumber&currentpage=1
 updateGrievanceTransactionDetails=<ENTER GRIEVANCE_API_BASE_URL>/grsbepro/igemr1097/public/api/v1/grievance_details/
 
 ## grievance variables

src/main/environment/common_uat.properties

@@ -59,7 +59,7 @@ cron-scheduler-ctidatacheck=0 10 00 * * *
 ##----------------------------------------------------#grievance data sync-----------------------------------------------------------
 
 start-grievancedatasync-scheduler=false
-cron-scheduler-grievancedatasync=0 0/5 * * * ? *
+cron-scheduler-grievancedatasync=0 0/2 * * * ?
 
 ### generate Beneficiary IDs URL
 genben-api=<Enter your socket address here>/bengenapi-v1.0
@@ -146,7 +146,7 @@ fileBasePath =<Enter your required basepath here>/Doc
 jwt.secret=
 
 ##grievance API call
-updateGrievanceDetails = <ENTER GRIEVANCE_API_BASE_URL>/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list
+updateGrievanceDetails = <ENTER GRIEVANCE_API_BASE_URL>/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list?page=PageNumber&currentpage=1
 updateGrievanceTransactionDetails=<ENTER GRIEVANCE_API_BASE_URL>/grsbepro/igemr1097/public/api/v1/grievance_details/
 
 ## grievance variables

src/main/java/com/iemr/common/repository/grievance/GrievanceDataRepo.java

@@ -1,5 +1,6 @@
 package com.iemr.common.repository.grievance;
 
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
@@ -33,8 +34,8 @@ List<GrievanceDetails> findGrievancesInDateRangeAndLanguage(@Param("startDate")
 	public int allocateGrievance(@Param("grievanceId") Long grievanceId,
 			@Param("userId") Integer userId);
 
-	@Query(nativeQuery = true, value = "SELECT PreferredLanguageId, PreferredLanguage, VanSerialNo, VanID, ParkingPlaceId, VehicalNo FROM db_1097_identity.i_beneficiarydetails WHERE BeneficiaryRegID = :benRegId")
-	public ArrayList<Object[]> getBeneficiaryGrievanceDetails(@Param("benRegId") Long benRegId);
+	@Query(nativeQuery = true, value = "SELECT preferredLanguageId, preferredLanguage, VanSerialNo, VanID, ParkingPlaceID, VehicalNo FROM db_1097_identity.i_beneficiarydetails WHERE beneficiarydetailsid = :beneficiarydetailsid")
+	public ArrayList<Object[]> getBeneficiaryGrievanceDetails(@Param("beneficiarydetailsid") Long beneficiarydetailsid);
 
 	@Query(nativeQuery = true, value = "SELECT t2.preferredPhoneNum FROM db_1097_identity.i_beneficiarymapping t1 join" 
 			+ " db_1097_identity.i_beneficiarycontacts t2 on t1.benContactsId = t2.benContactsID" 
@@ -43,11 +44,10 @@ public int allocateGrievance(@Param("grievanceId") Long grievanceId,
 
 
 	@Query("select grievance.preferredLanguage, count(distinct grievance.grievanceId) "
-			+ "from GrievanceDetails grievance " + "where grievance.providerServiceMapID = :providerServiceMapID "
-			+ "and grievance.userID = :userID " + "and grievance.deleted = false "
+			+ "from GrievanceDetails grievance " + "where "
+			+ "grievance.userID = :userID " + "and grievance.deleted = false "
 			+ "group by grievance.preferredLanguage")
-	public Set<Object[]> fetchGrievanceRecordsCount(@Param("providerServiceMapID") Integer providerServiceMapID,
-			@Param("userID") Integer userID);
+	public Set<Object[]> fetchGrievanceRecordsCount(@Param("userID") Integer userID);
 
 	@Query("SELECT g FROM GrievanceDetails g WHERE g.userID = :userID AND g.preferredLanguage = :language AND g.isAllocated = true")
 	List<GrievanceDetails> findAllocatedGrievancesByUserAndLanguage(@Param("userID") Integer userID,
@@ -160,6 +160,9 @@ List<GrievanceDetails> fetchGrievanceDetailsBasedOnParams(
 @Query("SELECT g.gwid FROM GrievanceDetails g WHERE g.grievanceId = :grievanceId")
 Long getUniqueGwid(@Param("grievanceId")Long grievanceIdObj);
 
+@Query(value = "SELECT BenDetailsId FROM db_1097_identity.i_beneficiarymapping WHERE BenRegId = :beneficiaryRegID", nativeQuery = true)
+Long getBeneficiaryMapping(@Param("beneficiaryRegID") Long beneficiaryRegID);
+
 
 
 }

src/main/java/com/iemr/common/repository/grievance/GrievanceOutboundRepository.java

@@ -15,8 +15,7 @@
 public interface GrievanceOutboundRepository extends JpaRepository<GrievanceDetails, Long> {
 
 
-	@Query(value =" call db_iemr.Pr_Grievanceworklist(:providerServiceMapID, :userId)", nativeQuery = true)
-    List<Object[]> getGrievanceWorklistData(@Param("providerServiceMapID") Integer providerServiceMapID,
-    		@Param("userId") Integer userId);
+	@Query(value =" call db_iemr.Pr_Grievanceworklist(:userId)", nativeQuery = true)
+    List<Object[]> getGrievanceWorklistData(@Param("userId") Integer userId);
 
 }