Commit 7c3c23fa authored by 徐盼盼's avatar 徐盼盼

【员工考核】

优化:
i.月份查询缺少月份最后一天数据
ii.新增数据刷新表格
parent d068505f
...@@ -127,10 +127,10 @@ namespace Tools.UI.Popups ...@@ -127,10 +127,10 @@ namespace Tools.UI.Popups
try try
{ {
r["ID"] = this._db.ExecScalar(sql); r["ID"] = this._db.ExecScalar(sql);
r["CreateDate"] = DateTime.Now.ToString("yyyy-MM-dd hh:mm"); r["CreateDate"] = DateTime.Now.ToString("yyyy-MM-dd HH:mm");
r["CreateUserName"] = LoginInfo.UserName; r["CreateUserName"] = LoginInfo.UserName;
r["LastModifiedUserName"] = LoginInfo.UserName; r["LastModifiedUserName"] = LoginInfo.UserName;
r["LastModifiedDate"] = DateTime.Now.ToString("yyyy-MM-dd hh:mm"); r["LastModifiedDate"] = DateTime.Now.ToString("yyyy-MM-dd HH:mm");
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -149,7 +149,7 @@ namespace Tools.UI.Popups ...@@ -149,7 +149,7 @@ namespace Tools.UI.Popups
{ {
this._db.ExecNonSql(sql); this._db.ExecNonSql(sql);
r["LastModifiedUserName"] = LoginInfo.UserName; r["LastModifiedUserName"] = LoginInfo.UserName;
r["LastModifiedDate"] = DateTime.Now.ToString("yyyy-MM-dd hh:mm"); r["LastModifiedDate"] = DateTime.Now.ToString("yyyy-MM-dd HH:mm");
} }
catch (Exception ex) catch (Exception ex)
{ {
......
...@@ -113,6 +113,9 @@ namespace Tools.UI ...@@ -113,6 +113,9 @@ namespace Tools.UI
if (wEdit.ShowDialog() == DialogResult.OK) if (wEdit.ShowDialog() == DialogResult.OK)
this._ds.Tables[0].Rows.Add(drv); this._ds.Tables[0].Rows.Add(drv);
// 新增必定是当月,月份选择为当月并强制刷新
this.tscbMonth.SelectedIndex = 0;
tscbMonth_SelectedIndexChanged(null, null);
} }
//事件:更新记录 //事件:更新记录
private void tsbUpdate_Click(object sender, EventArgs e) private void tsbUpdate_Click(object sender, EventArgs e)
...@@ -246,8 +249,8 @@ namespace Tools.UI ...@@ -246,8 +249,8 @@ namespace Tools.UI
{ {
//生成开始、结束日期 //生成开始、结束日期
string startDate = this.tscbMonth.Text + "-01"; string startDate = this.tscbMonth.Text + "-01";
string endDate = Convert.ToDateTime(startDate).AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd"); //开始日期所在月份的最后一天 string endDate = Convert.ToDateTime(startDate).AddMonths(1).ToString("yyyy-MM-dd");
DataRow[] rows = this._ds.Tables[0].Select($"CreateDate >= '{startDate}' AND CreateDate <= '{endDate}'"); DataRow[] rows = this._ds.Tables[0].Select($"CreateDate >= '{startDate}' AND CreateDate < '{endDate}'");
DataTable dt = this._ds.Tables[0].Clone(); DataTable dt = this._ds.Tables[0].Clone();
Array.ForEach(rows, row => Array.ForEach(rows, row =>
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment