휴가신청화면의 남은 잔량 게산식 수정,
업무일지 추가시 프로젝트 이름 제대로 보이게 함
This commit is contained in:
@@ -723,21 +723,28 @@ namespace FCOMMON
|
||||
System.Data.DataTable retval = new System.Data.DataTable();
|
||||
retval.Columns.Add("Code");
|
||||
retval.Columns.Add("Value");
|
||||
retval.Columns.Add("NameOnly");
|
||||
|
||||
var cn = getCn();
|
||||
cn.Open();
|
||||
var sql = "select idx, '[' + cast(idx as varchar) + '] ' + isnull(name,''),pdate from Projects" +
|
||||
var sql = "select idx, '[' + cast(idx as varchar) + '] ' + isnull(name,''),isnull(name,'') from Projects" +
|
||||
" where gcode='{0}'" +
|
||||
" and (isnull(userManager,'') like '%{1}%'" +
|
||||
" or isnull(userMain,'') like '%{1}%'" +
|
||||
" or isnull(usersub,'') like '%{1}%')" +
|
||||
" order by pdate desc,name";
|
||||
" and status not in ('보류', '취소', '완료(보고)')" +
|
||||
" order by status desc,pdate desc,name";
|
||||
//" order by pdate desc,name";
|
||||
sql = string.Format(sql, FCOMMON.info.Login.gcode, userName);
|
||||
var cmd = new SqlCommand(sql, cn);
|
||||
var rdr = cmd.ExecuteReader();
|
||||
while (rdr.Read())
|
||||
{
|
||||
retval.Rows.Add(new string[] { rdr[0].ToString(), rdr[1].ToString() });
|
||||
retval.Rows.Add(new string[] {
|
||||
rdr[0].ToString(),
|
||||
rdr[1].ToString(),
|
||||
rdr[2].ToString()
|
||||
});
|
||||
}
|
||||
rdr.Close();
|
||||
cmd.Dispose();
|
||||
|
||||
Reference in New Issue
Block a user