..

SubProject/FPJ0000/JobReport_/fJobChartMenu.cs

@@ -109,6 +109,11 @@ namespace FPJ0000.JobReport_
         {
             var db = new EEEntities();
 
+            progressBar1.Value = 0;
+            progressBar1.Maximum = 10;
+
+
+            fpSpread1.Visible = false;
 
             //조회공정
             this.fpSpread1.Sheets[0].Cells[3, 2].Value = tbProcess.Text;
@@ -141,24 +146,25 @@ namespace FPJ0000.JobReport_
 
             //사용자목록을 가져온다
             List<vJobReportForUser> baseData;
+            var userCount = 0;
             if (cmbUser.SelectedIndex > 0)
             {
                 //사용자번호 
                 var UserNo = getUserID();// cmbUser.Text.Substring(1, cmbUser.Text.IndexOf(']') - 1);
-                baseData = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == UserNo).OrderBy(t => t.name).ToList();
+                userCount = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == UserNo).GroupBy(t=>t.id).Count();
             }
             else if (tbProcess.SelectedIndex > 0)
             {
-                baseData = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.userProcess == tbProcess.Text).OrderBy(t => t.name).ToList();
+                userCount = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.userProcess == tbProcess.Text).GroupBy(t => t.id).Count();
             }
             else
             {
-                baseData = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t => t.name).ToList();
+                userCount = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode).GroupBy(t => t.id).Count();
             }
 
 
             //사용자로 그룹해서 수량을 세명 , 사용자 숫자가 된다.
-            this.fpSpread1.Sheets[0].Cells[3, 7].Value = baseData.GroupBy(t => t.id).Count(); //인원수
+            this.fpSpread1.Sheets[0].Cells[3, 7].Value = userCount;// baseData.GroupBy(t => t.id).Count(); //인원수
 
             var col = 0;
             var row = 0;
@@ -260,8 +266,11 @@ namespace FPJ0000.JobReport_
             var orProcess = baseData.OrderBy(t => t.requestpart).GroupBy(t => t.requestpart);
             this.fpSpread1.Sheets[0].RowCount = 7 + orProcess.Count() + 1;
 
+            progressBar1.Value = 0;
+            progressBar1.Maximum = orProcess.Count();
             foreach (var item in orProcess)
             {
+                progressBar1.Value += 1;
                 var RequestPart = item.FirstOrDefault().requestpart;
                 this.fpSpread1.Sheets[0].Cells[row, 1].Value = RequestPart;
 
@@ -449,6 +458,9 @@ namespace FPJ0000.JobReport_
 
             this.fpSpread1.Sheets[0].RowCount = row + 1;
 
+            fpSpread1.Visible = true;
+
+            //FCOMMON.Util.MsgI("조회 완료");
 
         }