luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix

master
zhaoqifeng 6 years ago
parent
3494dba942 dfb0afb088
commit
3141ec1efb
2 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java
  2. 6
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

4
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java
View File

@ -51,7 +51,7 @@ public class ResiGroupController {
* @return Result<List < GroupAuditedResultDTO>> * @return Result<List < GroupAuditedResultDTO>>
*/ */
@PostMapping("groupsingrid") @PostMapping("groupsingrid")
public Result<List<GroupsInGridResultDTO>> getGroupsInGrid(GroupAuditedFromDTO formDTO) { public Result<List<GroupsInGridResultDTO>> getGroupsInGrid(@RequestBody GroupAuditedFromDTO formDTO) {
ValidatorUtils.validateEntity(formDTO); ValidatorUtils.validateEntity(formDTO);
return resiGroupService.getGroupsInGrid(formDTO); return resiGroupService.getGroupsInGrid(formDTO);
} }
@ -63,7 +63,7 @@ public class ResiGroupController {
* @return Result<GovGroupSummarizeResultDTO> * @return Result<GovGroupSummarizeResultDTO>
*/ */
@PostMapping("getgroupsummarize") @PostMapping("getgroupsummarize")
public Result<GovGroupSummarizeResultDTO> getGroupSummarize(GovGroupSummarizeFromDTO formDTO) { public Result<GovGroupSummarizeResultDTO> getGroupSummarize(@RequestBody GovGroupSummarizeFromDTO formDTO) {
ValidatorUtils.validateEntity(formDTO); ValidatorUtils.validateEntity(formDTO);
return resiGroupService.getGroupSummarize(formDTO); return resiGroupService.getGroupSummarize(formDTO);
} }

6
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
View File

@ -225,7 +225,7 @@ public class ResiGroupController {
* @return Result<List < GroupAuditedResultDTO>> * @return Result<List < GroupAuditedResultDTO>>
*/ */
@PostMapping("audited") @PostMapping("audited")
public Result<List<GroupAuditedResultDTO>> audited(GroupAuditedFromDTO formDTO) { public Result<List<GroupAuditedResultDTO>> audited(@RequestBody GroupAuditedFromDTO formDTO) {
ValidatorUtils.validateEntity(formDTO); ValidatorUtils.validateEntity(formDTO);
return resiGroupService.audited(formDTO); return resiGroupService.audited(formDTO);
} }
@ -237,7 +237,7 @@ public class ResiGroupController {
* @return Result<List < GroupAuditedResultDTO>> * @return Result<List < GroupAuditedResultDTO>>
*/ */
@PostMapping("groupsingrid") @PostMapping("groupsingrid")
public Result<List<GroupsInGridResultDTO>> getGroupsInGrid(GroupAuditedFromDTO formDTO) { public Result<List<GroupsInGridResultDTO>> getGroupsInGrid(@RequestBody GroupAuditedFromDTO formDTO) {
ValidatorUtils.validateEntity(formDTO); ValidatorUtils.validateEntity(formDTO);
return resiGroupService.getGroupsInGrid(formDTO); return resiGroupService.getGroupsInGrid(formDTO);
} }
@ -249,7 +249,7 @@ public class ResiGroupController {
* @return Result<GovGroupSummarizeResultDTO> * @return Result<GovGroupSummarizeResultDTO>
*/ */
@PostMapping("getgovgroupsummarize") @PostMapping("getgovgroupsummarize")
public Result<GovGroupSummarizeResultDTO> getGovGroupSummarize(GovGroupSummarizeFromDTO formDTO) { public Result<GovGroupSummarizeResultDTO> getGovGroupSummarize(@RequestBody GovGroupSummarizeFromDTO formDTO) {
return resiGroupService.getGovGroupSummarize(formDTO); return resiGroupService.getGovGroupSummarize(formDTO);
} }

Write Preview
Loading…
Cancel
Save