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
5e0dd5a0
Commit
5e0dd5a0
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
b392e0d4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
6 deletions
+31
-6
src/main/java/cn/timer/api/controller/crm/CrmController.java
+11
-5
src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
+10
-1
src/main/java/cn/timer/api/controller/yggl/YgglController.java
+6
-0
src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java
+4
-0
No files found.
src/main/java/cn/timer/api/controller/crm/CrmController.java
View file @
5e0dd5a0
...
@@ -251,11 +251,17 @@ public class CrmController {
...
@@ -251,11 +251,17 @@ public class CrmController {
List
<
Map
<
String
,
Object
>>
managers
=
new
ArrayList
<
Map
<
String
,
Object
>>();
List
<
Map
<
String
,
Object
>>
managers
=
new
ArrayList
<
Map
<
String
,
Object
>>();
for
(
CrmBusinessGroupMember
crmBusinessGroupManager
:
crmBusinessGroupManagers
)
{
for
(
CrmBusinessGroupMember
crmBusinessGroupManager
:
crmBusinessGroupManagers
)
{
Integer
empNum
=
crmBusinessGroupManager
.
getEmpNum
();
Integer
empNum
=
crmBusinessGroupManager
.
getEmpNum
();
String
name
=
getEmpName
(
orgCode
,
empNum
);
Map
<
String
,
Object
>
map
=
new
HashMap
<
String
,
Object
>();
YgglMainEmp
emps
=
YgglMainEmp
.
builder
().
build
()
map
.
put
(
"name"
,
name
);
.
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getEmpNum
,
empNum
)
map
.
put
(
"empNum"
,
empNum
);
.
eq
(
YgglMainEmp:
:
getOrgCode
,
orgCode
).
select
(
YgglMainEmp:
:
getName
,
YgglMainEmp:
:
getHeadUrl
));
managers
.
add
(
map
);
if
(
emps
!=
null
)
{
String
name
=
getEmpName
(
orgCode
,
empNum
);
Map
<
String
,
Object
>
map
=
new
HashMap
<
String
,
Object
>();
map
.
put
(
"name"
,
name
);
map
.
put
(
"empNum"
,
empNum
);
managers
.
add
(
map
);
}
}
}
crmBusinessGroup
.
setManagers
(
managers
);
crmBusinessGroup
.
setManagers
(
managers
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
View file @
5e0dd5a0
...
@@ -16,6 +16,7 @@ import cn.timer.api.bean.spmk.SpmkApprovalTemplate;
...
@@ -16,6 +16,7 @@ import cn.timer.api.bean.spmk.SpmkApprovalTemplate;
import
cn.timer.api.bean.spmk.SpmkApprovalTemplateG
;
import
cn.timer.api.bean.spmk.SpmkApprovalTemplateG
;
import
cn.timer.api.bean.spmk.SpmkApproveDetail
;
import
cn.timer.api.bean.spmk.SpmkApproveDetail
;
import
cn.timer.api.bean.spmk.SpmkApproveExecuteRecord
;
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.SpmkCustomApproval
;
import
cn.timer.api.config.annotation.UserBean
;
import
cn.timer.api.config.annotation.UserBean
;
import
cn.timer.api.controller.zzgl.service.ZzglBmgwMService
;
import
cn.timer.api.controller.zzgl.service.ZzglBmgwMService
;
...
@@ -91,6 +92,11 @@ public class SpmkServiceImpl implements SpmkService{
...
@@ -91,6 +92,11 @@ public class SpmkServiceImpl implements SpmkService{
public
SpmkApproveDetailDto
selectApproveDetailByAsId
(
Integer
asId
)
{
public
SpmkApproveDetailDto
selectApproveDetailByAsId
(
Integer
asId
)
{
// TODO Auto-generated method stub
// TODO Auto-generated method stub
SpmkApproveDetail
ad
=
spmkApproveDetailMapper
.
selectOne
(
new
QueryWrapper
<
SpmkApproveDetail
>().
lambda
().
eq
(
SpmkApproveDetail:
:
getApproveSummaryId
,
asId
));
SpmkApproveDetail
ad
=
spmkApproveDetailMapper
.
selectOne
(
new
QueryWrapper
<
SpmkApproveDetail
>().
lambda
().
eq
(
SpmkApproveDetail:
:
getApproveSummaryId
,
asId
));
SpmkApproveSummary
sum
=
null
;
if
(
ad
!=
null
)
{
sum
=
SpmkApproveSummary
.
builder
().
id
(
ad
.
getApproveSummaryId
()).
build
().
selectById
();
}
SpmkApproveDetailDto
adD
=
SpmkApproveDetailDto
.
builder
().
build
();
SpmkApproveDetailDto
adD
=
SpmkApproveDetailDto
.
builder
().
build
();
if
(
ad
==
null
)
{
if
(
ad
==
null
)
{
return
null
;
return
null
;
...
@@ -102,7 +108,10 @@ public class SpmkServiceImpl implements SpmkService{
...
@@ -102,7 +108,10 @@ public class SpmkServiceImpl implements SpmkService{
adD
.
setRouter
(
ObjectUtil
.
deserialize
(
ad
.
getRouter
()));
adD
.
setRouter
(
ObjectUtil
.
deserialize
(
ad
.
getRouter
()));
adD
.
setFlowChildren
(
ObjectUtil
.
deserialize
(
ad
.
getFlowChildren
()));
adD
.
setFlowChildren
(
ObjectUtil
.
deserialize
(
ad
.
getFlowChildren
()));
adD
.
setApproveExecuteRecord
(
listAer
);
adD
.
setApproveExecuteRecord
(
listAer
);
if
(
sum
!=
null
)
{
adD
.
setEmpNum
(
sum
.
getEmpNum
());
adD
.
setSts
(
sum
.
getSts
());
}
return
adD
;
return
adD
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/yggl/YgglController.java
View file @
5e0dd5a0
...
@@ -1881,7 +1881,13 @@ public class YgglController {
...
@@ -1881,7 +1881,13 @@ public class YgglController {
YgglMainEmp
.
builder
().
headUrl
(
modifyavatardto
.
getAvatar_path
()).
build
().
update
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getOrgCode
,
userBean
.
getOrgCode
())
YgglMainEmp
.
builder
().
headUrl
(
modifyavatardto
.
getAvatar_path
()).
build
().
update
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getOrgCode
,
userBean
.
getOrgCode
())
.
eq
(
YgglMainEmp:
:
getEmpNum
,
userBean
.
getEmpNum
()));
.
eq
(
YgglMainEmp:
:
getEmpNum
,
userBean
.
getEmpNum
()));
QyzxEmpLogin
.
builder
().
headUrl
(
modifyavatardto
.
getAvatar_path
()).
build
().
update
(
new
QueryWrapper
<
QyzxEmpLogin
>().
lambda
().
eq
(
QyzxEmpLogin:
:
getOrgId
,
userBean
.
getOrgCode
())
.
eq
(
QyzxEmpLogin:
:
getPhone
,
userBean
.
getQyzxEmpLogin
().
getPhone
()));
return
ResultUtil
.
success
(
"上传成功"
);
return
ResultUtil
.
success
(
"上传成功"
);
}
}
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java
View file @
5e0dd5a0
...
@@ -42,5 +42,9 @@ public class SpmkApproveDetailDto {
...
@@ -42,5 +42,9 @@ public class SpmkApproveDetailDto {
@ApiModelProperty
(
value
=
"审批执行记录 "
,
example
=
"审批执行记录"
)
@ApiModelProperty
(
value
=
"审批执行记录 "
,
example
=
"审批执行记录"
)
private
List
<
SpmkApproveExecuteRecord
>
approveExecuteRecord
;
private
List
<
SpmkApproveExecuteRecord
>
approveExecuteRecord
;
private
Integer
empNum
;
private
Integer
sts
;
}
}
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