diff --git a/aucma-base/src/main/java/com/aucma/base/controller/RecordDnbInstantController.java b/aucma-base/src/main/java/com/aucma/base/controller/RecordDnbInstantController.java index 31fc78d..abaaf32 100644 --- a/aucma-base/src/main/java/com/aucma/base/controller/RecordDnbInstantController.java +++ b/aucma-base/src/main/java/com/aucma/base/controller/RecordDnbInstantController.java @@ -42,6 +42,7 @@ public class RecordDnbInstantController extends BaseController { @GetMapping("/list") public TableDataInfo list(RecordDnbInstant recordDnbInstant) { startPage(); + System.out.println(recordDnbInstant); List list = recordDnbInstantService.selectRecordDnbInstantList(recordDnbInstant); return getDataTable(list); } diff --git a/aucma-base/src/main/java/com/aucma/base/domain/TreeSelects.java b/aucma-base/src/main/java/com/aucma/base/domain/TreeSelects.java index 0bde6e8..d8b3c4f 100644 --- a/aucma-base/src/main/java/com/aucma/base/domain/TreeSelects.java +++ b/aucma-base/src/main/java/com/aucma/base/domain/TreeSelects.java @@ -23,6 +23,8 @@ public class TreeSelects implements Serializable /** 节点名称 */ private String label; + private String code; + /** 子节点 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children; @@ -41,6 +43,7 @@ public class TreeSelects implements Serializable public TreeSelects(BaseMonitorInfo baseMonitorInfo){ this.id = baseMonitorInfo.getObjId(); this.label = baseMonitorInfo.getMonitorName(); + this.code = baseMonitorInfo.getMonitorCode(); this.children = baseMonitorInfo.getChildren().stream().map(TreeSelects::new).collect(Collectors.toList()); } @@ -51,6 +54,14 @@ public class TreeSelects implements Serializable this.children = menu.getChildren().stream().map(TreeSelects::new).collect(Collectors.toList()); } + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + public Long getId() { return id; diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ReportPointDnbController.java b/aucma-report/src/main/java/com/aucma/report/controller/ReportPointDnbController.java index cf8d893..f18464b 100644 --- a/aucma-report/src/main/java/com/aucma/report/controller/ReportPointDnbController.java +++ b/aucma-report/src/main/java/com/aucma/report/controller/ReportPointDnbController.java @@ -42,6 +42,7 @@ public class ReportPointDnbController extends BaseController { @GetMapping("/list" ) public TableDataInfo list(ReportPointDnb reportPointDnb) { startPage(); + System.out.println(reportPointDnb); List list = reportPointDnbService.selectReportPointDnbList(reportPointDnb); return getDataTable(list); }