From ce7a6656b40a6d811f834693056b9c50c7e61dca Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 23 Nov 2021 13:49:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A3=8E=E9=99=A9=E7=A8=8B?= =?UTF-8?q?=E5=BA=A6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardComplianceAssessResultController.java | 2 +- .../entity/SarInterpretationNationalStandard.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index d83b45e4..0c6639cd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -79,7 +79,7 @@ public class SarStandardComplianceAssessResultController { if (eo.getPosition() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,risk_degree"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java index 94acce6d..ea428fed 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java @@ -93,4 +93,9 @@ public class SarInterpretationNationalStandard extends BaseEntity { @TableField("ID") private String id; + + @ApiModelProperty(value = "风险程度") + @TableField("risk_degree") + private String riskDegree; + }