Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
eed56c24
Commit
eed56c24
authored
4 years ago
by
ilal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交考勤遗漏员工BUG
parent
680a1618
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
src/main/java/cn/timer/api/controller/jxgl/JxglController.java
+9
-2
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+2
-0
src/main/resources/mapping/jxgl/JxglPerformanceAppraisalMapper.xml
+1
-0
No files found.
src/main/java/cn/timer/api/controller/jxgl/JxglController.java
View file @
eed56c24
...
...
@@ -241,8 +241,15 @@ public class JxglController {
new
QueryWrapper
<
JxglAppraisalT
>().
lambda
().
eq
(
JxglAppraisalT:
:
getId
,
jxglAppraisalT
.
getId
()))
>
0
)
{
jxglAppraisalT
.
updateById
();
}
else
{
jxglAppraisalT
.
setOrgCode
(
userBean
.
getOrgCode
());
jxglAppraisalT
.
insert
();
List
<
JxglAppraisalT
>
alt
=
JxglAppraisalT
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
JxglAppraisalT
>().
lambda
().
eq
(
JxglAppraisalT:
:
getOrgCode
,
userBean
.
getOrgCode
())
.
eq
(
JxglAppraisalT:
:
getName
,
jxglAppraisalT
.
getName
()));
if
(
alt
.
size
()
>
0
)
{
return
ResultUtil
.
error
(
"模板名称不允许重复"
);
}
else
{
jxglAppraisalT
.
setOrgCode
(
userBean
.
getOrgCode
());
jxglAppraisalT
.
insert
();
}
}
LambdaQueryWrapper
<
JxglAppraisalIndicatorsT
>
q
=
new
QueryWrapper
<
JxglAppraisalIndicatorsT
>().
lambda
()
.
eq
(
JxglAppraisalIndicatorsT:
:
getAppraisalTId
,
jxglAppraisalT
.
getId
());
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
View file @
eed56c24
...
...
@@ -186,6 +186,8 @@ public class AttendanceTaskTiming{
if
(
sum
!=
null
)
{
summaryid
=
sum
.
getId
();
}
else
{
summaryid
=
0
;
}
double
traveltotal
=
0
,
egresstotal
=
0
,
overtimetotal
=
0
;
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/jxgl/JxglPerformanceAppraisalMapper.xml
View file @
eed56c24
...
...
@@ -283,6 +283,7 @@
where nod.executor_id = #{param.id}
and pe.org_code = #{param.orgCode}
and nod.sts = 2
and em.org_code = #{param.orgCode}
ORDER BY pe.id DESC
</select>
...
...
This diff is collapsed.
Click to expand it.
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