간트차트 변경

This commit is contained in:
chi
2022-02-01 15:36:13 +09:00
parent 4a43b30973
commit f2114194d3
15 changed files with 939 additions and 380 deletions

View File

@@ -224,6 +224,37 @@ namespace FCOMMON
return retval;
}
public static Dictionary<string, string> GetUserHolidayJan(string gcode, string uid, string pdate)
{
var cn = getCn();
cn.Open();
var retval = new Dictionary<string, string>();
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" +
" from Holyday " +
" where gcode=@gcode and uid = @uid and sdate between @sdate and @edate group by cate order by cate";
var cmd = new SqlCommand(sql, cn);
cmd.Parameters.Add("gcode", System.Data.SqlDbType.VarChar).Value = gcode;
cmd.Parameters.Add("uid", System.Data.SqlDbType.VarChar).Value = uid;
cmd.Parameters.Add("sdate", System.Data.SqlDbType.VarChar).Value = dtys;
cmd.Parameters.Add("edate", System.Data.SqlDbType.VarChar).Value = pdate;
var rdr = cmd.ExecuteReader();
while (rdr.Read())
{
retval.Add(rdr[0].ToString(), $"{rdr[1]}|{rdr[2]}|{rdr[3]}|{rdr[4]}|{rdr[5]}|{rdr[6]}");
}
cn.Close();
cn.Dispose();
return retval;
}
/// <summary>
/// 서플라이정보를 찾습니다. 1개의데이터가 검색된 경우에만 사용 됩니다.
@@ -267,7 +298,7 @@ namespace FCOMMON
/// <param name="ProjectIdx"></param>
/// <param name="Message"></param>
/// <returns></returns>
public static Boolean addProjectHistory(int ProjectIdx, string pdate, string Message,string rtf)
public static Boolean addProjectHistory(int ProjectIdx, string pdate, string Message, string rtf)
{
var cn = getCn();
@@ -716,7 +747,7 @@ namespace FCOMMON
}
public static System.Data.DataTable getCodeTable(string GroupCode = "99",string sort="memo")
public static System.Data.DataTable getCodeTable(string GroupCode = "99", string sort = "memo")
{
System.Data.DataTable retval = new System.Data.DataTable();
@@ -730,7 +761,7 @@ namespace FCOMMON
" from common" +
" where gcode='" + FCOMMON.info.Login.gcode + "' and grp = '" + GroupCode + "'" +
" and isnull(code,'') <> ''" +
" order by isnull("+ sort + ",'')";
" order by isnull(" + sort + ",'')";
var cmd = new SqlCommand(sql, cn);
var rdr = cmd.ExecuteReader();
while (rdr.Read())