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
c1c9c63c
Commit
c1c9c63c
authored
May 07, 2022
by
翁国栋
Committed by
284718418@qq.com
Mar 30, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人员异动
parent
1216f831
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
407 additions
and
122 deletions
+407
-122
sql/V2.3.sql
+24
-0
src/main/java/cn/timer/api/bean/yggl/YgglEmpLzyy.java
+78
-0
src/main/java/cn/timer/api/bean/yggl/YgglMainLzb.java
+62
-59
src/main/java/cn/timer/api/bean/zzgl/ZzglLogDgjl.java
+13
-7
src/main/java/cn/timer/api/controller/zzgl/service/ZzglBmgwMServiceImpl.java
+24
-13
src/main/java/cn/timer/api/dao/yggl/YgglEmpLzyyMapper.java
+19
-0
src/main/java/cn/timer/api/dao/zzgl/ZzglLogDgjlMapper.java
+6
-3
src/main/java/cn/timer/api/dto/yggl/YgzzDto.java
+6
-3
src/main/java/cn/timer/api/dto/zzgl/UpEmpDeptDto.java
+15
-2
src/main/resources/mapping/yggl/YgglEmpLzyyMapper.xml
+105
-0
src/main/resources/mapping/yggl/YgglMainLzbMapper.xml
+10
-7
src/main/resources/mapping/zzgl/ZzglLogDgjlMapper.xml
+45
-28
No files found.
sql/V2.3.sql
0 → 100644
View file @
c1c9c63c
ALTER
TABLE
`zzgl_log_dgjl`
ADD
COLUMN
`type`
int
(
11
)
NULL
COMMENT
'1 转正 2调岗 3离职 4岗位删除员工 5 岗位添加员工'
AFTER
`comment`
;
CREATE
TABLE
`yggl_emp_lzyy`
(
`id`
int
(
11
)
NOT
NULL
,
`value`
varchar
(
255
)
NULL
COMMENT
'离职原因'
,
PRIMARY
KEY
(
`id`
)
)
COMMENT
=
'离职原因'
;
ALTER
TABLE
`yggl_emp_lzyy`
MODIFY
COLUMN
`id`
int
(
11
)
NOT
NULL
AUTO_INCREMENT
FIRST
;
ALTER
TABLE
`timer_test`
.
`yggl_emp_lzyy`
ADD
COLUMN
`org_code`
int
(
11
)
NULL
DEFAULT
NULL
COMMENT
'企业Id'
AFTER
`value`
;
ALTER
TABLE
`yggl_main_lzb`
ADD
COLUMN
`lzyy_id`
int
(
11
)
NULL
COMMENT
'离职原因Id'
AFTER
`query`
,
MODIFY
COLUMN
`lzbz`
varchar
(
255
)
CHARACTER
SET
utf8
COLLATE
utf8_general_ci
NULL
DEFAULT
NULL
COMMENT
'离职去向(原离职备注)'
AFTER
`query`
,
MODIFY
COLUMN
`lzyy`
varchar
(
800
)
CHARACTER
SET
utf8
COLLATE
utf8_general_ci
NULL
DEFAULT
NULL
COMMENT
'原因说明(原离职原因)'
AFTER
`lzbz`
;
ALTER
TABLE
yggl_main_emp
`
ADD COLUMN `
zpgl_zj_id
` int(11) NULL DEFAULT NULL COMMENT '职级字典id' AFTER `
zpgl_gzdd_id
`;
src/main/java/cn/timer/api/bean/yggl/YgglEmpLzyy.java
0 → 100644
View file @
c1c9c63c
package
cn
.
timer
.
api
.
bean
.
yggl
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* 离职原因
*
* @author wgd
* @email 862422848@qq.com
* @date 2022-05-06 15:46:06
*/
@Entity
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Table
(
name
=
"yggl_emp_lzyy"
)
@ApiModel
(
"员工离职原因"
)
public
class
YgglEmpLzyy
extends
Model
<
YgglEmpLzyy
>
{
private
static
final
long
serialVersionUID
=
-
107322833609489522L
;
@Id
@GeneratedValue
@TableId
(
type
=
IdType
.
AUTO
)
@ApiModelProperty
(
value
=
"id 员工编号"
,
example
=
"101"
)
private
Integer
id
;
/**
* 离职原因
*/
@ApiModelProperty
(
value
=
"离职原因 "
,
example
=
"离职原因"
)
private
String
value
;
@ApiModelProperty
(
value
=
"企业Id "
,
example
=
"企业Id"
)
private
Integer
orgCode
;
/**
* 设置:
*/
public
void
setId
(
Integer
id
)
{
this
.
id
=
id
;
}
/**
* 获取:
*/
public
Integer
getId
()
{
return
id
;
}
/**
* 设置:离职原因
*/
public
void
setValue
(
String
value
)
{
this
.
value
=
value
;
}
/**
* 获取:离职原因
*/
public
String
getValue
()
{
return
value
;
}
}
src/main/java/cn/timer/api/bean/yggl/YgglMainLzb.java
View file @
c1c9c63c
...
...
@@ -34,69 +34,69 @@ public class YgglMainLzb extends Model<YgglMainLzb> {
@TableId
(
type
=
IdType
.
AUTO
)
@ApiModelProperty
(
value
=
"员工编号 员工编号"
,
example
=
"101"
)
private
Integer
id
;
@ApiModelProperty
(
value
=
"员工工号 "
,
example
=
"员工工号"
)
private
Integer
empNum
;
@ApiModelProperty
(
value
=
"手机号码 手机号码"
,
example
=
"101"
)
private
String
phone
;
@ApiModelProperty
(
value
=
"密码 "
,
example
=
"密码"
)
private
String
password
;
@ApiModelProperty
(
value
=
"头像 "
,
example
=
"base64来处理头像"
)
private
String
headUrl
;
@ApiModelProperty
(
value
=
"名称 "
,
example
=
"名称"
)
private
String
name
;
@ApiModelProperty
(
value
=
"英文名称 "
,
example
=
"英文名称"
)
private
String
englishName
;
@ApiModelProperty
(
value
=
"性别 1:男;2:女"
,
example
=
"101"
)
private
Integer
sex
;
@ApiModelProperty
(
value
=
"证件类型 0:身份证;1:港澳居民来往内地通行证;2:台湾居民来往大陆通行证;3:外国护照;4:其他"
,
example
=
"101"
)
private
Integer
zjType
;
@ApiModelProperty
(
value
=
"证件号码 "
,
example
=
"证件号码"
)
private
String
zjNum
;
@ApiModelProperty
(
value
=
"身份证有效期 "
,
example
=
"身份证有效到期日"
)
private
Date
sfzyxTime
;
@ApiModelProperty
(
value
=
"出生日期 "
,
example
=
"出生日期"
)
private
Date
birthday
;
@ApiModelProperty
(
value
=
"年龄 年龄"
,
example
=
"101"
)
private
Integer
age
;
@ApiModelProperty
(
value
=
"是否已婚 0:否、1:是"
,
example
=
"101"
)
private
Integer
isMarried
;
@ApiModelProperty
(
value
=
"是否已育 0:否、1:是"
,
example
=
"101"
)
private
Integer
isPregnant
;
@ApiModelProperty
(
value
=
"国家地区 0:中国;1:中国香港;2:中国澳门;3:中国台湾"
,
example
=
"101"
)
private
Integer
area
;
@ApiModelProperty
(
value
=
"民族 56个名族"
,
example
=
"101"
)
private
Integer
mz
;
@ApiModelProperty
(
value
=
"政治面貌 1:中共党员;2:中共预备党员;3共青团员;4:民革党员;5:民盟盟员;6:民建会员;7:民进会员;8:农工党党员;9:致公党党员;10:九三学社社员;11:台盟盟员;12:无党派人士;13:群众"
,
example
=
"101"
)
private
Integer
zzmm
;
// @ApiModelProperty(value="籍贯 省/市/区 例:广东/广州/白云",example="101")
// private Integer jg;
//
//
// @ApiModelProperty(value="户籍城市 省/市/区 例:广东/广州/白云",example="101")
// 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"
)
...
...
@@ -109,109 +109,113 @@ public class YgglMainLzb extends Model<YgglMainLzb> {
private
String
district
;
@ApiModelProperty
(
value
=
"区编号"
)
private
String
districtId
;
@ApiModelProperty
(
value
=
"户口性质 1:城镇户口;2:农村户口;3:居民户口"
,
example
=
"101"
)
private
Integer
hkType
;
@ApiModelProperty
(
value
=
"户籍地址 "
,
example
=
"详细地址"
)
private
String
hkAddress
;
@ApiModelProperty
(
value
=
"QQ QQ"
,
example
=
"101"
)
private
Integer
qq
;
@ApiModelProperty
(
value
=
"微信 "
,
example
=
"微信"
)
private
String
wechat
;
@ApiModelProperty
(
value
=
"个人邮箱 "
,
example
=
"个人邮箱"
)
private
String
email
;
@ApiModelProperty
(
value
=
"血型 "
,
example
=
"血型"
)
private
String
bloodType
;
@ApiModelProperty
(
value
=
"语言 "
,
example
=
"语言"
)
private
String
language
;
@ApiModelProperty
(
value
=
"最高学历 1:小学;2:初中;3:高中;4:中专;5:大专;6:本科;7:研究生;8:硕士;9:博士;"
,
example
=
"101"
)
private
Integer
edu
;
@ApiModelProperty
(
value
=
"专业 "
,
example
=
"专业"
)
private
String
zy
;
@ApiModelProperty
(
value
=
"转正备注 "
,
example
=
"转正备注"
)
private
String
zzRemark
;
@ApiModelProperty
(
value
=
"工作性质 1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘"
,
example
=
"101"
)
private
Integer
jobType
;
@ApiModelProperty
(
value
=
"员工状态 0试用、1正式、2离职中、3已离职"
,
example
=
"1"
)
private
Integer
jobStatus
;
@ApiModelProperty
(
value
=
"入职日期 "
,
example
=
"客户注册后的时间为入职时间"
)
private
Date
rzTime
;
@ApiModelProperty
(
value
=
"试用期 0:无试用期;1:1个月;2:2个月;3:3个月;4:4个月;5:5个月;6:6个月(有试用期显示选项)"
,
example
=
"101"
)
private
Integer
syq
;
@ApiModelProperty
(
value
=
"应转正日期 "
,
example
=
"人事记录要自动转正的日期"
)
private
Date
zzTime
;
@ApiModelProperty
(
value
=
"实际转正日期 "
,
example
=
"人事手动记录要转正的日期"
)
private
Date
sjzzTime
;
@ApiModelProperty
(
value
=
"是否计入考勤 0:否;1:是"
,
example
=
"101"
)
private
Integer
isJrkq
;
@ApiModelProperty
(
value
=
"公司内部工号 就是公司内部自己设置的工号"
,
example
=
"101"
)
private
String
jobNum
;
@ApiModelProperty
(
value
=
"工作地点 "
,
example
=
"工作地点"
)
private
String
workAddress
;
@ApiModelProperty
(
value
=
"工作电话 工作电话"
,
example
=
"101"
)
private
Integer
workPhone
;
@ApiModelProperty
(
value
=
"工作邮箱 "
,
example
=
"工作邮箱"
)
private
String
workEmail
;
@ApiModelProperty
(
value
=
"招聘渠道 招聘渠道应该是活性的"
,
example
=
"101"
)
private
Integer
zpqd
;
@ApiModelProperty
(
value
=
"部门岗位id 部门岗位id"
,
example
=
"101"
)
private
Integer
bmgwId
;
@ApiModelProperty
(
value
=
"组织机构代码 组织机构代码"
,
example
=
"101"
)
private
Integer
orgCode
;
@ApiModelProperty
(
value
=
"微信id "
,
example
=
"UnionID微信系统唯一id"
)
private
String
unionid
;
@ApiModelProperty
(
value
=
"公众号id "
,
example
=
"openid公众号唯一id"
)
private
String
openid
;
@ApiModelProperty
(
value
=
"小程序id "
,
example
=
"mpopenid小程序"
)
private
String
mpopenid
;
@ApiModelProperty
(
value
=
"手机APPid "
,
example
=
"appopenid手机app"
)
private
String
appopenid
;
@ApiModelProperty
(
value
=
"应离职时间 "
,
example
=
"应离职时间"
)
private
Date
lzTime
;
@ApiModelProperty
(
value
=
"实际离职时间 "
,
example
=
"实际离职时间"
)
private
Date
sjlzTime
;
@ApiModelProperty
(
value
=
"
离职原因 "
,
example
=
"离职原因
"
)
@ApiModelProperty
(
value
=
"
原因说明(原离职原因) "
,
example
=
"原因说明(原离职原因)
"
)
private
String
lzyy
;
@ApiModelProperty
(
value
=
"离职
备注"
,
example
=
"离职原因
"
)
@ApiModelProperty
(
value
=
"离职
去向(原离职备注)"
,
example
=
"离职去向(原离职备注)
"
)
private
String
lzbz
;
@ApiModelProperty
(
value
=
"离职原因id"
,
example
=
"离职原因id"
)
private
String
lzyyId
;
//@Transient
//@TableField(exist = false)
//private String workTime;//工龄
@Tolerate
public
YgglMainLzb
()
{
}
}
\ No newline at end of file
}
src/main/java/cn/timer/api/bean/zzgl/ZzglLogDgjl.java
View file @
c1c9c63c
...
...
@@ -2,10 +2,7 @@ package cn.timer.api.bean.zzgl;
import
java.util.Date
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
javax.persistence.*
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
...
...
@@ -31,7 +28,7 @@ import lombok.NoArgsConstructor;
public
class
ZzglLogDgjl
extends
Model
<
ZzglLogDgjl
>
{
/**
* @date 2019年12月9日
* @date 2019年12月9日
* @author 翁东州
* @方法中文名称:
*/
...
...
@@ -61,4 +58,14 @@ public class ZzglLogDgjl extends Model<ZzglLogDgjl> {
@ApiModelProperty
(
value
=
"记录时间 "
,
example
=
"记录时间"
)
private
Date
createTime
;
}
\ No newline at end of file
@ApiModelProperty
(
value
=
"类型 "
,
example
=
"1 转正 2调岗 3离职 4岗位删除员工 5 岗位添加员工"
)
private
Integer
type
;
@ApiModelProperty
(
value
=
"备注 "
,
example
=
"备注"
)
private
String
comment
;
@Transient
private
String
obmgwName
;
@Transient
private
String
nbmgwName
;
}
src/main/java/cn/timer/api/controller/zzgl/service/ZzglBmgwMServiceImpl.java
View file @
c1c9c63c
...
...
@@ -26,7 +26,7 @@ import cn.timer.api.dto.zzgl.UpEmpDeptDto;
/**
* 部门岗位 服务逻辑层
*
*
* @author Tang
*/
@Service
...
...
@@ -34,16 +34,16 @@ public class ZzglBmgwMServiceImpl implements ZzglBmgwMService {
@Autowired
private
ZzglBmgwMMapper
zzglBmgwMMapper
;
@Autowired
private
ZzglMenuMapper
zzglMenuMapper
;
@Autowired
private
YgglMainEmpMapper
ygglMainEmpMapper
;
@Autowired
private
ZzglLogDgjlMapper
zzglLogDgjlMapper
;
/**
* 根据 员工 的 岗位,以及上面所有的部门id,返回integer数组
*/
...
...
@@ -62,7 +62,7 @@ public class ZzglBmgwMServiceImpl implements ZzglBmgwMService {
all
.
add
(
getId
);
return
ListUtil
.
toList
(
all
);
}
//遍历
public
Set
<
Integer
>
empNumupdept2
(
Set
<
Integer
>
lanzi
,
List
<
ZzglBmgwM
>
bmgws
,
Integer
getId
)
{
for
(
ZzglBmgwM
z
:
bmgws
)
{
...
...
@@ -88,23 +88,34 @@ public class ZzglBmgwMServiceImpl implements ZzglBmgwMService {
List
<
Integer
>
empNums
=
new
ArrayList
<
Integer
>();
empNums
.
add
(
empNum
);
YgglMainEmp
ygglMainEmp
=
YgglMainEmp
.
builder
().
build
();
UpdateWrapper
<
YgglMainEmp
>
updateWrapper
=
new
UpdateWrapper
<
YgglMainEmp
>();
updateWrapper
.
set
(
"bmgw_id"
,
dpetId
).
eq
(
"org_code"
,
orgCode
).
in
(
"emp_num"
,
empNum
);
zzglLogDgjlMapper
.
insertbyaddemp
(
empNums
,
empNum
,
dpetId
,
orgCode
,
dpetId
==
null
||
dpetId
==
0
?
"岗位删除员工"
:
upEmpDeptDto
.
getIsdg
()
==
null
?
"岗位添加员工"
:
"员工调岗"
);
String
comm
;
Integer
type
;
if
(
dpetId
==
null
||
dpetId
==
0
){
comm
=
"岗位删除员工"
;
type
=
4
;
}
else
if
(
upEmpDeptDto
.
getIsdg
()
==
null
){
comm
=
"岗位添加员工"
;
type
=
5
;
}
else
{
comm
=
"员工调岗"
;
type
=
2
;
}
zzglLogDgjlMapper
.
insertbyaddemp
(
empNums
,
empNum
,
dpetId
,
null
,
orgCode
,
comm
,
type
);
ygglMainEmp
.
update
(
updateWrapper
);
}
@Override
public
List
<
Integer
>
selectMenuByPostId
(
Integer
id
)
{
List
<
ZzglMenu
>
list
=
zzglMenuMapper
.
selectMenuByPostId
(
id
);
List
<
Integer
>
menuList
=
list
.
stream
().
map
(
ZzglMenu:
:
getMenuId
).
collect
(
Collectors
.
toList
());
return
menuList
;
}
@Override
public
List
<
YgglMainEmp
>
selectOtherlistent
(
Integer
orgCode
,
Integer
id
){
ArrayList
<
Integer
>
list
=
new
ArrayList
<
Integer
>();
...
...
@@ -126,5 +137,5 @@ public class ZzglBmgwMServiceImpl implements ZzglBmgwMService {
}
}
}
src/main/java/cn/timer/api/dao/yggl/YgglEmpLzyyMapper.java
0 → 100644
View file @
c1c9c63c
package
cn
.
timer
.
api
.
dao
.
yggl
;
import
cn.timer.api.bean.yggl.YgglEmpLzyy
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.springframework.stereotype.Repository
;
/**
* 离职原因
*
* @author wgd
* @email 862422848@qq.com
* @date 2022-05-06 15:46:06
*/
@Repository
public
interface
YgglEmpLzyyMapper
extends
BaseMapper
<
YgglEmpLzyy
>
{
}
src/main/java/cn/timer/api/dao/zzgl/ZzglLogDgjlMapper.java
View file @
c1c9c63c
...
...
@@ -2,11 +2,12 @@ package cn.timer.api.dao.zzgl;
import
java.util.List
;
import
io.swagger.models.auth.In
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Repository
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
cn.timer.api.bean.zzgl.ZzglLogDgjl
;
import
cn.timer.api.dto.zzgl.LogDgjlsDto
;
...
...
@@ -23,8 +24,10 @@ public interface ZzglLogDgjlMapper extends BaseMapper<ZzglLogDgjl> {
List
<
ZzglLogDgjlDto
>
selectListdgjl
(
ZzglLogDgjlQueryDto
zglLogDgjlQueryDto
);
void
insertbydeldept
(
@Param
(
"ids"
)
List
<
Integer
>
ids
,
@Param
(
"uid"
)
Integer
uid
);
void
insertbyaddemp
(
@Param
(
"ids"
)
List
<
Integer
>
ids
,
@Param
(
"uid"
)
Integer
uid
,
@Param
(
"gwid"
)
Integer
gwid
,
@Param
(
"orgc"
)
Integer
orgc
,
@Param
(
"comm"
)
String
comm
);
void
insertbyaddemp
(
@Param
(
"ids"
)
List
<
Integer
>
ids
,
@Param
(
"uid"
)
Integer
uid
,
@Param
(
"gwid"
)
Integer
gwid
,
@Param
(
"ogwid"
)
Integer
ogwid
,
@Param
(
"orgc"
)
Integer
orgc
,
@Param
(
"comm"
)
String
comm
,
@Param
(
"type"
)
Integer
type
);
//weng 获取调岗记录
List
<
LogDgjlsDto
>
selectListdgjls
(
IPage
<
LogDgjlsDto
>
page
,
@Param
(
"param"
)
LogDgjlsQueryDto
logDgjlsQueryDto
);
List
<
ZzglLogDgjl
>
selectListByUser
(
@Param
(
"orgCode"
)
Integer
orgCode
,
@Param
(
"empNum"
)
Integer
empNum
);
}
src/main/java/cn/timer/api/dto/yggl/YgzzDto.java
View file @
c1c9c63c
...
...
@@ -19,16 +19,19 @@ public class YgzzDto implements Serializable{
@ApiModelProperty
(
value
=
"工号"
,
example
=
"9527"
)
private
Integer
empNum
;
@ApiModelProperty
(
value
=
"企业id"
,
example
=
"12"
)
private
Integer
orgCode
;
@ApiModelProperty
(
value
=
"应转正时间"
,
example
=
"1999-12-03"
)
private
Date
zzTime
;
@ApiModelProperty
(
value
=
"实际转正时间"
,
example
=
"2019-12-03"
)
private
Date
sjzzTime
;
@ApiModelProperty
(
value
=
"转正原因"
,
example
=
"有梦想"
)
private
String
zzRemark
;
@ApiModelProperty
(
value
=
"岗位"
,
example
=
"有梦想"
)
private
Integer
bmgwId
;
}
src/main/java/cn/timer/api/dto/zzgl/UpEmpDeptDto.java
View file @
c1c9c63c
...
...
@@ -25,11 +25,24 @@ public class UpEmpDeptDto implements Serializable{
@ApiModelProperty
(
value
=
"'职位'"
,
example
=
"''职位''"
)
private
String
post
;
@ApiModelProperty
(
value
=
"员工工号"
,
example
=
"2"
)
private
List
<
Integer
>
empNum
;
@ApiModelProperty
(
value
=
"是否调岗"
,
example
=
"1"
)
private
Integer
isdg
;
@ApiModelProperty
(
value
=
"备注"
,
example
=
"1"
)
private
String
remake
;
@ApiModelProperty
(
value
=
"合同公司id"
,
example
=
"1"
)
private
Integer
zpglCompanyId
;
@ApiModelProperty
(
value
=
"工作地点id"
,
example
=
"1"
)
private
Integer
zpglGzddId
;
@ApiModelProperty
(
value
=
"原职级id"
,
example
=
"1"
)
private
Integer
zpglZjId
;
}
src/main/resources/mapping/yggl/YgglEmpLzyyMapper.xml
0 → 100644
View file @
c1c9c63c
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"cn.timer.api.dao.yggl.YgglEmpLzyyMapper"
>
<!-- 可根据自己的需求,是否要使用 -->
<resultMap
type=
"cn.timer.api.bean.yggl.YgglEmpLzyy"
id=
"ygglEmpLzyyMap"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"value"
column=
"value"
/>
<result
property=
"orgCode"
column=
"org_code"
/>
</resultMap>
<select
id=
"queryObject"
resultType=
"cn.timer.api.bean.yggl.YgglEmpLzyy"
>
select *
from yggl_emp_lzyy
where id = #{value}
</select>
<select
id=
"queryList"
resultType=
"cn.timer.api.bean.yggl.YgglEmpLzyy"
>
select * from yggl_emp_lzyy
<where>
<if
test=
"id != null and id != ''"
>
AND `id` = #{id}
</if>
<if
test=
"value != null and value != ''"
>
AND `value` = #{value}
</if>
</where>
<choose>
<when
test=
"sidx != null and sidx.trim() != ''"
>
order by ${sidx} ${order}
</when>
<otherwise>
order by id desc
</otherwise>
</choose>
<if
test=
"offset != null and limit != null"
>
limit #{offset}, #{limit}
</if>
</select>
<select
id=
"queryTotal"
resultType=
"int"
>
select count(*) from yggl_emp_lzyy
<where>
<if
test=
"id != null and id != ''"
>
AND `id` = #{id}
</if>
<if
test=
"value != null and value != ''"
>
AND `value` = #{value}
</if>
</where>
</select>
<insert
id=
"save"
parameterType=
"cn.timer.api.bean.yggl.YgglEmpLzyy"
>
insert into yggl_emp_lzyy
(`id`,
`value`)
values (#{id},
#{value})
</insert>
<insert
id=
"saveSelective"
parameterType=
"cn.timer.api.bean.yggl.YgglEmpLzyy"
>
insert into yggl_emp_lzyy
(
<if
test=
"id != null"
>
`id`
</if>
<if
test=
"value != null"
>
,`value`
</if>
)
values
(
<if
test=
"id != null"
>
#{id}
</if>
<if
test=
"value != null"
>
,#{value}
</if>
)
</insert>
<insert
id=
"saveList"
parameterType=
"cn.timer.api.bean.yggl.YgglEmpLzyy"
>
insert into yggl_emp_lzyy
(
`id`,
`value`
)
values
<foreach
collection=
"list"
item=
"item"
index=
"index"
separator=
","
>
(
#{item.id},
#{item.value}
)
</foreach>
</insert>
<update
id=
"update"
parameterType=
"cn.timer.api.bean.yggl.YgglEmpLzyy"
>
update yggl_emp_lzyy
<set>
<if
test=
"value != null"
>
`value` = #{value}
</if>
</set>
where id = #{id}
</update>
<delete
id=
"delete"
>
delete
from yggl_emp_lzyy
where id = #{value}
</delete>
<delete
id=
"deleteBatch"
>
delete from yggl_emp_lzyy where id in
<foreach
item=
"id"
collection=
"array"
open=
"("
separator=
","
close=
")"
>
#{id}
</foreach>
</delete>
</mapper>
src/main/resources/mapping/yggl/YgglMainLzbMapper.xml
View file @
c1c9c63c
...
...
@@ -55,6 +55,8 @@
<result
column=
"appopenid"
property=
"appopenid"
/>
<result
column=
"lz_time"
property=
"lzTime"
/>
<result
column=
"sjlz_time"
property=
"sjlzTime"
/>
<result
column=
"lzyy_id"
property=
"lzyyId"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
...
...
@@ -107,9 +109,10 @@
mpopenid,
appopenid,
lz_time,
sjlz_time
sjlz_time,
lzyy_id
</sql>
<sql
id=
"Base_Column_List_Alias"
>
id YgglMainLzb_id,
emp_num YgglMainLzb_emp_num,
...
...
@@ -160,14 +163,15 @@
mpopenid YgglMainLzb_mpopenid,
appopenid YgglMainLzb_appopenid,
lz_time YgglMainLzb_lz_time,
sjlz_time YgglMainLzb_sjlz_time
sjlz_time YgglMainLzb_sjlz_time,
lzyyId YgglMainLzb_lzyy_id,
</sql>
<!-- 查询本月离职人数 -->
<select
id=
"queryDeparture"
resultType=
"cn.timer.api.dto.yggl.YgglCartogramDto"
>
SELECT
EXTRACT(MONTH FROM sjlz_time) AS mouth,
COUNT(emp_num) departureNum
FROM
FROM
yggl_main_lzb
WHERE
org_code=#{orgCode}
...
...
@@ -208,7 +212,7 @@
ORDER BY a.job_status ASC
</select>
<!--
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.yggl.YgglMainLzb">
INSERT INTO yggl_main_lzb
...
...
@@ -593,4 +597,4 @@
-->
</mapper>
\ No newline at end of file
</mapper>
src/main/resources/mapping/zzgl/ZzglLogDgjlMapper.xml
View file @
c1c9c63c
...
...
@@ -12,6 +12,9 @@
<result
column=
"nbmgw_id"
property=
"nbmgwId"
/>
<result
column=
"update_id"
property=
"updateId"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"comment"
property=
"comment"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
...
...
@@ -21,7 +24,8 @@
a.obmgw_id,
a.nbmgw_id,
a.update_id,
a.create_time
a.create_time,
a.type
</sql>
<sql
id=
"Base_Column_List_Alias"
>
...
...
@@ -75,13 +79,13 @@
LEFT JOIN yggl_main_emp c ON a.emp_num = c.emp_num
LEFT JOIN zzgl_bmgw_m b ON a.obmgw_id = b.id
LEFT JOIN zzgl_bmgw_m e ON a.nbmgw_id = e.id
LEFT JOIN yggl_main_emp d ON a.update_id = d.emp_num
LEFT JOIN yggl_main_emp d ON a.update_id = d.emp_num
<where>
a.org_code = #{param.orgCode} AND c.org_code = #{param.orgCode} AND b.org_code = #{param.orgCode}
AND e.org_code = #{param.orgCode} AND d.org_code = #{param.orgCode}
<if
test=
"null != param.query and param.query != ''"
>
and (c.name like CONCAT('%',#{param.query},'%') or
a.emp_num like CONCAT('%',#{param.query},'%') or
a.emp_num like CONCAT('%',#{param.query},'%') or
c.phone like CONCAT('%',#{param.query},'%'))
</if>
<if
test=
"param.deptIdList != null"
>
...
...
@@ -108,33 +112,47 @@
</insert>
<insert
id=
"insertbyaddemp"
>
insert into zzgl_log_dgjl
(create_time,emp_num,nbmgw_id,obmgw_id,org_code,update_id,comment)
select NOW(),emp_num,#{gwid},bmgw_id,org_code,#{uid},#{comm} from
(create_time,emp_num,nbmgw_id,obmgw_id,org_code,update_id,comment,type)
select NOW(),emp_num,#{gwid},
<if
test=
"ogwid==null"
>
bmgw_id
</if>
<if
test=
"ogwid!=null"
>
#{ogwid}
</if>
,org_code,#{uid},#{comm},#{type} from
yggl_main_emp where org_code=#{orgc} and emp_num in
<foreach
item=
"item"
index=
"index"
collection=
"ids"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</insert>
<!-- <insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.zzgl.ZzglLogDgjl">
INSERT INTO zzgl_log_dgjl <trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != orgCode'> org_code, </if> <if test ='null != empNum'>
emp_num, </if> <if test ='null != obmgwId'> obmgw_id, </if> <if test ='null
!= nbmgwId'> nbmgw_id, </if> <if test ='null != updateId'> update_id, </if>
<if test ='null != createTime'> create_time </if> </trim> <trim prefix="values
(" suffix=")" suffixOverrides=","> <if test ='null != orgCode'> #{orgCode},
</if> <if test ='null != empNum'> #{empNum}, </if> <if test ='null != obmgwId'>
#{obmgwId}, </if> <if test ='null != nbmgwId'> #{nbmgwId}, </if> <if test
='null != updateId'> #{updateId}, </if> <if test ='null != createTime'> #{createTime}
</if> </trim> </insert> <delete id="delete" > DELETE FROM zzgl_log_dgjl WHERE
id = #{id} </delete> <update id="update" parameterType="cn.timer.api.bean.zzgl.ZzglLogDgjl">
UPDATE zzgl_log_dgjl <set> <if test ='null != orgCode'>org_code = #{orgCode},</if>
<if test ='null != empNum'>emp_num = #{empNum},</if> <if test ='null != obmgwId'>obmgw_id
= #{obmgwId},</if> <if test ='null != nbmgwId'>nbmgw_id = #{nbmgwId},</if>
<if test ='null != updateId'>update_id = #{updateId},</if> <if test ='null
!= createTime'>create_time = #{createTime}</if> </set> WHERE id = #{id} </update>
<select id="load" resultMap="BaseResultMap"> SELECT <include refid="Base_Column_List"
/> FROM zzgl_log_dgjl WHERE id = #{id} </select> <select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" /> FROM zzgl_log_dgjl LIMIT #{offset},
#{pageSize} </select> <select id="pageListCount" resultType="java.lang.Integer">
<!-- <insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.zzgl.ZzglLogDgjl">
INSERT INTO zzgl_log_dgjl <trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != orgCode'> org_code, </if> <if test ='null != empNum'>
emp_num, </if> <if test ='null != obmgwId'> obmgw_id, </if> <if test ='null
!= nbmgwId'> nbmgw_id, </if> <if test ='null != updateId'> update_id, </if>
<if test ='null != createTime'> create_time </if> </trim> <trim prefix="values
(" suffix=")" suffixOverrides=","> <if test ='null != orgCode'> #{orgCode},
</if> <if test ='null != empNum'> #{empNum}, </if> <if test ='null != obmgwId'>
#{obmgwId}, </if> <if test ='null != nbmgwId'> #{nbmgwId}, </if> <if test
='null != updateId'> #{updateId}, </if> <if test ='null != createTime'> #{createTime}
</if> </trim> </insert> <delete id="delete" > DELETE FROM zzgl_log_dgjl WHERE
id = #{id} </delete> <update id="update" parameterType="cn.timer.api.bean.zzgl.ZzglLogDgjl">
UPDATE zzgl_log_dgjl <set> <if test ='null != orgCode'>org_code = #{orgCode},</if>
<if test ='null != empNum'>emp_num = #{empNum},</if> <if test ='null != obmgwId'>obmgw_id
= #{obmgwId},</if> <if test ='null != nbmgwId'>nbmgw_id = #{nbmgwId},</if>
<if test ='null != updateId'>update_id = #{updateId},</if> <if test ='null
!= createTime'>create_time = #{createTime}</if> </set> WHERE id = #{id} </update>
<select id="load" resultMap="BaseResultMap"> SELECT <include refid="Base_Column_List"
/> FROM zzgl_log_dgjl WHERE id = #{id} </select> <select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" /> FROM zzgl_log_dgjl LIMIT #{offset},
#{pageSize} </select> <select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1) FROM zzgl_log_dgjl </select> -->
</mapper>
\ No newline at end of file
<select
id=
"selectListByUser"
resultType=
"cn.timer.api.bean.zzgl.ZzglLogDgjl"
>
select z.*,zm.`name` as obmgwName,zmn.`name`as nbmgwName from zzgl_log_dgjl z
LEFT JOIN zzgl_bmgw_m zm on zm.id=z.obmgw_id
LEFT JOIN zzgl_bmgw_m zmn on zmn.id=z.nbmgw_id
where z.type in (1,2,3,6,7) and z.emp_num =#{empNum} and z.org_code=#{orgCode}
order by z.create_time desc
</select>
</mapper>
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