From e443ee61644009313ea4e3e12fd14a9bd8a79b9b Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 30 Aug 2021 15:25:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E7=BB=93=E6=9E=9C--=E6=8A=80=E6=9C=AF=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E7=BB=93=E6=9E=9C=20=E6=9F=A5=E7=9C=8B=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=A0=87=E5=87=86=E5=8F=B7/=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=90=8D=E7=A7=B0=E5=92=8C=E5=85=B7=E4=BD=93=E7=AB=A0?= =?UTF-8?q?=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...arStandardComplianceAssessResultController.java | 14 ++++++++++++++ .../entity/InterpretationEO.java | 12 ++++++++++++ 2 files changed, 26 insertions(+) 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 5399ee19..592055b9 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 @@ -192,6 +192,13 @@ public class SarStandardComplianceAssessResultController { if (eo.getPosition() == 1) { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); + //如果查询条件里标准编号不为空，查询 + if (eo.getStandNumber() != null) queryWrapper.like("STAND_NUMBER",eo.getStandNumber()); + //如果查询条件里标准名称不为空，查询 + if (eo.getStandName() != null) queryWrapper.like("STAND_NAME",eo.getStandName()); + //如果查询条件里具体章条不为空，查询 + if (eo.getSpecificItem() != null) queryWrapper.like("specific_item",eo.getSpecificItem()); + if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); @@ -201,6 +208,13 @@ public class SarStandardComplianceAssessResultController { } else { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); + //如果查询条件里标准编号不为空，查询 + if (eo.getStandNumber() != null) queryWrapper.like("STAND_NUMBER",eo.getStandNumber()); + //如果查询条件里标准名称不为空，查询 + if (eo.getStandName() != null) queryWrapper.like("STAND_NAME",eo.getStandName()); + //如果查询条件里具体章条不为空，查询 + if (eo.getSpecificItem() != null) queryWrapper.like("specific_item",eo.getSpecificItem()); + if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java index 2b92fb9a..3b085c4e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java @@ -21,6 +21,18 @@ public class InterpretationEO { @TableField("STAND_ID") private String standId; + @ApiModelProperty(value = "标准编号") + @TableField("STAND_NUMBER") + private String standNumber; + + @ApiModelProperty(value = "标准名称") + @TableField("STAND_NAME") + private String standName; + + @ApiModelProperty(value = "具体章条") + @TableField("specific_item") + private String specificItem; + @ApiModelProperty(value = "评估时间") @TableField("INTERPRETATION_TIME") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")