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
9b5aaad8
Commit
9b5aaad8
authored
4 years ago
by
邓实川
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
员工管理
parent
c25ac964
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
64 additions
and
46 deletions
+64
-46
src/main/java/cn/timer/api/bean/yggl/YgglMainLzb.java
+23
-5
src/main/java/cn/timer/api/controller/yggl/YgglController.java
+6
-6
src/main/java/cn/timer/api/controller/yggl/service/YgglServiceImpl.java
+0
-2
src/main/java/cn/timer/api/dao/yggl/YgglMainEmpMapper.java
+0
-2
src/main/java/cn/timer/api/dto/yggl/YgQueryDto.java
+33
-30
src/main/resources/mapping/yggl/YgglMainEmpMapper.xml
+2
-1
No files found.
src/main/java/cn/timer/api/bean/yggl/YgglMainLzb.java
View file @
9b5aaad8
...
@@ -86,11 +86,29 @@ public class YgglMainLzb extends Model<YgglMainLzb> {
...
@@ -86,11 +86,29 @@ public class YgglMainLzb extends Model<YgglMainLzb> {
@ApiModelProperty
(
value
=
"政治面貌 1:中共党员;2:中共预备党员;3共青团员;4:民革党员;5:民盟盟员;6:民建会员;7:民进会员;8:农工党党员;9:致公党党员;10:九三学社社员;11:台盟盟员;12:无党派人士;13:群众"
,
example
=
"101"
)
@ApiModelProperty
(
value
=
"政治面貌 1:中共党员;2:中共预备党员;3共青团员;4:民革党员;5:民盟盟员;6:民建会员;7:民进会员;8:农工党党员;9:致公党党员;10:九三学社社员;11:台盟盟员;12:无党派人士;13:群众"
,
example
=
"101"
)
private
Integer
zzmm
;
private
Integer
zzmm
;
@ApiModelProperty
(
value
=
"籍贯 省/市/区 例:广东/广州/白云"
,
example
=
"101"
)
// @ApiModelProperty(value="籍贯 省/市/区 例:广东/广州/白云",example="101")
private
Integer
jg
;
// private Integer jg;
//
@ApiModelProperty
(
value
=
"户籍城市 省/市/区 例:广东/广州/白云"
,
example
=
"101"
)
// @ApiModelProperty(value="户籍城市 省/市/区 例:广东/广州/白云",example="101")
private
Integer
city
;
// private Integer city;
@ApiModelProperty
(
value
=
"籍贯 省"
,
example
=
"101"
)
private
String
jg
;
@ApiModelProperty
(
value
=
"籍贯 省id"
,
example
=
"101"
)
private
String
jgId
;
@ApiModelProperty
(
value
=
"省"
)
private
String
province
;
@ApiModelProperty
(
value
=
"省id"
)
private
String
provinceId
;
@ApiModelProperty
(
value
=
"市"
)
private
String
city
;
@ApiModelProperty
(
value
=
"市id"
)
private
String
cityId
;
@ApiModelProperty
(
value
=
"区"
)
private
String
district
;
@ApiModelProperty
(
value
=
"区编号"
)
private
String
districtId
;
@ApiModelProperty
(
value
=
"户口性质 1:城镇户口;2:农村户口;3:居民户口"
,
example
=
"101"
)
@ApiModelProperty
(
value
=
"户口性质 1:城镇户口;2:农村户口;3:居民户口"
,
example
=
"101"
)
private
Integer
hkType
;
private
Integer
hkType
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/yggl/YgglController.java
View file @
9b5aaad8
...
@@ -1224,7 +1224,7 @@ public class YgglController {
...
@@ -1224,7 +1224,7 @@ public class YgglController {
}
}
/**
/**
* 员工转正
* 员工转正
0-1
*
*
* @param
* @param
* @return
* @return
...
@@ -1241,7 +1241,7 @@ public class YgglController {
...
@@ -1241,7 +1241,7 @@ public class YgglController {
}
}
/**
/**
* 计划离职 type
2-3
* 计划离职 type
1-2
*
*
* @param
* @param
* @return
* @return
...
@@ -1271,7 +1271,7 @@ public class YgglController {
...
@@ -1271,7 +1271,7 @@ public class YgglController {
}
}
/**
/**
* 确认离职 type
3-4
* 确认离职 type
2-3
*
*
* @param
* @param
* @return
* @return
...
@@ -1307,7 +1307,7 @@ public class YgglController {
...
@@ -1307,7 +1307,7 @@ public class YgglController {
}
}
/**
/**
* 放弃离职 type
3-2
* 放弃离职 type
2-1
*
*
* @param
* @param
* @return
* @return
...
@@ -1551,8 +1551,8 @@ public class YgglController {
...
@@ -1551,8 +1551,8 @@ public class YgglController {
@GetMapping
(
value
=
"/ygsbgjj"
)
@GetMapping
(
value
=
"/ygsbgjj"
)
@ApiOperation
(
value
=
"65.获取员工社保公积金"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"65.获取员工社保公积金"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
65
)
@ApiOperationSupport
(
order
=
65
)
public
Result
<
List
<
YgglAttaSbgjj
>
>
selectygsbgjj
(
@CurrentUser
UserBean
userBean
)
{
public
Result
<
YgglAttaSbgjj
>
selectygsbgjj
(
@CurrentUser
UserBean
userBean
)
{
List
<
YgglAttaSbgjj
>
ygglAttaSbgjj
=
YgglAttaSbgjj
.
builder
().
build
().
selectList
(
YgglAttaSbgjj
ygglAttaSbgjj
=
YgglAttaSbgjj
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
YgglAttaSbgjj
>().
lambda
().
eq
(
YgglAttaSbgjj:
:
getOrgCode
,
userBean
.
getOrgCode
())
new
QueryWrapper
<
YgglAttaSbgjj
>().
lambda
().
eq
(
YgglAttaSbgjj:
:
getOrgCode
,
userBean
.
getOrgCode
())
.
eq
(
YgglAttaSbgjj:
:
getEmpNum
,
userBean
.
getEmpNum
()));
.
eq
(
YgglAttaSbgjj:
:
getEmpNum
,
userBean
.
getEmpNum
()));
return
ResultUtil
.
data
(
ygglAttaSbgjj
);
return
ResultUtil
.
data
(
ygglAttaSbgjj
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/yggl/service/YgglServiceImpl.java
View file @
9b5aaad8
...
@@ -12,8 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
...
@@ -12,8 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.collection.ListUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.bean.yggl.YgglMainLzb
;
import
cn.timer.api.bean.yggl.YgglMainLzb
;
import
cn.timer.api.bean.zzgl.ZzglBmgwM
;
import
cn.timer.api.bean.zzgl.ZzglBmgwM
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/yggl/YgglMainEmpMapper.java
View file @
9b5aaad8
...
@@ -4,7 +4,6 @@ import java.util.List;
...
@@ -4,7 +4,6 @@ import java.util.List;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
...
@@ -13,7 +12,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...
@@ -13,7 +12,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.config.annotation.UserBean
;
import
cn.timer.api.config.annotation.UserBean
;
import
cn.timer.api.dto.yggl.EmpQuery
;
import
cn.timer.api.dto.yggl.EmpQuery
;
import
cn.timer.api.dto.yggl.YgCartogramDto
;
import
cn.timer.api.dto.yggl.YgQueryDto
;
import
cn.timer.api.dto.yggl.YgQueryDto
;
import
cn.timer.api.dto.yggl.YgbintuDto
;
import
cn.timer.api.dto.yggl.YgbintuDto
;
import
cn.timer.api.dto.yggl.YgglCartogramDto
;
import
cn.timer.api.dto.yggl.YgglCartogramDto
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/yggl/YgQueryDto.java
View file @
9b5aaad8
...
@@ -16,7 +16,7 @@ import lombok.Data;
...
@@ -16,7 +16,7 @@ import lombok.Data;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
/**
/**
* @date 2019年11月16日
* @date 2019年11月16日
* @author 翁东州
* @author 翁东州
* @方法中文名称:
* @方法中文名称:
*/
*/
...
@@ -24,49 +24,52 @@ import lombok.NoArgsConstructor;
...
@@ -24,49 +24,52 @@ import lombok.NoArgsConstructor;
@Builder
@Builder
@NoArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@AllArgsConstructor
public
class
YgQueryDto
extends
Page
implements
Serializable
{
public
class
YgQueryDto
extends
Page
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
1230023773946170942L
;
private
static
final
long
serialVersionUID
=
-
1230023773946170942L
;
@ApiModelProperty
(
value
=
"员工姓名"
,
example
=
"华仔"
)
@ApiModelProperty
(
value
=
"员工姓名"
,
example
=
"华仔"
)
private
String
empName
;
private
String
empName
;
@ApiModelProperty
(
value
=
"员工号"
,
example
=
"1"
)
@ApiModelProperty
(
value
=
"员工号"
,
example
=
"1"
)
private
Integer
empNum
;
private
Integer
empNum
;
@ApiModelProperty
(
value
=
"部门名"
,
example
=
"1"
)
@ApiModelProperty
(
value
=
"部门名"
,
example
=
"1"
)
private
String
deptName
;
private
String
deptName
;
@ApiModelProperty
(
value
=
"上级部门名"
,
example
=
"1"
)
@ApiModelProperty
(
value
=
"上级部门名"
,
example
=
"1"
)
private
String
upName
;
private
String
upName
;
@ApiModelProperty
(
value
=
"入职时间"
,
example
=
"1"
)
@ApiModelProperty
(
value
=
"入职时间"
,
example
=
"1"
)
private
Date
rzTime
;
private
Date
rzTime
;
@ApiModelProperty
(
value
=
"应离职时间"
,
example
=
"1"
)
@ApiModelProperty
(
value
=
"应离职时间"
,
example
=
"1"
)
private
Date
ylzTime
;
private
Date
ylzTime
;
@ApiModelProperty
(
value
=
"工作性质1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘"
,
example
=
"1"
)
@ApiModelProperty
(
value
=
"工作性质1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘"
,
example
=
"1"
)
private
Integer
jobType
;
private
Integer
jobType
;
@ApiModelProperty
(
value
=
"手机号"
,
example
=
"1"
)
@ApiModelProperty
(
value
=
"手机号"
,
example
=
"1"
)
private
String
phone
;
private
String
phone
;
@ApiModelProperty
(
value
=
"部门id"
,
example
=
"101"
)
@ApiModelProperty
(
value
=
"部门id"
,
example
=
"101"
)
private
Integer
bmgwid
;
private
Integer
bmgwid
;
@ApiModelProperty
(
value
=
"员工状态1正式、2试用、3离职中、4已离职"
,
example
=
"2"
)
@ApiModelProperty
(
value
=
"员工状态1正式、2试用、3离职中、4已离职"
,
example
=
"2"
)
private
Integer
jobStatus
;
private
Integer
jobStatus
;
@ApiModelProperty
(
value
=
"手机号、姓名"
,
example
=
"1388888888 or 张三"
)
@ApiModelProperty
(
value
=
"手机号、姓名"
,
example
=
"1388888888 or 张三"
)
private
String
query
;
private
String
query
;
@ApiModelProperty
(
value
=
"备注"
,
example
=
"123"
)
@ApiModelProperty
(
value
=
"备注"
,
example
=
"123"
)
private
String
bz
;
private
String
bz
;
@ApiModelProperty
(
value
=
"离职原因"
,
example
=
"123"
)
@ApiModelProperty
(
value
=
"离职原因"
,
example
=
"123"
)
private
String
lzyy
;
private
String
lzyy
;
@ApiModelProperty
(
value
=
"头像url"
,
example
=
"url"
)
@ApiModelProperty
(
value
=
"头像url"
,
example
=
"url"
)
private
String
headUrl
;
private
String
headUrl
;
@ApiModelProperty
(
value
=
"性别"
,
example
=
"1"
)
private
Integer
sex
;
}
}
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/yggl/YgglMainEmpMapper.xml
View file @
9b5aaad8
...
@@ -257,7 +257,8 @@
...
@@ -257,7 +257,8 @@
a.job_type jobType,
a.job_type jobType,
a.phone phone,
a.phone phone,
a.job_status jobStatus,
a.job_status jobStatus,
a.head_url headUrl
a.head_url headUrl,
a.sex sex
FROM
FROM
yggl_main_emp a
yggl_main_emp a
LEFT JOIN zzgl_bmgw_m b ON a.bmgw_id = b.id
LEFT JOIN zzgl_bmgw_m b ON a.bmgw_id = b.id
...
...
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