Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fulixin
dsk-operate-sys-cscec
Commits
87c60fb1
Commit
87c60fb1
authored
Dec 27, 2023
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
-
Signed-off-by:
Administrator
<
admin@example.com
>
parent
523251bb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
JskCompanyRelationTableV1Dto.java
...java/com/dsk/jsk/domain/JskCompanyRelationTableV1Dto.java
+1
-1
CompanyRelationTableV1Service.java
...va/com/dsk/jsk/service/CompanyRelationTableV1Service.java
+2
-2
No files found.
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1Dto.java
View file @
87c60fb1
...
...
@@ -70,7 +70,7 @@ public class JskCompanyRelationTableV1Dto extends BasePage {
/**
* 集团Id
*/
private
Integer
combineId
;
private
String
combineId
;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/CompanyRelationTableV1Service.java
View file @
87c60fb1
...
...
@@ -36,7 +36,7 @@ public class CompanyRelationTableV1Service {
public
TableDataInfo
detailPage
(
JskCompanyRelationTableV1Dto
dto
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
null
;
if
(
dto
.
getCompanyType
().
equals
(
3
))
{
if
(
dto
.
getCompanyType
().
equals
(
3
)
||
dto
.
getCompanyType
().
equals
(
4
)
)
{
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/consultancy/combineDetailPage"
,
BeanUtil
.
beanToMap
(
dto
,
false
,
false
));
}
else
{
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/consultancy/detailPage"
,
BeanUtil
.
beanToMap
(
dto
,
false
,
false
));
...
...
@@ -69,7 +69,7 @@ public class CompanyRelationTableV1Service {
}
public
TableDataInfo
combinePage
(
JskCompanyRelationTableV1Dto
dto
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/consultancy/combinePage"
,
BeanUtil
.
beanToMap
(
dto
,
false
,
false
));
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/consultancy/combine
Member
Page"
,
BeanUtil
.
beanToMap
(
dto
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
}
}
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