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
4230bab3
Commit
4230bab3
authored
5 years ago
by
邓实川
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
http://120.24.24.239:8082/8timerv2/8timerapiv200.git
into dsc
parents
d6ba16c2
0f814de1
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
479 additions
and
13 deletions
+479
-13
src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
+4
-0
src/main/java/cn/timer/api/bean/zzgl/ZzglBmgwM.java
+20
-0
src/main/java/cn/timer/api/config/enuminterface/YgEnumInterface.java
+3
-3
src/main/java/cn/timer/api/controller/qyzx/QyzxController.java
+1
-1
src/main/java/cn/timer/api/controller/spmk/SpmkServiceImpl.java
+4
-0
src/main/java/cn/timer/api/controller/yggl/YgglController.java
+99
-8
src/main/java/cn/timer/api/dao/spmk/SpmkApproveExecuteRecordMapper.java
+5
-0
src/main/java/cn/timer/api/dto/spmk/Relation.java
+13
-0
src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java
+1
-1
src/main/java/cn/timer/api/dto/yggl/LoginerChargeDto.java
+42
-0
src/main/resources/mapping/spmk/SpmkApprovalGMapper.out.xml
+0
-0
src/main/resources/mapping/spmk/SpmkApproveExecuteRecordMapper.xml
+156
-0
src/main/resources/mapping/spmk/SpmkExecutorMapper.xml
+131
-0
No files found.
src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
View file @
4230bab3
...
...
@@ -194,4 +194,7 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
@Transient
@TableField
(
exist
=
false
)
private
String
error
;
//错误信息提示
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/bean/zzgl/ZzglBmgwM.java
View file @
4230bab3
...
...
@@ -10,6 +10,7 @@ import javax.persistence.GeneratedValue;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
com.alibaba.druid.sql.ast.expr.SQLCaseExpr.Item
;
import
com.baomidou.mybatisplus.annotation.FieldFill
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
...
...
@@ -99,4 +100,22 @@ public class ZzglBmgwM extends Model<ZzglBmgwM> {
});
}
}
// 遍历,获取该员工所有上级部门(weng)
public
static
void
getUpDepts
(
ArrayList
<
Integer
>
list
,
Integer
objId
,
List
<
ZzglBmgwM
>
objs
)
{
//7290
if
(
objId
!=
null
)
{
for
(
ZzglBmgwM
bmgw
:
objs
)
{
Integer
bmgwId
=
bmgw
.
getId
();
Integer
upId
=
bmgw
.
getUpId
();
if
(
bmgwId
.
equals
(
objId
))
{
list
.
add
(
bmgwId
);
if
(
upId
!=
null
)
{
getUpDepts
(
list
,
upId
,
objs
);
}
}
}
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/config/enuminterface/YgEnumInterface.java
View file @
4230bab3
...
...
@@ -49,8 +49,8 @@ public interface YgEnumInterface {
*/
@Getter
enum
YgJobType
implements
YgEnumInterface
{
QUANZHI
(
1
,
"全"
),
SHIXI
(
2
,
"实习"
),
JIANZHI
(
3
,
"兼"
),
LWPQ
(
4
,
"劳务派遣"
),
LAOWU
(
5
,
"劳务"
),
PAIQIAN
(
6
,
"派遣"
),
WAIBAO
(
7
,
"外包"
),
TUIXIU
(
8
,
"退休"
);
QUANZHI
(
0
,
"全"
),
SHIXI
(
1
,
"实习"
),
JIANZHI
(
2
,
"兼"
),
LWPQ
(
3
,
"劳务派遣"
),
LAOWU
(
4
,
"劳务"
),
PAIQIAN
(
5
,
"派遣"
),
WAIBAO
(
6
,
"外包"
),
TUIXIU
(
7
,
"退休"
);
private
Integer
type
;
...
...
@@ -76,7 +76,7 @@ public interface YgEnumInterface {
*/
@Getter
enum
jobStatus
implements
YgEnumInterface
{
SHIYONG
(
1
,
"试用"
),
ZHENSHI
(
2
,
"正式"
),
LIZHIZHONG
(
3
,
"离职中"
),
YILIZHI
(
4
,
"已离职"
);
SHIYONG
(
0
,
"试用"
),
ZHENSHI
(
1
,
"正式"
),
LIZHIZHONG
(
2
,
"离职中"
),
YILIZHI
(
3
,
"已离职"
);
private
Integer
type
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/qyzx/QyzxController.java
View file @
4230bab3
...
...
@@ -230,7 +230,7 @@ public class QyzxController {
@ApiOperation
(
value
=
"显示常用的企业开票资料"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
public
Result
<
QyzxInvoiceUsual
>
invoiceusual
(
@CurrentUser
UserBean
userBean
)
{
QyzxInvoiceUsual
one
=
new
LambdaQueryChainWrapper
<
QyzxInvoiceUsual
>(
qyzxInvoiceUsualMapper
).
eq
(
QyzxInvoiceUsual:
:
getOrgCode
,
userBean
.
getOrgCode
()).
one
();
return
ResultUtil
.
data
(
one
,
"
企业超管头像和电话号码
"
);
return
ResultUtil
.
data
(
one
,
"
显示常用的企业开票资料
"
);
}
/**
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/spmk/SpmkServiceImpl.java
View file @
4230bab3
...
...
@@ -35,6 +35,7 @@ import cn.timer.api.bean.spmk.SpmkApprovalG;
import
cn.timer.api.bean.spmk.SpmkApprovalTemplate
;
import
cn.timer.api.bean.spmk.SpmkApprovalTemplateG
;
import
cn.timer.api.bean.spmk.SpmkApproveDetail
;
import
cn.timer.api.bean.spmk.SpmkApproveExecuteRecord
;
import
cn.timer.api.bean.spmk.SpmkApproveSummary
;
import
cn.timer.api.bean.spmk.SpmkCustomApproval
;
import
cn.timer.api.bean.spmk.SpmkExecutor
;
...
...
@@ -861,11 +862,14 @@ public class SpmkServiceImpl {
SpmkApproveDetail
ad
=
spmkApproveDetailMapper
.
selectOne
(
new
QueryWrapper
<
SpmkApproveDetail
>().
lambda
().
eq
(
SpmkApproveDetail:
:
getApproveSummaryId
,
id
));
SpmkApproveDetailDto
adD
=
SpmkApproveDetailDto
.
builder
().
build
();
List
<
SpmkApproveExecuteRecord
>
listAer
=
spmkApproveExecuteRecordMapper
.
selectListByAsId
(
id
);
BeanUtil
.
copyProperties
(
ad
,
adD
,
"requestData"
,
"froms"
,
"router"
,
"spmkApproveExecuteRecord"
);
adD
.
setRequestData
(
ObjectUtil
.
unserialize
(
ad
.
getRequestData
()));
adD
.
setFroms
(
ObjectUtil
.
unserialize
(
ad
.
getFroms
()));
adD
.
setRouter
((
Router
)
ObjectUtil
.
unserialize
(
ad
.
getRouter
()));
adD
.
setListFlowChildren
((
List
<
FlowChildren
>)
ObjectUtil
.
unserialize
(
ad
.
getFlowChildren
()));
adD
.
setListSpmkApproveExecuteRecord
(
listAer
);
return
ResultUtil
.
data
(
adD
,
"操作成功!"
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/yggl/YgglController.java
View file @
4230bab3
...
...
@@ -8,7 +8,8 @@ package cn.timer.api.controller.yggl;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.Iterator
;
...
...
@@ -77,6 +78,7 @@ import cn.timer.api.dao.yggl.YgglMainLzbMapper;
import
cn.timer.api.dao.zzgl.ZzglBmgwMMapper
;
import
cn.timer.api.dto.yggl.AddygdaDto
;
import
cn.timer.api.dto.yggl.LoginerChargeDto
;
import
cn.timer.api.dto.yggl.LzbQueryDto
;
import
cn.timer.api.dto.yggl.LzygQueryDto
;
import
cn.timer.api.dto.yggl.YgAreaDto
;
...
...
@@ -132,7 +134,96 @@ public class YgglController {
// weng(民族)
@Autowired
private
YgMzDtoMapper
ygMzDtoMapper
;
/**
* 获取登录人的相关信息
*
* @param
* @return
*/
@GetMapping
(
value
=
"/loginmessage"
)
@ApiOperation
(
value
=
" 获取登录人的相关信息"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
68
)
public
Result
<
YgglMainEmp
>
loginmessage
(
@CurrentUser
UserBean
userBean
)
{
Integer
empNum
=
userBean
.
getEmpNum
();
Integer
orgCode
=
userBean
.
getOrgCode
();
YgglMainEmp
ygglMainEmp
=
new
LambdaQueryChainWrapper
<
YgglMainEmp
>(
ygglMainEmpMapper
)
.
select
(
YgglMainEmp:
:
getBmgwId
,
YgglMainEmp:
:
getName
,
YgglMainEmp:
:
getRzTime
,
YgglMainEmp:
:
getEmpNum
).
eq
(
YgglMainEmp:
:
getEmpNum
,
empNum
).
eq
(
YgglMainEmp:
:
getOrgCode
,
orgCode
).
one
();
Integer
gw
=
ygglMainEmp
.
getBmgwId
();
ZzglBmgwM
bmid
=
new
LambdaQueryChainWrapper
<
ZzglBmgwM
>(
zzglBmgwMMapper
).
select
(
ZzglBmgwM:
:
getUpId
).
eq
(
ZzglBmgwM:
:
getId
,
gw
).
eq
(
ZzglBmgwM:
:
getOrgCode
,
orgCode
).
one
();
ygglMainEmp
.
setUnionid
(
bmid
.
toString
());
return
ResultUtil
.
data
(
ygglMainEmp
,
"部门id返回字段为unionid"
);
}
/**
* 获取登录人和上级主管的empNum和名称
*
* @param
* @return
*/
@GetMapping
(
value
=
"/loginerChargers"
)
@ApiOperation
(
value
=
" 获取登录人和上级主管的empNum和名称"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
69
)
public
Result
<
List
<
LoginerChargeDto
>>
loginerChargers
(
@CurrentUser
UserBean
userBean
)
{
Integer
orgCode
=
userBean
.
getOrgCode
();
ArrayList
<
Integer
>
list
=
new
ArrayList
<
Integer
>();
Integer
empNum
=
userBean
.
getEmpNum
();
List
<
LoginerChargeDto
>
loginerCharges
=
new
ArrayList
<
LoginerChargeDto
>();
Integer
gw
=
empNumConfirm
(
orgCode
,
empNum
).
getBmgwId
();
List
<
ZzglBmgwM
>
zzglBmgwMs
=
new
LambdaQueryChainWrapper
<
ZzglBmgwM
>(
zzglBmgwMMapper
).
eq
(
ZzglBmgwM:
:
getOrgCode
,
orgCode
).
list
();
//获取该员工的上级部门id 的数组list
ZzglBmgwM
.
getUpDepts
(
list
,
gw
,
zzglBmgwMs
);
List
<
Integer
>
leaderList
=
new
ArrayList
<
Integer
>();
for
(
Integer
zzglId
:
list
)
{
for
(
ZzglBmgwM
zzglBmgwM
:
zzglBmgwMs
)
{
if
(
zzglId
.
equals
(
zzglBmgwM
.
getId
())
&&
zzglBmgwM
.
getLeader
()!=
null
)
{
leaderList
.
add
(
zzglBmgwM
.
getLeader
());
}
}
}
List
<
YgglMainEmp
>
ygglMainEmps
=
empNumsConfirm
(
orgCode
,
leaderList
);
List
<
LoginerChargeDto
>
loginerChargeDtos
=
new
ArrayList
<
LoginerChargeDto
>();
for
(
YgglMainEmp
m
:
ygglMainEmps
)
{
loginerChargeDtos
.
add
(
new
LoginerChargeDto
(
m
.
getEmpNum
(),
m
.
getName
()));
}
Collections
.
reverse
(
loginerChargeDtos
);
return
ResultUtil
.
data
(
loginerChargeDtos
,
"获取上级部门的部门id"
);
}
//根据传来的empNum获取该人员信息,没有则传全部
public
List
<
YgglMainEmp
>
empNumsConfirm
(
Integer
orgCode
,
List
<
Integer
>
empNumList
)
{
List
<
YgglMainEmp
>
all
=
new
LambdaQueryChainWrapper
<
YgglMainEmp
>(
ygglMainEmpMapper
).
eq
(
YgglMainEmp:
:
getOrgCode
,
orgCode
).
list
();
List
<
YgglMainEmp
>
ygglMainEmps
=
new
ArrayList
<
YgglMainEmp
>();
if
(
empNumList
.
size
()!=
0
)
{
for
(
Integer
empNum
:
empNumList
)
{
all
.
stream
().
filter
(
item
->
empNum
.
equals
(
item
.
getEmpNum
())).
forEach
(
action
->{
ygglMainEmps
.
add
(
action
);
});
}
}
else
{
ygglMainEmps
.
addAll
(
all
);
}
return
ygglMainEmps
;
}
//根据传来的empNum获取该人员信息
public
YgglMainEmp
empNumConfirm
(
Integer
orgCode
,
Integer
empNum
)
{
YgglMainEmp
one
=
new
LambdaQueryChainWrapper
<
YgglMainEmp
>(
ygglMainEmpMapper
).
eq
(
YgglMainEmp:
:
getOrgCode
,
orgCode
).
eq
(
YgglMainEmp:
:
getEmpNum
,
empNum
).
one
();
return
one
;
}
/**
* 获取企业到期时间和版本
*
* @param
* @return
*/
@GetMapping
(
value
=
"/endtimeVersion"
)
@ApiOperation
(
value
=
"获取企业到期时间和版本"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
70
)
public
Result
<
YgglMainEmp
>
endtimeVersion
(
@CurrentUser
UserBean
userBean
)
{
return
ResultUtil
.
error
();
}
/**
* 获取员工档案
*
...
...
@@ -321,7 +412,7 @@ public class YgglController {
ygQueryDto
.
getTotalPage
()
==
null
?
10
:
ygQueryDto
.
getTotalPage
());
QueryWrapper
<
YgglMainEmp
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
select
(
"name"
,
"emp_num"
,
"bmgw_id"
,
"rz_time"
,
"job_type"
,
"phone"
,
"job_status"
)
.
ne
(
"job_status"
,
4
).
eq
(
"org_code"
,
orgCode
).
eq
(
t
!=
null
&&
t
>
-
1
,
"job_type"
,
t
)
.
ne
(
"job_status"
,
YgEnumInterface
.
jobStatus
.
YILIZHI
.
getType
()
).
eq
(
"org_code"
,
orgCode
).
eq
(
t
!=
null
&&
t
>
-
1
,
"job_type"
,
t
)
.
eq
(
j
!=
null
&&
j
>
-
1
,
"job_status"
,
j
).
in
(!
bList
.
isEmpty
(),
"bmgw_id"
,
bList
)
.
and
(!
StrUtil
.
hasBlank
(
q
),
wq
->
wq
.
like
(
"name"
,
q
).
or
().
like
(
"phone"
,
q
));
...
...
@@ -1392,7 +1483,7 @@ public class YgglController {
UpdateWrapper
<
YgglMainLzb
>
updateWrapper1
=
new
UpdateWrapper
<
YgglMainLzb
>();
updateWrapper1
.
eq
(
"emp_num"
,
lzygQueryDto
.
getEmpNum
());
YgglMainEmp
.
builder
().
empNum
(
lzygQueryDto
.
getEmpNum
()).
jobStatus
(
3
).
build
().
update
(
updateWrapper
);
YgglMainLzb
.
builder
().
jobStatus
(
3
).
lzTime
(
lzygQueryDto
.
getLzTime
()).
lzyy
(
lzygQueryDto
.
getLzyy
())
YgglMainLzb
.
builder
().
jobStatus
(
YgEnumInterface
.
jobStatus
.
LIZHIZHONG
.
getType
()
).
lzTime
(
lzygQueryDto
.
getLzTime
()).
lzyy
(
lzygQueryDto
.
getLzyy
())
.
lzbz
(
lzygQueryDto
.
getLzbz
()).
build
().
update
(
updateWrapper1
);
// 删除员工表
// ygglMainEmp.deleteById();
...
...
@@ -1418,8 +1509,8 @@ public class YgglController {
updateWrapper
.
eq
(
"emp_num"
,
lzygQueryDto
.
getEmpNum
());
UpdateWrapper
<
YgglMainLzb
>
updateWrapper1
=
new
UpdateWrapper
<
YgglMainLzb
>();
updateWrapper1
.
eq
(
"emp_num"
,
lzygQueryDto
.
getEmpNum
());
YgglMainEmp
.
builder
().
empNum
(
lzygQueryDto
.
getEmpNum
()).
jobStatus
(
4
).
build
().
update
(
updateWrapper
);
YgglMainLzb
.
builder
().
empNum
(
lzygQueryDto
.
getEmpNum
()).
jobStatus
(
4
).
sjlzTime
(
new
Date
()).
build
()
YgglMainEmp
.
builder
().
empNum
(
lzygQueryDto
.
getEmpNum
()).
jobStatus
(
YgEnumInterface
.
jobStatus
.
YILIZHI
.
getType
()
).
build
().
update
(
updateWrapper
);
YgglMainLzb
.
builder
().
empNum
(
lzygQueryDto
.
getEmpNum
()).
jobStatus
(
YgEnumInterface
.
jobStatus
.
YILIZHI
.
getType
()
).
sjlzTime
(
new
Date
()).
build
()
.
update
(
updateWrapper1
);
// 查询该员工的关联表
QueryWrapper
<
QyzxEmpEntAsso
>
queryWrapper1
=
new
QueryWrapper
<
QyzxEmpEntAsso
>();
...
...
@@ -1442,7 +1533,7 @@ public class YgglController {
public
Result
<
Void
>
fqlz
(
@CurrentUser
UserBean
userBean
,
@RequestBody
LzygQueryDto
lzygQueryDto
)
{
UpdateWrapper
<
YgglMainEmp
>
updateWrapper
=
new
UpdateWrapper
<
YgglMainEmp
>();
updateWrapper
.
eq
(
"emp_num"
,
lzygQueryDto
.
getEmpNum
());
YgglMainEmp
.
builder
().
jobStatus
(
2
).
build
().
update
(
updateWrapper
);
YgglMainEmp
.
builder
().
jobStatus
(
YgEnumInterface
.
jobStatus
.
ZHENSHI
.
getType
()
).
build
().
update
(
updateWrapper
);
QueryWrapper
<
YgglMainLzb
>
queryWrapper
=
new
QueryWrapper
<
YgglMainLzb
>();
queryWrapper
.
eq
(
"emp_num"
,
lzygQueryDto
.
getEmpNum
());
// 删除离职表
...
...
@@ -1760,7 +1851,7 @@ public class YgglController {
ageList
.
add
(
new
YgKVDto
(
entry
.
getKey
().
toString
(),
entry
.
getValue
().
toString
()));
}
// 在职
Integer
zaizhi
=
jobStatus
.
get
(
1
).
intValue
()
+
jobStatus
.
get
(
2
).
intValue
();
Integer
zaizhi
=
jobStatus
.
get
(
YgEnumInterface
.
jobStatus
.
ZHENSHI
.
getType
()).
intValue
()
+
jobStatus
.
get
(
YgEnumInterface
.
jobStatus
.
SHIYONG
.
getType
()
).
intValue
();
// 本月新入职
Integer
xinruzhi
=
workage
.
get
(
"本月新入职"
).
intValue
();
// 本月离职
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/spmk/SpmkApproveExecuteRecordMapper.java
View file @
4230bab3
package
cn
.
timer
.
api
.
dao
.
spmk
;
import
java.util.List
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Repository
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
...
...
@@ -14,4 +17,6 @@ import cn.timer.api.bean.spmk.SpmkApproveExecuteRecord;
@Repository
public
interface
SpmkApproveExecuteRecordMapper
extends
BaseMapper
<
SpmkApproveExecuteRecord
>
{
List
<
SpmkApproveExecuteRecord
>
selectListByAsId
(
@Param
(
"id"
)
Integer
id
);
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/spmk/Relation.java
View file @
4230bab3
...
...
@@ -19,6 +19,19 @@ public class Relation implements Serializable{
*/
private
static
final
long
serialVersionUID
=
1L
;
/**
* 向上id
*/
private
Integer
upward
;
/**
* 向下id
*/
private
Integer
down
;
/**
* empty
*/
private
Integer
empty
;
/**
* 类型
*/
private
String
type
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java
View file @
4230bab3
...
...
@@ -41,6 +41,6 @@ public class SpmkApproveDetailDto {
private
List
<
FlowChildren
>
listFlowChildren
;
@ApiModelProperty
(
value
=
"审批执行记录 "
,
example
=
"审批执行记录"
)
private
SpmkApproveExecuteRecord
s
pmkApproveExecuteRecord
;
private
List
<
SpmkApproveExecuteRecord
>
listS
pmkApproveExecuteRecord
;
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/yggl/LoginerChargeDto.java
0 → 100644
View file @
4230bab3
/**
* @date 2020年4月26日
* @author 翁东州
* @方法中文名称:
*/
package
cn
.
timer
.
api
.
dto
.
yggl
;
import
java.io.Serializable
;
import
java.util.Date
;
import
cn.timer.api.dto.yggl.LzbDto.LzbDtoBuilder
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
/**
* @date 2020年4月26日
* @author 翁东州
* @方法中文名称:
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public
class
LoginerChargeDto
implements
Serializable
{
/**
* @date 2020年4月26日
* @author 翁东州
* @方法中文名称:
*/
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
value
=
"主管empNum"
,
example
=
"9688"
)
private
Integer
leaderEmpNum
;
@ApiModelProperty
(
value
=
"主管名称"
,
example
=
"李大力"
)
private
String
charge
;
}
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/spmk/SpmkApprovalGMapper.out.xml
deleted
100644 → 0
View file @
d6ba16c2
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/spmk/SpmkApproveExecuteRecordMapper.xml
0 → 100644
View file @
4230bab3
<?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.spmk.SpmkApproveExecuteRecordMapper"
>
<resultMap
id=
"BaseResultMap"
type=
"cn.timer.api.bean.spmk.SpmkApproveExecuteRecord"
>
<id
column=
"id"
property=
"id"
/>
<result
column=
"approve_summary_id"
property=
"approveSummaryId"
/>
<result
column=
"name"
property=
"name"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"sts"
property=
"sts"
/>
<result
column=
"create_time"
property=
"createTime"
/>
</resultMap>
<resultMap
id=
"BaseResultMapDto"
type=
"cn.timer.api.bean.spmk.SpmkApproveExecuteRecord"
>
<id
column=
"id"
property=
"id"
/>
<result
column=
"approve_summary_id"
property=
"approveSummaryId"
/>
<result
column=
"name"
property=
"name"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"sts"
property=
"sts"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<collection
column=
"SpmkExecutor_id"
property=
"spmkExecutors"
ofType=
"cn.timer.api.bean.spmk.SpmkExecutor"
resultMap=
"cn.timer.api.dao.spmk.SpmkExecutorMapper.BaseResultMap"
columnPrefix=
"SpmkExecutor_"
>
</collection>
</resultMap>
<sql
id=
"Base_Column_List"
>
id,
approve_summary_id,
name,
type,
sts,
create_time
</sql>
<sql
id=
"Base_Column_List_a"
>
a.id,
a.approve_summary_id,
a.name,
a.type,
a.sts,
a.create_time
</sql>
<sql
id=
"Base_Column_List_Alias_b"
>
b.id SpmkExecutor_id,
b.approve_execute_record_id SpmkExecutor_approve_execute_record_id,
b.emp_num SpmkExecutor_emp_num,
b.executor_name SpmkExecutor_executor_name,
b.operator_header_url SpmkExecutor_operator_header_url,
b.opinion SpmkExecutor_opinion,
b.sts SpmkExecutor_sts,
b.create_time SpmkExecutor_create_time
</sql>
<sql
id=
"Base_Column_List_Alias"
>
id SpmkApproveExecuteRecord_id,
approve_summary_id SpmkApproveExecuteRecord_approve_summary_id,
name SpmkApproveExecuteRecord_name,
type SpmkApproveExecuteRecord_type,
sts SpmkApproveExecuteRecord_sts,
create_time SpmkApproveExecuteRecord_create_time
</sql>
<select
id=
"selectListByAsId"
resultMap=
"BaseResultMapDto"
>
SELECT
<include
refid=
"Base_Column_List_a"
/>
,
<include
refid=
"Base_Column_List_Alias_b"
/>
FROM spmk_approve_execute_record a
LEFT JOIN spmk_executor b ON a.id = b.approve_execute_record_id
WHERE a.approve_summary_id = #{id}
ORDER BY a.id, b.id
</select>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkApproveExecuteRecord">
INSERT INTO spmk_approve_execute_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != approveSummaryId'>
approve_summary_id,
</if>
<if test ='null != name'>
name,
</if>
<if test ='null != type'>
type,
</if>
<if test ='null != sts'>
sts,
</if>
<if test ='null != createTime'>
create_time
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != approveSummaryId'>
#{approveSummaryId},
</if>
<if test ='null != name'>
#{name},
</if>
<if test ='null != type'>
#{type},
</if>
<if test ='null != sts'>
#{sts},
</if>
<if test ='null != createTime'>
#{createTime}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_approve_execute_record
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkApproveExecuteRecord">
UPDATE spmk_approve_execute_record
<set>
<if test ='null != approveSummaryId'>approve_summary_id = #{approveSummaryId},</if>
<if test ='null != name'>name = #{name},</if>
<if test ='null != type'>type = #{type},</if>
<if test ='null != sts'>sts = #{sts},</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 spmk_approve_execute_record
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_approve_execute_record
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_approve_execute_record
</select>
-->
</mapper>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/spmk/SpmkExecutorMapper.xml
0 → 100644
View file @
4230bab3
<?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.spmk.SpmkExecutorMapper"
>
<resultMap
id=
"BaseResultMap"
type=
"cn.timer.api.bean.spmk.SpmkExecutor"
>
<id
column=
"id"
property=
"id"
/>
<result
column=
"approve_execute_record_id"
property=
"approveExecuteRecordId"
/>
<result
column=
"emp_num"
property=
"empNum"
/>
<result
column=
"executor_name"
property=
"executorName"
/>
<result
column=
"operator_header_url"
property=
"operatorHeaderUrl"
/>
<result
column=
"opinion"
property=
"opinion"
/>
<result
column=
"sts"
property=
"sts"
/>
<result
column=
"create_time"
property=
"createTime"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
id,
approve_execute_record_id,
emp_num,
executor_name,
operator_header_url,
opinion,
sts,
create_time
</sql>
<sql
id=
"Base_Column_List_Alias"
>
id SpmkExecutor_id,
approve_execute_record_id SpmkExecutor_approve_execute_record_id,
emp_num SpmkExecutor_emp_num,
executor_name SpmkExecutor_executor_name,
operator_header_url SpmkExecutor_operator_header_url,
opinion SpmkExecutor_opinion,
sts SpmkExecutor_sts,
create_time SpmkExecutor_create_time
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkExecutor">
INSERT INTO spmk_executor
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != approveExecuteRecordId'>
approve_execute_record_id,
</if>
<if test ='null != empNum'>
emp_num,
</if>
<if test ='null != executorName'>
executor_name,
</if>
<if test ='null != operatorHeaderUrl'>
operator_header_url,
</if>
<if test ='null != opinion'>
opinion,
</if>
<if test ='null != sts'>
sts,
</if>
<if test ='null != createTime'>
create_time
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != approveExecuteRecordId'>
#{approveExecuteRecordId},
</if>
<if test ='null != empNum'>
#{empNum},
</if>
<if test ='null != executorName'>
#{executorName},
</if>
<if test ='null != operatorHeaderUrl'>
#{operatorHeaderUrl},
</if>
<if test ='null != opinion'>
#{opinion},
</if>
<if test ='null != sts'>
#{sts},
</if>
<if test ='null != createTime'>
#{createTime}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_executor
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkExecutor">
UPDATE spmk_executor
<set>
<if test ='null != approveExecuteRecordId'>approve_execute_record_id = #{approveExecuteRecordId},</if>
<if test ='null != empNum'>emp_num = #{empNum},</if>
<if test ='null != executorName'>executor_name = #{executorName},</if>
<if test ='null != operatorHeaderUrl'>operator_header_url = #{operatorHeaderUrl},</if>
<if test ='null != opinion'>opinion = #{opinion},</if>
<if test ='null != sts'>sts = #{sts},</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 spmk_executor
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_executor
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_executor
</select>
-->
</mapper>
\ No newline at end of file
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