Name Transfer Query changes

src/main/java/com/metro/controller/APIController.java

@@ -108,6 +108,8 @@ public class APIController {
 			e.printStackTrace();
 		}
 		List dataList=reportSer.getMyReport(from,to,datetype);
+//		List<Map<String,Object>> mydata = dataList;/**/
+
 		ResponseEntity<Object> responseEntity = ResponseEntity
 				.status(HttpStatus.OK) // Set the HTTP status code (e.g., 200 OK)
 				.body(Map.of("error", false, "statusCode", HttpStatus.OK.value(), "dataList", dataList));

src/main/java/com/metro/services/ReportService.java

@@ -110,9 +110,9 @@ public class ReportService {
 //		}
 		else if(getDatetype().equals("nameTransfer")){
 			System.out.println("Name Transfer......");
-			query="select wm.propertyid, n.noticetype, n.noticeno, n.noticedate, wm.application_no, " +
-					"wm.application_date, wm.deed_no, wm.deed_date, wm.mobileno, mm.mutation_name, " +
-					"wm.remarks, wfcit.firstname newowner, c.firstname oldowner " +
+			query="select " +
+					"wm.propertyid, n.noticetype, n.noticeno, n.noticedate, wm.application_no, wm.application_date, wm.deed_no, " +
+					"wm.deed_date, wm.mobileno, mm.mutation_name, wm.remarks, wm_concat(distinct wfcit.firstname) newowner, wm_concat( distinct c.firstname) oldowner " +
 					"from EGPT_WFMUTATION@erp wm " +
 					"left outer join EGPT_MUTATION_MASTER@erp mm on wm.id_mutation=mm.id_mutation " +
 					"inner join EGPT_REV_TABLE228@erp wt on wt.mutid=wm.id " +
@@ -121,12 +121,13 @@ public class ReportService {
 					"left outer join EGPT_WFCITIZEN@erp wfcit on wfmo.ownerid=wfcit.id " +
 					"left outer join EGPT_PROPERTY_MUTATION@erp a on a.id_prop_mutation = wt.prop_mutation " +
 					"left outer join egpt_mutation_owner@erp b on b.id_prop_mutation=a.ID_PROP_MUTATION " +
-					"left outer join EG_CITIZEN@erp c on b.ownerid=c.citizenid "+
-					"where TRUNC(NOTICEDATE) BETWEEN TRUNC(TO_DATE('"+ getFromdate() +"','dd/mm/yyyy')) " +
-					"AND TRUNC(TO_DATE('"+ getTodate() +"','dd/mm/yyyy')) "+
-					"ORDER BY NOTICEDATE";
-//					"--where wm.propertyid='13-180-09124-000'";
-
+					"left outer join EG_CITIZEN@erp c on b.ownerid=c.citizenid " +
+					"where  " +
+					" n.noticedate >= to_Date('"+ getFromdate() +"', 'dd/mm/yyyy') " +
+					"and n.noticedate < to_Date('"+ getTodate() +"', 'dd/mm/yyyy') " +
+					"group by wm.propertyid, n.noticetype, n.noticeno, n.noticedate, wm.application_no, wm.application_date, wm.deed_no, " +
+					"wm.deed_date, wm.mobileno, mm.mutation_name, wm.remarks " +
+					"order by 1";
 		}
 
 		else if(getDatetype().equals("entries")){
@@ -260,9 +261,11 @@ public class ReportService {
 					row.put(columnName, columnValue);
 				}
 
+//				System.out.println(row);
 				// Add the row to the List
 				rows.add(row);
 			}
+
 			return rows;
 		}
 		catch (Exception e){