From 41dbca2772245008e0d517d7527a5713c447ecfb Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 21 Feb 2022 16:43:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=20=E5=85=A5=E5=BA=93=20=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ndardComplianceAssessResultController.java | 17 ++++++++++++-- .../SarStandardComplianceProductAssess.java | 3 +++ .../entity/unCountDTO.java | 6 +++++ ...ardComplianceProductAssessServiceImpl.java | 9 ++++++-- ...rStandardComplianceProductAssessMapper.xml | 22 +++++++++---------- 5 files changed, 42 insertions(+), 15 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 f48a9162..4f206705 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 @@ -184,6 +184,7 @@ public class SarStandardComplianceAssessResultController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("STAND_ID", eo.getStandId()); queryWrapper.eq("product_id", eo.getProductId()); + queryWrapper.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.eq("no_involve","").or().isNull("no_involve")); queryWrapper.isNotNull("research_completion_time"); queryWrapper.orderByAsc("product_name"); queryWrapper.orderByAsc("standard_item"); @@ -196,11 +197,23 @@ public class SarStandardComplianceAssessResultController { QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("STAND_ID", eo.getStandId()); queryWrapper1.eq("product_id", eo.getProductId()); - queryWrapper1.ne("research_compliance",""); + queryWrapper1.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.ne("research_compliance","").or().isNotNull("research_compliance")); queryWrapper1.orderByAsc("product_name"); queryWrapper1.orderByAsc("standard_item"); IPage page1 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper1); - map.put("fit",page1); + Page p2=new Page(); + BeanUtils.copyProperties(page1,p2); + p2.setRecords(page1.getRecords()); + p2.setTotal(page1.getTotal()); + map.put("fit",p2); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("STAND_ID", eo.getStandId()); + queryWrapper2.eq("product_id", eo.getProductId()); + queryWrapper2.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.ne("no_involve","").and(sarStandardComplianceProductAssessQueryWrapper1 -> sarStandardComplianceProductAssessQueryWrapper1.isNotNull("no_involve"))); + queryWrapper2.orderByAsc("product_name"); + queryWrapper2.orderByAsc("standard_item"); + IPage page2 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper2); + map.put("noFit",page2); return Result.success(map); } 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 4a862f68..cfe5d436 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 @@ -132,6 +132,9 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @TableField("evaluation_people_name") private String evaluationPeopleName; + @ApiModelProperty(value = "不涉及理由") + @TableField("no_involve") + private String noInvolve; private String id; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/unCountDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/unCountDTO.java index b4969e90..7239ca17 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/unCountDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/unCountDTO.java @@ -23,6 +23,10 @@ public class unCountDTO { private String unCount; + private String unCounts; + + private String allCounts; + private Long current; private Long size; @@ -32,4 +36,6 @@ public class unCountDTO { private String type; + private String noInvolveReason; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java index 3bd6dce7..66f8647f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java @@ -32,8 +32,13 @@ public class SarStandardComplianceProductAssessServiceImpl extends ServiceImpl selectPages(Page pages, unCountDTO productAssess) { IPage productAssessIPage= new Page<>(); List res=sarStandardComplianceProductAssessDao.selectPages(pages.getCurrent(),pages.getSize(),productAssess); - res.forEach(unCountDTO -> {unCountDTO.setStandId(productAssess.getStandId()); - unCountDTO.setType(productAssess.getType());}); + res.forEach(unCountDTO -> { + unCountDTO.setStandId(productAssess.getStandId()); + unCountDTO.setType(productAssess.getType()); + if (unCountDTO.getAllCounts().equals(unCountDTO.getUnCounts())){ + unCountDTO.setUnCount("-1"); + } + }); productAssessIPage.setRecords(res); List a=sarStandardComplianceProductAssessDao.selectPagesCount(productAssess); if (null!=a) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml index 2d87fea1..7fb8f557 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml @@ -5,26 +5,27 @@ @@ -45,15 +46,14 @@ LEFT JOIN ts_user ON ts_user.USID = sar_stand_project_library.project_manager WHERE sar_stand_project_library.project_number in (SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId}) - AND CLOSE_STATE = '1' - and product_name like concat(concat('%',#{product.productName}),'%') + and sar_stand_project_library.project_name like concat(concat('%',#{product.productName}),'%') and project_number like concat(concat('%',#{product.productId}),'%') group by - PRODUCT_NAME, + sar_stand_project_library.project_name, sar_stand_project_library.project_group, sar_stand_project_library.product_line, sar_stand_project_library.project_manager, @@ -61,6 +61,6 @@ sar_stand_project_library.id, ts_user.UNAME ORDER BY - PRODUCT_NAME ASC + sar_stand_project_library.project_name ASC