Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
Ftt_Common
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Ftt_Common
Commits
7c3c23fa
Commit
7c3c23fa
authored
Jun 01, 2022
by
徐盼盼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【员工考核】
优化: i.月份查询缺少月份最后一天数据 ii.新增数据刷新表格
parent
d068505f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
wEditEvaluation.cs
Tools/UI/Popups/wEditEvaluation.cs
+3
-3
wEvaluationOfEmployee.cs
Tools/UI/wEvaluationOfEmployee.cs
+5
-2
No files found.
Tools/UI/Popups/wEditEvaluation.cs
View file @
7c3c23fa
...
...
@@ -127,10 +127,10 @@ namespace Tools.UI.Popups
try
{
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
[
"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
)
{
...
...
@@ -149,7 +149,7 @@ namespace Tools.UI.Popups
{
this
.
_db
.
ExecNonSql
(
sql
);
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
)
{
...
...
Tools/UI/wEvaluationOfEmployee.cs
View file @
7c3c23fa
...
...
@@ -113,6 +113,9 @@ namespace Tools.UI
if
(
wEdit
.
ShowDialog
()
==
DialogResult
.
OK
)
this
.
_ds
.
Tables
[
0
].
Rows
.
Add
(
drv
);
// 新增必定是当月,月份选择为当月并强制刷新
this
.
tscbMonth
.
SelectedIndex
=
0
;
tscbMonth_SelectedIndexChanged
(
null
,
null
);
}
//事件:更新记录
private
void
tsbUpdate_Click
(
object
sender
,
EventArgs
e
)
...
...
@@ -246,8 +249,8 @@ namespace Tools.UI
{
//生成开始、结束日期
string
startDate
=
this
.
tscbMonth
.
Text
+
"-01"
;
string
endDate
=
Convert
.
ToDateTime
(
startDate
).
AddMonths
(
1
).
AddDays
(-
1
).
ToString
(
"yyyy-MM-dd"
);
//开始日期所在月份的最后一天
DataRow
[]
rows
=
this
.
_ds
.
Tables
[
0
].
Select
(
$"CreateDate >= '
{
startDate
}
' AND CreateDate <
=
'
{
endDate
}
'"
);
string
endDate
=
Convert
.
ToDateTime
(
startDate
).
AddMonths
(
1
).
ToString
(
"yyyy-MM-dd"
);
DataRow
[]
rows
=
this
.
_ds
.
Tables
[
0
].
Select
(
$"CreateDate >= '
{
startDate
}
' AND CreateDate < '
{
endDate
}
'"
);
DataTable
dt
=
this
.
_ds
.
Tables
[
0
].
Clone
();
Array
.
ForEach
(
rows
,
row
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment