Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
gogirl-miniapp-backend
Commits
475a9974
Commit
475a9974
authored
Aug 20, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
b37c49c9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
AdminFeign.java
...main/java/com/gogirl/infrastructure/feign/AdminFeign.java
+2
-2
DashboardController.java
.../com/gogirl/interfaces/dashboard/DashboardController.java
+1
-1
AdminFeignTest.java
.../java/com/gogirl/infrastructure/feign/AdminFeignTest.java
+1
-2
No files found.
src/main/java/com/gogirl/infrastructure/feign/AdminFeign.java
View file @
475a9974
...
@@ -63,7 +63,7 @@ public interface AdminFeign {
...
@@ -63,7 +63,7 @@ public interface AdminFeign {
@PostMapping
(
value
=
"/api/ReportTable/GetTechnicianPage"
,
@PostMapping
(
value
=
"/api/ReportTable/GetTechnicianPage"
,
consumes
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
,
consumes
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
AdminResult
<
Admin
TechnicianScoreResp
>
getTechnicianPage
(
@RequestBody
GetTechnicianPageRequest
request
);
AdminResult
<
Admin
Page
<
AdminTechnicianScoreResp
>
>
getTechnicianPage
(
@RequestBody
GetTechnicianPageRequest
request
);
@PostMapping
(
value
=
"/api/salary/AchievementsPersonaResultPageApi"
,
@PostMapping
(
value
=
"/api/salary/AchievementsPersonaResultPageApi"
,
consumes
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
,
consumes
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
,
...
@@ -110,7 +110,7 @@ public interface AdminFeign {
...
@@ -110,7 +110,7 @@ public interface AdminFeign {
}
}
@Override
@Override
public
AdminResult
<
Admin
TechnicianScoreResp
>
getTechnicianPage
(
GetTechnicianPageRequest
request
)
{
public
AdminResult
<
Admin
Page
<
AdminTechnicianScoreResp
>
>
getTechnicianPage
(
GetTechnicianPageRequest
request
)
{
return
new
AdminResult
<>();
return
new
AdminResult
<>();
}
}
...
...
src/main/java/com/gogirl/interfaces/dashboard/DashboardController.java
View file @
475a9974
...
@@ -71,7 +71,7 @@ public class DashboardController {
...
@@ -71,7 +71,7 @@ public class DashboardController {
@ApiOperation
(
"美甲师信息"
)
@ApiOperation
(
"美甲师信息"
)
@PostMapping
(
"/no_getTechnicianPage"
)
@PostMapping
(
"/no_getTechnicianPage"
)
public
JsonResult
<
Admin
TechnicianScoreResp
>
getTechnicianPage
(
@RequestBody
GetTechnicianPageRequest
request
)
{
public
JsonResult
<
Admin
Page
<
AdminTechnicianScoreResp
>
>
getTechnicianPage
(
@RequestBody
GetTechnicianPageRequest
request
)
{
return
JsonResult
.
success
(
adminFeign
.
getTechnicianPage
(
request
).
getData
());
return
JsonResult
.
success
(
adminFeign
.
getTechnicianPage
(
request
).
getData
());
}
}
...
...
src/test/java/com/gogirl/infrastructure/feign/AdminFeignTest.java
View file @
475a9974
...
@@ -130,12 +130,11 @@ public class AdminFeignTest {
...
@@ -130,12 +130,11 @@ public class AdminFeignTest {
.
sord
(
"asc"
)
.
sord
(
"asc"
)
//在职
//在职
.
status
(
1
)
.
status
(
1
)
.
technician_id
(
127
)
.
build
();
.
build
();
request
.
setDate_utc
(
Lists
.
newArrayList
(
ZonedDateTime
.
of
(
LocalDateTime
.
of
(
2020
,
6
,
30
,
0
,
0
),
ZoneOffset
.
UTC
).
toString
(),
request
.
setDate_utc
(
Lists
.
newArrayList
(
ZonedDateTime
.
of
(
LocalDateTime
.
of
(
2020
,
6
,
30
,
0
,
0
),
ZoneOffset
.
UTC
).
toString
(),
ZonedDateTime
.
of
(
LocalDateTime
.
of
(
2020
,
7
,
30
,
0
,
0
),
ZoneOffset
.
UTC
).
toString
()));
ZonedDateTime
.
of
(
LocalDateTime
.
of
(
2020
,
7
,
30
,
0
,
0
),
ZoneOffset
.
UTC
).
toString
()));
AdminResult
<
Admin
TechnicianScoreResp
>
result
=
adminFeign
.
getTechnicianPage
(
request
);
AdminResult
<
Admin
Page
<
AdminTechnicianScoreResp
>
>
result
=
adminFeign
.
getTechnicianPage
(
request
);
log
.
info
(
JsonUtilByJackson
.
writeValueAsString
(
result
));
log
.
info
(
JsonUtilByJackson
.
writeValueAsString
(
result
));
}
}
...
...
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