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
f3d98def
Commit
f3d98def
authored
4 years ago
by
lal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
临时提交
parent
b1255a14
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
2 deletions
+17
-2
src/main/java/cn/timer/api/bean/kqgl/AttendanceAssistant.java
+2
-0
src/main/java/cn/timer/api/bean/kqgl/AttendanceGroup.java
+1
-0
src/main/java/cn/timer/api/controller/kqgl/AttController.java
+1
-0
src/main/resources/mapping/kqgl/AttendanceGroupMapper.xml
+13
-2
No files found.
src/main/java/cn/timer/api/bean/kqgl/AttendanceAssistant.java
View file @
f3d98def
...
...
@@ -49,5 +49,7 @@ public class AttendanceAssistant implements Serializable{
String
attgroupid
;
int
overtimeRulesId
;
//加班id
int
fieldpersonnel
;
//外勤
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/bean/kqgl/AttendanceGroup.java
View file @
f3d98def
...
...
@@ -43,6 +43,7 @@ public class AttendanceGroup implements Serializable{
private
String
dkfs
;
// 打卡方式
private
Integer
isWq
;
//外勤
private
Integer
overtimeRulesId
;
private
Integer
kqjid
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/AttController.java
View file @
f3d98def
...
...
@@ -1437,6 +1437,7 @@ public class AttController {
attgro
.
setZcgzsc
(
attass
.
getNormalWorkTime
());
//正常工作时长(自由工时专用)
attgro
.
setJbzdsc
(
attass
.
getMaxOvertimeTime
());
//加班最大时长(自由工时专用)
}
attgro
.
setOvertimeRulesId
(
attass
.
getOvertimeRulesId
());
//加班规则ID
attendancegroupservice
.
updateByPrimaryKeySelective
(
attgro
);
/*********/
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/kqgl/AttendanceGroupMapper.xml
View file @
f3d98def
...
...
@@ -29,6 +29,7 @@
<result
column=
"dkfs"
property=
"dkfs"
jdbcType=
"VARCHAR"
/>
<result
column=
"kqjid"
property=
"kqjid"
jdbcType=
"INTEGER"
/>
<result
column=
"is_wq"
property=
"isWq"
jdbcType=
"INTEGER"
/>
<result
column=
"overtime_rules_id"
property=
"overtimeRulesId"
/>
<collection
property=
"kqzdkfslist"
ofType=
"cn.timer.api.bean.kqgl.AttGroupBinPunchMode"
>
<result
column=
"kqzId"
property=
"kqzId"
jdbcType=
"INTEGER"
/>
...
...
@@ -92,7 +93,7 @@
<sql
id=
"Base_Column_List"
>
id, name, kqbz, pbfs, qyid, is_fdjjr, kqkssj_time, zsgzsc, zcgzsc, jbzdsc, is_dqtx,
txry, txfs, txxhts, txsj_time, tsfs, is_wpbsdk,sybc,is_xzbcdk,is_wq
txry, txfs, txxhts, txsj_time, tsfs, is_wpbsdk,sybc,is_xzbcdk,is_wq
,overtime_rules_id
</sql>
<select
id=
"selectByPrimaryKey"
resultMap=
"BaseResultMap"
parameterType=
"java.lang.Integer"
>
select
...
...
@@ -180,6 +181,9 @@
<if
test=
"isWq != null"
>
is_wq,
</if>
<if
test=
"overtimeRulesId != null"
>
overtime_rules_id,
</if>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
...
...
@@ -240,6 +244,9 @@
<if
test=
"isWq != null"
>
#{isWq,jdbcType=INTEGER},
</if>
<if
test=
"overtimeRulesId != null"
>
#{overtimeRulesId,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update
id=
"updateByPrimaryKeySelective"
parameterType=
"cn.timer.api.bean.kqgl.AttendanceGroup"
>
...
...
@@ -302,6 +309,9 @@
<if
test=
"isWq != null"
>
is_wq = #{isWq,jdbcType=INTEGER},
</if>
<if
test=
"overtimeRulesId != null"
>
overtime_rules_id = #{overtimeRulesId,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
...
...
@@ -325,7 +335,8 @@
is_wpbsdk = #{isWpbsdk,jdbcType=INTEGER},
sybc = #{sybc,jdbcType=VARCHAR},
is_xzbcdk = #{isXzbcdk,jdbcType=INTEGER},
is_wq = #{isWq,jdbcType=INTEGER}
is_wq = #{isWq,jdbcType=INTEGER},
overtime_rules_id = #{overtimeRulesId,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
...
...
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