sql query changed

This commit is contained in:
Sabbir Ahmed 2026-07-13 09:11:18 +06:00
parent 8b707b511c
commit 21a06545ce
2 changed files with 7 additions and 8 deletions

View File

@ -84,8 +84,7 @@ namespace HRM.DA
{ {
if (reportGroupType == EnumReportGroupType.Salary) if (reportGroupType == EnumReportGroupType.Salary)
{ {
//sql = SQLParser.MakeSQL("select distinct(Head) as Head from vwEmployeeSalary"); sql = SQLParser.MakeSQL("select distinct(Head) as Head from vwEmployeeSalary");
sql = SQLParser.MakeSQL("SELECT DISTINCT DESCRIPTION AS Head FROM SALARYMONTHLYDETAIL WHERE ITEMGROUP IN (1,2,3,5,8)");
} }
else if(reportGroupType == EnumReportGroupType.Leave) else if(reportGroupType == EnumReportGroupType.Leave)
{ {

View File

@ -404,7 +404,7 @@ export class HRMOpenAITestComponent implements OnInit{
|| this.selectedReportGroup === EnumReportGroupType.Training || this.selectedReportGroup === EnumReportGroupType.Training
|| this.selectedReportGroup === EnumReportGroupType.Attendance || this.selectedReportGroup === EnumReportGroupType.Attendance
|| this.selectedReportGroup === EnumReportGroupType.Leave)){ || this.selectedReportGroup === EnumReportGroupType.Leave)){
this.loadingpanelService.ShowLoadingPanel = false; this.loadingpanelService.ShowLoadingPanel = true;
this.reportColumnDefinition = []; this.reportColumnDefinition = [];
this.tableColumnDefinition = []; this.tableColumnDefinition = [];
this.opeAiService.GetReportColumnDefinition(this.selectedReportGroup).subscribe( this.opeAiService.GetReportColumnDefinition(this.selectedReportGroup).subscribe(
@ -412,11 +412,11 @@ export class HRMOpenAITestComponent implements OnInit{
this.reportColumnDefinition = resp as any[]; this.reportColumnDefinition = resp as any[];
}, },
(err: any) => { (err: any) => {
this.loadingpanelService.ShowLoadingPanel = false; this.loadingpanelService.ShowLoadingPanel = true;
this.notificationService.showError(err.error, "Error"); this.notificationService.showError(err.error, "Error");
}, },
() => { () => {
this.loadingpanelService.ShowLoadingPanel = false; this.loadingpanelService.ShowLoadingPanel = true;
this.gridData = []; this.gridData = [];
if (this.reportColumnDefinition && this.reportColumnDefinition.length > 0) { if (this.reportColumnDefinition && this.reportColumnDefinition.length > 0) {
const excludedNormalizedCaptions = new Set(['employeeid']); const excludedNormalizedCaptions = new Set(['employeeid']);
@ -452,7 +452,7 @@ export class HRMOpenAITestComponent implements OnInit{
let oQueryLog : OpenAIQueryLog = this.currentUserAllQueryLog.find(x => x.id === id) ?? undefined; let oQueryLog : OpenAIQueryLog = this.currentUserAllQueryLog.find(x => x.id === id) ?? undefined;
if(oQueryLog != undefined){ if(oQueryLog != undefined){
this.isShowCurrentUserAllQueryLog = false this.isShowCurrentUserAllQueryLog = false
this.loadingpanelService.ShowLoadingPanel = false; this.loadingpanelService.ShowLoadingPanel = true;
this.inputUserCommand = oQueryLog.userPrompt; this.inputUserCommand = oQueryLog.userPrompt;
this.selectedReportGroup = oQueryLog.reportGroup; this.selectedReportGroup = oQueryLog.reportGroup;
if(oQueryLog.title && oQueryLog.title !== ""){ if(oQueryLog.title && oQueryLog.title !== ""){
@ -481,12 +481,12 @@ export class HRMOpenAITestComponent implements OnInit{
}, },
(err: any) => { (err: any) => {
this.isShowCurrentUserAllQueryLog = false this.isShowCurrentUserAllQueryLog = false
this.loadingpanelService.ShowLoadingPanel = false; this.loadingpanelService.ShowLoadingPanel = true;
this.notificationService.showError(err.error, "Error"); this.notificationService.showError(err.error, "Error");
}, },
() => { () => {
this.isShowCurrentUserAllQueryLog = false this.isShowCurrentUserAllQueryLog = false
this.loadingpanelService.ShowLoadingPanel = false; this.loadingpanelService.ShowLoadingPanel = true;
this.ProcessOpenAIData(); this.ProcessOpenAIData();
this.LoadCurrentUserAllQueryLog(this.selectedReportGroup); this.LoadCurrentUserAllQueryLog(this.selectedReportGroup);
}); });