diff --git a/pom.xml b/pom.xml index 9b881e3d..14df17d3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 17 jdt_apt 1.2.0.Final - 1.18.22 + 1.18.36 ${ENV_VAR} target/classes/application.properties target/classes/common_${environment}.properties @@ -292,7 +292,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.1 + 3.14.0 ${java.version} ${java.version} @@ -300,7 +300,7 @@ org.projectlombok lombok - ${lombok.version} + ${org.projectlombok.version} org.mapstruct diff --git a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java index f4f55096..3310adab 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java @@ -50,5 +50,6 @@ List findByCreatedDateBetweenOrderByBenFamilyMapIdAsc @Modifying @Query(" UPDATE MBeneficiaryfamilymapping set vanSerialNo = :benFamilyMapId WHERE benFamilyMapId = :benFamilyMapId") int updateVanSerialNo(@Param("benFamilyMapId") BigInteger benFamilyMapId); + } diff --git a/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java b/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java index c3f4bc8a..f194f027 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java @@ -88,4 +88,5 @@ List findByBenMapIdAndVanID(@Param("benMapId") BigInteger @Query(value = "select i from MBeneficiaryidentity i where i.identityNo = :identityNo") List searchByIdentityNo(@Param("identityNo") String identityNo); + } diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java index fcb3c99d..e3080a5d 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java @@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional; import com.iemr.common.identity.domain.MBeneficiarymapping; +import com.iemr.common.identity.domain.MBeneficiaryservicemapping; import com.iemr.common.identity.domain.VBenAdvanceSearch; import com.iemr.common.identity.dto.IdentityDTO; import com.iemr.common.identity.dto.IdentitySearchDTO; @@ -137,4 +138,8 @@ Long getBeneficiaryCountsByVillageIDAndLastModifyDate(@Param("villageIDs") List< +"LEFT JOIN MBeneficiaryservicemapping bsm on bsm.vanSerialNo=bm.benMapId and bm.vanID=bsm.vanID " +"where bm.vanSerialNo=:vanSerialNo and bm.vanID=:vanID") MBeneficiarymapping getMapping(@Param("vanSerialNo") BigInteger vanSerialNo,@Param("vanID") Integer vanID); + + @Query("SELECT a FROM MBeneficiarymapping a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ") + MBeneficiarymapping getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo, + @Param("vanID") Integer vanID); } diff --git a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java index 15801662..49ed72d1 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java @@ -82,4 +82,8 @@ Long countByProviderServiceMapIdAndRegisteredDateBetween(Integer registeredProvi @Modifying @Query(" UPDATE MBeneficiaryservicemapping set vanSerialNo = :benServiceMapID WHERE benServiceMapID = :benServiceMapID ") int updateVanSerialNo(@Param("benServiceMapID") BigInteger benServiceMapID); + + @Query("SELECT a FROM MBeneficiaryservicemapping a WHERE a.benMapId =:benMapId AND a.vanID =:vanID ") + List getWithVanSerialNoVanID(@Param("benMapId") BigInteger benMapId, + @Param("vanID") Integer vanID); } diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java index 8a0caa83..c123eebb 100644 --- a/src/main/java/com/iemr/common/identity/service/IdentityService.java +++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java @@ -573,12 +573,34 @@ public List searhBeneficiaryByGovIdentity(String identity) } private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) { - MBeneficiarymapping benMapOBJ = new MBeneficiarymapping(); + MBeneficiarymapping mapping = new MBeneficiarymapping(); if (benMapArr != null && benMapArr.length == 12 && benMapArr[8] != null && benMapArr[9] != null) { - benMapOBJ.setBenMapId(getBigIntegerValueFromObject(benMapArr[0])); - benMapOBJ.setCreatedBy(String.valueOf(benMapArr[10])); - benMapOBJ.setCreatedDate((Timestamp) benMapArr[11]); - benMapOBJ = mappingRepo.getMapping(getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]); + mapping.setBenMapId(getBigIntegerValueFromObject(benMapArr[0])); + mapping.setCreatedBy(String.valueOf(benMapArr[10])); + mapping.setCreatedDate((Timestamp) benMapArr[11]); + mapping = mappingRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]); + MBeneficiaryaddress address = addressRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[1]), (Integer) benMapArr[8]); + MBeneficiaryconsent consent = consentRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[2]), (Integer) benMapArr[8]); + MBeneficiarycontact contact = contactRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[3]), (Integer) benMapArr[8]); + MBeneficiarydetail details = detailRepo.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[4]), (Integer) benMapArr[8]); + MBeneficiaryregidmapping regidmapping = regIdRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]); + MBeneficiaryAccount account = accountRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[7]), (Integer) benMapArr[8]); + MBeneficiaryImage image = imageRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[6]), (Integer) benMapArr[8]); + List servicemap = serviceMapRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[0]), (Integer) benMapArr[8]); + List identity = identityRepo.findByBenMapIdAndVanID(getBigIntegerValueFromObject(benMapArr[0]), (Integer) benMapArr[8]); + List familymapping = familyMapRepo.findByBenMapIdAndVanIDOrderByBenFamilyMapIdAsc(getBigIntegerValueFromObject(benMapArr[0]), (Integer) benMapArr[8]); + + mapping.setMBeneficiaryaddress(address); + mapping.setMBeneficiaryconsent(consent); + mapping.setMBeneficiarycontact(contact); + mapping.setMBeneficiarydetail(details); + mapping.setMBeneficiaryfamilymappings(familymapping); + mapping.setMBeneficiaryidentities(identity); + mapping.setMBeneficiaryImage(image); + mapping.setMBeneficiaryregidmapping(regidmapping); + mapping.setMBeneficiaryservicemappings(servicemap); + mapping.setMBeneficiaryAccount(account); + //benMapOBJ = mappingRepo.getMapping(getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]); @@ -588,15 +610,15 @@ private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) { if (obj != null) { if (obj.getHouseoldId() != null) - benMapOBJ.setHouseHoldID(obj.getHouseoldId()); + mapping.setHouseHoldID(obj.getHouseoldId()); if (obj.getGuidelineId() != null) - benMapOBJ.setGuideLineID(obj.getGuidelineId()); + mapping.setGuideLineID(obj.getGuidelineId()); if (obj.getRchid() != null) - benMapOBJ.setRchID(obj.getRchid()); + mapping.setRchID(obj.getRchid()); } } - return benMapOBJ; + return mapping; } private MBeneficiarymapping getBeneficiariesDTONewPartial(Object[] benMapArr) { MBeneficiarymapping benMapOBJ = new MBeneficiarymapping();