Commit 475a9974 by huluobin

update

parent b37c49c9
......@@ -63,7 +63,7 @@ public interface AdminFeign {
@PostMapping(value = "/api/ReportTable/GetTechnicianPage",
consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,
produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
AdminResult<AdminTechnicianScoreResp> getTechnicianPage(@RequestBody GetTechnicianPageRequest request);
AdminResult<AdminPage<AdminTechnicianScoreResp>> getTechnicianPage(@RequestBody GetTechnicianPageRequest request);
@PostMapping(value = "/api/salary/AchievementsPersonaResultPageApi",
consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,
......@@ -110,7 +110,7 @@ public interface AdminFeign {
}
@Override
public AdminResult<AdminTechnicianScoreResp> getTechnicianPage(GetTechnicianPageRequest request) {
public AdminResult<AdminPage<AdminTechnicianScoreResp>> getTechnicianPage(GetTechnicianPageRequest request) {
return new AdminResult<>();
}
......
......@@ -71,7 +71,7 @@ public class DashboardController {
@ApiOperation("美甲师信息")
@PostMapping("/no_getTechnicianPage")
public JsonResult<AdminTechnicianScoreResp> getTechnicianPage(@RequestBody GetTechnicianPageRequest request) {
public JsonResult<AdminPage<AdminTechnicianScoreResp>> getTechnicianPage(@RequestBody GetTechnicianPageRequest request) {
return JsonResult.success(adminFeign.getTechnicianPage(request).getData());
}
......
......@@ -130,12 +130,11 @@ public class AdminFeignTest {
.sord("asc")
//在职
.status(1)
.technician_id(127)
.build();
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()));
AdminResult<AdminTechnicianScoreResp> result = adminFeign.getTechnicianPage(request);
AdminResult<AdminPage<AdminTechnicianScoreResp>> result = adminFeign.getTechnicianPage(request);
log.info(JsonUtilByJackson.writeValueAsString(result));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment