..

SubProject/FCOMMON/DataBaseManager.cs

@@ -34,7 +34,7 @@ namespace FCOMMON
 
         public static List<string> GetItemStorageList()
         {
-            
+
 
             var cn = getCn();
             cn.Open();
@@ -46,7 +46,7 @@ namespace FCOMMON
             try
             {
                 var rdr = cmd.ExecuteReader();
-                while(rdr.Read())
+                while (rdr.Read())
                 {
                     retval.Add(rdr[0].ToString());
                 }
@@ -310,7 +310,7 @@ namespace FCOMMON
                 " where prgmName = 'Amkor K4-EET GroupWare'";
                 return ExecuteScalar(sql);
             }
-            catch 
+            catch
             {
                 return string.Empty;
             }
@@ -528,7 +528,13 @@ namespace FCOMMON
             var dt = DateTime.Parse(pdate);
             var dtys = dt.Year.ToString("0000") + "-01-01";
 
-            string sql = "select isnull(cate,'--'), isnull(sum(termdr),0), isnull(sum(term),0), isnull(sum(termdr)-sum(term),0) , isnull(sum(drtime),0),isnull(sum(crtime),0), isnull(sum(drtime)-sum(crtime),0) as JanTime" +
+            string sql = "select isnull(cate,'--'), " +
+                " isnull(sum(termdr),0), " +
+                " isnull(sum(term),0), " +
+                " isnull(sum(termdr)-sum(term),0) ," +
+                " round(isnull(sum(drtime),0),2)," +
+                " round(isnull(sum(crtime),0),2)," +
+                " round(isnull(sum(drtime)-sum(crtime),0),2) as JanTime" +
                 " from Holyday " +
                 " where gcode=@gcode and  uid = @uid and sdate  between @sdate and @edate group by cate order by cate";
 
@@ -543,6 +549,8 @@ namespace FCOMMON
             var rdr = cmd.ExecuteReader();
             while (rdr.Read())
             {
+                var drtime = (double)rdr[4];
+                var crtime = (double)rdr[5];
                 retval.Add(rdr[0].ToString(), $"{rdr[1]}|{rdr[2]}|{rdr[3]}|{rdr[4]}|{rdr[5]}|{rdr[6]}");
             }
 
@@ -1073,7 +1081,7 @@ namespace FCOMMON
             {
                 return ExecuteScalar(slq);
             }
-            catch 
+            catch
             {
                 return string.Empty;
             }
@@ -1087,11 +1095,12 @@ namespace FCOMMON
             try
             {
                 return ExecuteScalar(slq);
-            }catch 
+            }
+            catch
             {
                 return string.Empty;
             }
-            
+
         }
 
         public static System.Data.DataTable getUserProjectList(string userName)