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")