From 241d14bac408c533b072a069842bdc8674529836 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Mon, 16 Aug 2021 15:01:03 +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=E6=B5=81=E7=A8=8B=20=E9=A1=B9=E7=9B=AE=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E7=BB=93=E6=9E=9C=E5=90=8E=E5=8F=B0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?bug~~~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ndardComplianceAssessResultController.java | 19 ++++++++++++++++--- .../SarStandardComplianceProductAssess.java | 4 ++++ .../SarStandardComplianceProductAssessEO.java | 4 ++++ .../entity/SarStandardsInfoEO.java | 3 +++ 4 files changed, 27 insertions(+), 3 deletions(-) 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 36f7e23c..b2f044cb 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 @@ -59,13 +59,16 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandApplicationType() == 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,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } + if (eo.getType() != null && !eo.getType().trim().equals("")) { + queryWrapper.like("type",eo.getType().trim()); + } IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -75,13 +78,16 @@ 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,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } + if (eo.getType() != null && !eo.getType().trim().equals("")) { + queryWrapper.like("type",eo.getType().trim()); + } IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -90,13 +96,16 @@ public class SarStandardComplianceAssessResultController { }else{ 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,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } + if (eo.getType() != null && !eo.getType().trim().equals("")) { + queryWrapper.like("type",eo.getType().trim()); + } IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -158,9 +167,13 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.select("*"); + + if (eo.getType() !=null) queryWrapper.like("type",eo.getType()); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); +// queryWrapper.last("WHERE type = " + eo.getType()); IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index 0fff5ae4..c6496762 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -117,6 +117,10 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @TableField("clause_name") private String clauseName; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; + private String id; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java index 53b782b2..c91afc56 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java @@ -18,6 +18,10 @@ public class SarStandardComplianceProductAssessEO{ @TableField("STAND_ID") private String standId; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; + @ApiModelProperty(value = "'项目名称'") private String productName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java index 9981e6ee..4fb0c327 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java @@ -25,6 +25,9 @@ public class SarStandardsInfoEO { @ApiModelProperty(value = "国内1，国外2") private Integer position=1; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; @ApiModelProperty("页数") private Integer current=1;