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
131442a4
Commit
131442a4
authored
4 years ago
by
邓实川
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修复
parent
210d3c10
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
src/main/java/cn/timer/api/bean/qyzx/businessService/QyzxUseRecord.java
+3
-0
src/main/java/cn/timer/api/controller/dzht/DzhtController2.java
+1
-0
src/main/java/cn/timer/api/controller/qyzx/QyzxAuthController.java
+2
-4
No files found.
src/main/java/cn/timer/api/bean/qyzx/businessService/QyzxUseRecord.java
View file @
131442a4
...
...
@@ -93,4 +93,7 @@ public class QyzxUseRecord extends Model<QyzxUseRecord> {
@ApiModelProperty
(
value
=
"流程id(合同) "
,
example
=
""
)
private
String
flowId
;
@ApiModelProperty
(
value
=
"合同名称 "
,
example
=
""
)
private
String
flowName
;
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/dzht/DzhtController2.java
View file @
131442a4
...
...
@@ -511,6 +511,7 @@ public class DzhtController2 {
qyzxUseRecord
.
setScene
(
"签署中"
);
qyzxUseRecord
.
setPmid
(
2
);
qyzxUseRecord
.
setFlowId
(
flowId
);
qyzxUseRecord
.
setFlowName
(
f
);
qyzxUseRecord
.
insert
();
quantity
.
setRemainder
(
remainder
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/qyzx/QyzxAuthController.java
View file @
131442a4
...
...
@@ -150,7 +150,6 @@ public class QyzxAuthController {
QyzxAuthAccount
qyzxAuthAccount
=
QyzxAuthAccount
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
QyzxAuthAccount
>().
lambda
().
eq
(
QyzxAuthAccount:
:
getOrgCode
,
userBean
.
getOrgCode
()));
// 主账号
map
.
put
(
"mainAccount"
,
qyzxAuthAccount
);
list
.
add
(
map
);
List
<
QyzxAuthChild
>
childs
=
QyzxAuthChild
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
QyzxAuthChild
>()
.
lambda
().
eq
(
QyzxAuthChild:
:
getOrgCode
,
userBean
.
getOrgCode
()).
ne
(
QyzxAuthChild:
:
getIsDel
,
1
));
// 子账号
...
...
@@ -164,9 +163,8 @@ public class QyzxAuthController {
YgglMainEmp:
:
getPhone
,
YgglMainEmp:
:
getEmpNum
));
// 子账号员工信息
list2
.
add
(
ygglMainEmp
);
}
Map
<
String
,
Object
>
map2
=
new
HashedMap
<
String
,
Object
>();
map2
.
put
(
"childAccount"
,
list2
);
list
.
add
(
map2
);
map
.
put
(
"childAccount"
,
list2
);
list
.
add
(
map
);
return
ResultUtil
.
data
(
list
,
"查询成功"
);
...
...
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