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
dd2ff010
Commit
dd2ff010
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
c00268a9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
1 deletions
+16
-1
src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
+3
-0
src/main/java/cn/timer/api/controller/yggl/YgglController.java
+7
-1
src/main/java/cn/timer/api/dto/yggl/AddygdaDto.java
+6
-0
src/main/resources/mapping/yggl/YgglMainEmpMapper.xml
+0
-0
No files found.
src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
View file @
dd2ff010
...
@@ -208,6 +208,9 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
...
@@ -208,6 +208,9 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
@ApiModelProperty
(
value
=
"离职前状态 1试用、2正式 "
,
example
=
"1试用、2正式"
)
@ApiModelProperty
(
value
=
"离职前状态 1试用、2正式 "
,
example
=
"1试用、2正式"
)
private
Integer
beforeLeavingSts
;
private
Integer
beforeLeavingSts
;
@ApiModelProperty
(
value
=
"自定义工号"
,
example
=
""
)
private
String
customNum
;
@Transient
@Transient
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
workTime
;
//工龄
private
String
workTime
;
//工龄
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/yggl/YgglController.java
View file @
dd2ff010
...
@@ -248,10 +248,12 @@ public class YgglController {
...
@@ -248,10 +248,12 @@ public class YgglController {
public
Result
<
Object
>
addygda
(
@CurrentUser
UserBean
userBean
,
@Validated
@RequestBody
AddygdaDto
addygdaDto
)
public
Result
<
Object
>
addygda
(
@CurrentUser
UserBean
userBean
,
@Validated
@RequestBody
AddygdaDto
addygdaDto
)
throws
Exception
{
throws
Exception
{
Integer
orgCode
=
userBean
.
getOrgCode
();
Integer
orgCode
=
userBean
.
getOrgCode
();
String
customNum
=
addygdaDto
.
getCustomNum
();
//自定义工号
String
name
=
addygdaDto
.
getName
();
String
name
=
addygdaDto
.
getName
();
String
phone
=
addygdaDto
.
getPhone
();
String
phone
=
addygdaDto
.
getPhone
();
Integer
zjType
=
addygdaDto
.
getZjType
();
Integer
zjType
=
addygdaDto
.
getZjType
();
String
zjNum
=
addygdaDto
.
getZjNum
();
String
zjNum
=
addygdaDto
.
getZjNum
();
int
attgroupid
=
addygdaDto
.
getAttgroupid
();
//考勤组id
boolean
isvalid
=
true
;
boolean
isvalid
=
true
;
switch
(
zjType
)
{
switch
(
zjType
)
{
case
0
:
case
0
:
...
@@ -306,7 +308,11 @@ public class YgglController {
...
@@ -306,7 +308,11 @@ public class YgglController {
.
status
(
CommonEnum
.
U_STS_ON
.
getType
()).
build
().
insert
();
.
status
(
CommonEnum
.
U_STS_ON
.
getType
()).
build
().
insert
();
ygglMainEmp
=
YgglMainEmp
.
builder
().
name
(
name
).
phone
(
phone
).
zjType
(
zjType
).
zjNum
(
zjNum
).
jobType
(
jobType
)
ygglMainEmp
=
YgglMainEmp
.
builder
().
name
(
name
).
phone
(
phone
).
zjType
(
zjType
).
zjNum
(
zjNum
).
jobType
(
jobType
)
.
jobStatus
(
jobStatus
.
SHIYONG
.
getType
()).
rzTime
(
rzTime
).
syq
(
syq
).
sex
(
sex
)
.
jobStatus
(
jobStatus
.
SHIYONG
.
getType
()).
rzTime
(
rzTime
).
syq
(
syq
).
sex
(
sex
)
.
empNum
(
login
.
getId
()).
orgCode
(
orgCode
).
bmgwId
(
bmgwId
).
build
();
.
empNum
(
login
.
getId
()).
orgCode
(
orgCode
).
bmgwId
(
bmgwId
).
customNum
(
customNum
).
build
();
if
(
addygdaDto
.
getAttgroupid
()
!=
null
)
{
KqglAssoYhkqz
.
builder
().
kqzid
(
attgroupid
).
userid
(
login
.
getId
()).
qyid
(
userBean
.
getOrgCode
()).
build
().
insert
();
}
if
(
syq
==
0
)
{
if
(
syq
==
0
)
{
ygglMainEmp
.
setZzTime
(
rzTime
);
ygglMainEmp
.
setZzTime
(
rzTime
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/yggl/AddygdaDto.java
View file @
dd2ff010
...
@@ -73,5 +73,11 @@ public class AddygdaDto extends Page implements Serializable{
...
@@ -73,5 +73,11 @@ public class AddygdaDto extends Page implements Serializable{
@ApiModelProperty
(
value
=
"部门岗位id"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"部门岗位id"
,
example
=
"0"
)
private
Integer
bmgwId
;
private
Integer
bmgwId
;
@ApiModelProperty
(
value
=
"自定义工号"
,
example
=
"1001"
)
private
String
customNum
;
@ApiModelProperty
(
value
=
"考勤组id"
,
example
=
"0"
)
private
Integer
attgroupid
;
}
}
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/yggl/YgglMainEmpMapper.xml
View file @
dd2ff010
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