AMM-871 Abdm Facility addition changes in job location screeN (#59)

* Abdm Facility additioon in job location screen

* Update package.yml

* Update sast.yml

* Update build-on-pull-request.yml

---------

Co-authored-by: KA40094929 <[email protected]>

.github/workflows/build-on-pull-request.yml

@@ -13,10 +13,10 @@ jobs:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
 
-      - name: Setup JDK 8
+      - name: Setup JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: 8
+          java-version: 17
           distribution: 'adopt'
       - name: Build with Maven  
         run: mvn clean install

.github/workflows/package.yml

@@ -22,10 +22,10 @@ jobs:
     - name: Checkout code 
       uses: actions/checkout@v2
 
-    - name: Setup JDK 8
+    - name: Setup JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: 8
+        java-version: 17
         distribution: 'adopt'
 
     - name: Build with Maven
@@ -35,7 +35,7 @@ jobs:
       run: mvn -B package --file pom.xml
 
     - name: Upload WAR file as artifact
-      uses: actions/upload-artifact@v2 
+      uses: actions/upload-artifact@v3
       with:
         name: Admin-API
         path: target/adminapi-v1.0.war 

.github/workflows/sast.yml

@@ -37,10 +37,10 @@ jobs:
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
 
-    - name: Setup JDK 8
+    - name: Setup JDK 17
       uses: actions/setup-java@v2
       with:
-          java-version: 8
+          java-version: 17
           distribution: 'adopt'
 
     - name: Build with Maven

src/main/java/com/iemr/admin/controller/locationmaster/LocationMasterController.java

@@ -321,6 +321,8 @@ public String getAllRole(@RequestBody String stateserviceMapping1) {
 				resDataMap.setDistrictID(m_ProviderServiceAddMapping.getDistrictID());
 				resDataMap.setCreatedBy(m_ProviderServiceAddMapping.getCreatedBy());
 				resDataMap.setCreatedDate(m_ProviderServiceAddMapping.getCreatedDate());
+				resDataMap.setAbdmFacilityId(m_ProviderServiceAddMapping.getAbdmFacilityId());
+				resDataMap.setAbdmFacilityName(m_ProviderServiceAddMapping.getAbdmFacilityName());
 
 				resList.add(resDataMap);
 			}
@@ -360,7 +362,9 @@ public String geteditLocation(@RequestBody String editLocation) {
 			editdata.setDistrictID(editdata2.getDistrictID());
 			editdata.setAddress(editdata2.getAddress());
 			editdata.setLocationName(editdata2.getLocationName());
-			editdata.setDeleted(editdata.getDeleted());
+			editdata.setDeleted(editdata2.getDeleted());
+			editdata.setAbdmFacilityId(editdata2.getAbdmFacilityId());
+			editdata.setAbdmFacilityName(editdata2.getAbdmFacilityName());
 
 			M_ProviderServiceAddMapping editdata1 = locationMasterServiceInter.saveEditData(editdata);
 

src/main/java/com/iemr/admin/data/locationmaster/M_ProviderServiceAddMapping.java

@@ -72,6 +72,14 @@ public class M_ProviderServiceAddMapping {
 	@Column(name="LocationName")
 	private String locationName;
 
+	@Expose
+	@Column(name="abdmFacilityName")
+	private String abdmFacilityName;
+
+	@Expose
+	@Column(name="abdmFacilityId")
+	private String abdmFacilityId;
+
 
 
 
@@ -241,4 +249,32 @@ public String toString() {
 		return outputMapper.gson().toJson(this);
 	}
 
+
+
+
+	public String getAbdmFacilityName() {
+		return abdmFacilityName;
+	}
+
+
+
+
+	public void setAbdmFacilityName(String abdmFacilityName) {
+		this.abdmFacilityName = abdmFacilityName;
+	}
+
+
+
+
+	public String getAbdmFacilityId() {
+		return abdmFacilityId;
+	}
+
+
+
+
+	public void setAbdmFacilityId(String abdmFacilityId) {
+		this.abdmFacilityId = abdmFacilityId;
+	}
+
 }

src/main/java/com/iemr/admin/data/locationmaster/Showofficedetails.java

@@ -94,6 +94,14 @@ public class Showofficedetails {
 	@Column(name="LastModDate")
 	private Timestamp lastModDate;
 
+	@Expose
+	@Column(name="abdmFacilityName")
+	private String abdmFacilityName;
+
+	@Expose
+	@Column(name="abdmFacilityId")
+	private String abdmFacilityId;
+
 	public Showofficedetails() {
 		// TODO Auto-generated constructor stub
 	}

src/main/java/com/iemr/admin/to/M_UserTO.java

@@ -68,6 +68,14 @@ public class M_UserTO {
 	@Column(name="LocationName")
 	private String locationName;
 
+	@Expose
+	@Column(name="abdmFacilityName")
+	private String abdmFacilityName;
+
+	@Expose
+	@Column(name="abdmFacilityId")
+	private String abdmFacilityId;
+
 
 	public M_UserTO() {
 		// TODO Auto-generated constructor stub
@@ -207,6 +215,30 @@ public String getLocationName() {
 	public void setLocationName(String locationName) {
 		this.locationName = locationName;
 	}
+
+
+
+	public String getAbdmFacilityName() {
+		return abdmFacilityName;
+	}
+
+
+
+	public void setAbdmFacilityName(String abdmFacilityName) {
+		this.abdmFacilityName = abdmFacilityName;
+	}
+
+
+
+	public String getAbdmFacilityId() {
+		return abdmFacilityId;
+	}
+
+
+
+	public void setAbdmFacilityId(String abdmFacilityId) {
+		this.abdmFacilityId = abdmFacilityId;
+	}