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 d2be75a6..9b921b33 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 @@ -193,8 +193,8 @@ public class SarStandardComplianceAssessResultController { p1.setTotal(page.getTotal()); map.put("unfit",p1); QueryWrapper queryWrapper1 = new QueryWrapper<>(); - queryWrapper.eq("STAND_ID", eo.getStandId()); - queryWrapper.eq("product_id", eo.getProductId()); + queryWrapper1.eq("STAND_ID", eo.getStandId()); + queryWrapper1.eq("product_id", eo.getProductId()); queryWrapper1.ne("research_compliance",""); queryWrapper1.orderByAsc("product_name"); queryWrapper1.orderByAsc("standard_item"); 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 43469b23..62cf51da 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 @@ -8,11 +8,15 @@ select PRODUCT_NAME as productName,sar_stand_project_library.project_group as projectGroup, sar_stand_project_library.id as sarId, sar_stand_project_library.product_line as productLine,sar_stand_project_library.project_number as productId, - sar_stand_project_library.project_manager as projectManager,ts_user.UNAME as uName,count(*) unCount from - sar_stand_unqualified - left join sar_stand_project_library on sar_stand_unqualified.product_id = sar_stand_project_library.project_number - LEFT JOIN ts_user on ts_user.USID = sar_stand_project_library.project_manager - where STAND_ID = #{product.standId} and CLOSE_STATE = '1' + sar_stand_project_library.project_manager as projectManager,ts_user.UNAME as uName, + (SELECT count(*) FROM sar_stand_unqualified WHERE sar_stand_unqualified.STAND_ID = #{product.standId}) unCount + FROM + sar_stand_project_library + LEFT JOIN sar_stand_unqualified ON sar_stand_unqualified.product_id = sar_stand_project_library.project_number + 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' group by PRODUCT_NAME, sar_stand_project_library.project_group, @@ -34,10 +38,14 @@