FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

评估结果查看

Browse Source
This commit is contained in:
yuezhihang
2021-12-02 10:25:10 +08:00
parent 895289a1a0
commit 0569a33350
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+2 -2
View File
@@ -193,8 +193,8 @@ public class SarStandardComplianceAssessResultController {
p1.setTotal(page.getTotal()); p1.setTotal(page.getTotal());
map.put("unfit",p1); map.put("unfit",p1);
QueryWrapper<SarStandardComplianceProductAssess> queryWrapper1 = new QueryWrapper<>(); QueryWrapper<SarStandardComplianceProductAssess> queryWrapper1 = new QueryWrapper<>();
queryWrapper.eq("STAND_ID", eo.getStandId()); queryWrapper1.eq("STAND_ID", eo.getStandId());
queryWrapper.eq("product_id", eo.getProductId()); queryWrapper1.eq("product_id", eo.getProductId());
queryWrapper1.ne("research_compliance",""); queryWrapper1.ne("research_compliance","");
queryWrapper1.orderByAsc("product_name"); queryWrapper1.orderByAsc("product_name");
queryWrapper1.orderByAsc("standard_item"); queryWrapper1.orderByAsc("standard_item");
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
+17 -9
View File
@@ -8,11 +8,15 @@
select PRODUCT_NAME as productName,sar_stand_project_library.project_group as projectGroup, select PRODUCT_NAME as productName,sar_stand_project_library.project_group as projectGroup,
sar_stand_project_library.id as sarId, 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.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_project_library.project_manager as projectManager,ts_user.UNAME as uName,
sar_stand_unqualified (SELECT count(*) FROM sar_stand_unqualified WHERE sar_stand_unqualified.STAND_ID = #{product.standId}) unCount
left join sar_stand_project_library on sar_stand_unqualified.product_id = sar_stand_project_library.project_number FROM
LEFT JOIN ts_user on ts_user.USID = sar_stand_project_library.project_manager sar_stand_project_library
where STAND_ID = #{product.standId} and CLOSE_STATE = '1' 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 group by
PRODUCT_NAME, PRODUCT_NAME,
sar_stand_project_library.project_group, sar_stand_project_library.project_group,
@@ -34,10 +38,14 @@
<select id="selectPagesCount" <select id="selectPagesCount"
resultType="java.lang.Integer"> resultType="java.lang.Integer">
select count(sar_stand_unqualified.product_id) from sar_stand_unqualified select count(sar_stand_unqualified.product_id)
left join sar_stand_project_library on sar_stand_unqualified.product_id = sar_stand_project_library.project_number FROM
LEFT JOIN ts_user on ts_user.USID = sar_stand_project_library.project_manager sar_stand_project_library
where STAND_ID = #{product.standId} and CLOSE_STATE = '1' 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 group by
PRODUCT_NAME, PRODUCT_NAME,
sar_stand_project_library.project_group, sar_stand_project_library.project_group,