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
b0a6cafe
Commit
b0a6cafe
authored
4 years ago
by
lal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
7bcd3675
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
37 additions
and
8 deletions
+37
-8
src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkjl.java
+1
-1
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+0
-0
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+0
-0
src/main/java/cn/timer/api/controller/kqgl/service/KqglServiceImpl.java
+17
-1
src/main/java/cn/timer/api/dao/kqmk/KqglAssoDkjlMapper.java
+5
-2
src/main/java/cn/timer/api/dto/kqmk/AttendanceCardListDto.java
+7
-4
src/main/resources/mapping/kqmk/KqglAssoDkjlMapper.xml
+7
-0
No files found.
src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkjl.java
View file @
b0a6cafe
...
...
@@ -60,7 +60,7 @@ public class KqglAssoDkjl extends Model<KqglAssoDkjl> {
@ApiModelProperty
(
value
=
"类型(0:无排班打卡 1:上班 2:下班)"
,
example
=
"101"
)
private
Integer
type
;
@ApiModelProperty
(
value
=
"(0:打卡无效:此记录已被更新 1:正常 2:异常 3:迟到 4:早退 5:补卡 6:请假 7:加班 8:调休)"
,
example
=
"101"
)
@ApiModelProperty
(
value
=
"(0:打卡无效:此记录已被更新 1:正常 2:异常 3:迟到 4:早退 5:补卡 6:请假 7:加班 8:调休
9:管理员改为正常 10:管理员改为迟到 11:管理员改为早退 12:补卡通过/正常 13:补卡通过/迟到 14:补卡通过/早退
)"
,
example
=
"101"
)
private
Integer
status
;
@ApiModelProperty
(
value
=
"序号(0:打卡无效:此记录已被更新) 序号(0:打卡无效:此记录已被更新)"
,
example
=
"101"
)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
View file @
b0a6cafe
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
b0a6cafe
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/service/KqglServiceImpl.java
View file @
b0a6cafe
...
...
@@ -716,10 +716,26 @@ public class KqglServiceImpl implements KqglService {
dkmxid
=
pcd
.
getId
();
}
//0:打卡无效:此记录已被更新 1:正常 2:异常 3:迟到 4:早退 5:补卡 6:请假 7:加班 8:调休
//9:管理员改为正常 10:管理员改为迟到 11:管理员改为早退 12:补卡通过/正常 13:补卡通过/迟到 14:补卡通过/早退
int
status
=
2
;
if
((
atttype
)%
2
>
0
){
type
=
1
;
if
(
results
==
0
)
{
status
=
12
;
}
else
{
status
=
13
;
}
}
else
{
type
=
2
;
if
(
results
==
0
)
{
status
=
12
;
}
else
{
status
=
14
;
}
}
Long
startDate
=
DateUtil
.
getStartTime
(
0
,
DateUtil
.
getStringTime
(
cardrepltime
,
"yyyy-MM-dd"
)).
getTime
();
...
...
@@ -727,7 +743,7 @@ public class KqglServiceImpl implements KqglService {
//attime 应打卡时间
KqglAssoDkjl
pre
=
KqglAssoDkjl
.
builder
().
dktime
(
repaappr
.
getCardrepltime
()).
results
(
results
).
userId
(
repaappr
.
getUserid
()).
type
(
type
).
status
(
5
).
sort
(
atttype
)
KqglAssoDkjl
pre
=
KqglAssoDkjl
.
builder
().
dktime
(
repaappr
.
getCardrepltime
()).
results
(
results
).
userId
(
repaappr
.
getUserid
()).
type
(
type
).
status
(
status
).
sort
(
atttype
)
.
cardType
(
0
).
qyid
(
repaappr
.
getOrgcode
()).
attdate
(
attdate_
+
" "
+
ClockInTool
.
dateToWeek2
(
cardrepltime
)).
attime
(
attime
).
dkmxid
(
dkmxid
).
bcid
(
shifid
).
remarks
(
"审批补卡通过打卡"
).
punchmode
(
0
)
.
punchequipment
(
""
).
commentary
(
"成功打卡"
).
build
();
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/kqmk/KqglAssoDkjlMapper.java
View file @
b0a6cafe
package
cn
.
timer
.
api
.
dao
.
kqmk
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
java.util.List
;
import
org.springframework.stereotype.Repository
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
cn.timer.api.bean.kqmk.KqglAssoDkjl
;
/**
...
...
@@ -12,5 +15,5 @@ import cn.timer.api.bean.kqmk.KqglAssoDkjl;
*/
@Repository
public
interface
KqglAssoDkjlMapper
extends
BaseMapper
<
KqglAssoDkjl
>
{
List
<
KqglAssoDkjl
>
getDetailedRecordClock
(
Long
start
,
Long
end
,
Integer
userId
);
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/kqmk/AttendanceCardListDto.java
View file @
b0a6cafe
...
...
@@ -3,6 +3,8 @@ package cn.timer.api.dto.kqmk;
import
java.io.Serializable
;
import
java.util.List
;
import
cn.timer.api.bean.kqmk.KqglAssoDkjl
;
import
cn.timer.api.bean.kqmk.KqglAssoDkjl.KqglAssoDkjlBuilder
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
...
...
@@ -21,9 +23,9 @@ public class AttendanceCardListDto implements Serializable {
private
boolean
attaddress
;
// 考勤地址
private
boolean
attwifi
;
// 考勤WIFI
private
List
<
AttClockMethod
>
machine
;
// 详细打卡方式
private
List
<
PunchRecord
>
attpr
;
// 打卡记录
private
List
<
KqglAssoDkjl
>
attpr
;
// 打卡记录
private
boolean
optscheduling
;
// 未排班时,员工可选择班次打卡
//
private boolean optscheduling;// 未排班时,员工可选择班次打卡
private
boolean
fieldpersonnel
;
// 外勤 true:开 false:关
...
...
@@ -37,8 +39,9 @@ public class AttendanceCardListDto implements Serializable {
private
boolean
islatelate
;
// 晚走晚到
private
List
<
AttLateLate
>
attlat
;
// 晚走晚到时间
private
String
latetime
;
// 前一天晚走小时****
private
double
latetime
;
// 前天晚走时长(分钟)
private
Long
changed_time
;
// 根据班次规则计算出的 应晚到的打卡时间
private
List
<
SystemShift
>
ssfh
;
// 无排班时获取的系统班次
//
private List<SystemShift> ssfh;// 无排班时获取的系统班次
private
Integer
attgrouptype
;
// 1:固定排班;2:自由排班;3:自由工时
}
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/kqmk/KqglAssoDkjlMapper.xml
View file @
b0a6cafe
...
...
@@ -78,6 +78,13 @@
commentary KqglAssoDkjl_explain
</sql>
<select
id=
"getDetailedRecordClock"
resultMap=
"BaseResultMap"
>
select * from kqgl_asso_dkjl dkjl
where dkjl.attime
>
= #{start}
and dkjl.attime
<
= #{end}
and dkjl.user_id = #{userId,jdbcType=INTEGER}
and dkjl.status != 0
</select>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoDkjl">
...
...
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