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

Merge branch 'develop_master' into 'FOTON'

Browse Source 
Develop master

See merge request LiuChao/foton-slrs-system-rest!323
This commit is contained in:
王夏晖
2021-12-25 09:33:39 +08:00
parent 8c491a7dd8 56c7b5d98e
commit 2c9ea4b182
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
+12 -12
View File
@@ -17,6 +17,12 @@
WHERE WHERE
sar_stand_project_library.project_number in ( SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId}) 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 CLOSE_STATE = '1'
<if test="null != product.productName and ''!= product.productName">
and product_name like concat(concat('%',#{product.productName}),'%')
</if>
<if test="null != product.productId and ''!= product.productId">
and project_number like concat(concat('%',#{product.productId}),'%')
</if>
group by group by
PRODUCT_NAME, PRODUCT_NAME,
sar_stand_project_library.project_group, sar_stand_project_library.project_group,
@@ -25,12 +31,6 @@
sar_stand_project_library.project_number, sar_stand_project_library.project_number,
sar_stand_project_library.id, sar_stand_project_library.id,
ts_user.UNAME ts_user.UNAME
<if test="null != product.productName and ''!= product.productName">
and product_name like concat(concat('%',#{product.productName}),'%')
</if>
<if test="null != product.productId and ''!= product.productId">
and project_number like concat(concat('%',#{product.productId}),'%')
</if>
ORDER BY ORDER BY
PRODUCT_NAME ASC PRODUCT_NAME ASC
limit ${(page-1)*pageSize},${pageSize} limit ${(page-1)*pageSize},${pageSize}
@@ -46,6 +46,12 @@
WHERE WHERE
sar_stand_project_library.project_number in (SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId}) 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 CLOSE_STATE = '1'
<if test="null != product.productName and ''!= product.productName">
and product_name like concat(concat('%',#{product.productName}),'%')
</if>
<if test="null != product.productId and ''!= product.productId">
and project_number like concat(concat('%',#{product.productId}),'%')
</if>
group by group by
PRODUCT_NAME, PRODUCT_NAME,
sar_stand_project_library.project_group, sar_stand_project_library.project_group,
@@ -54,12 +60,6 @@
sar_stand_project_library.project_number, sar_stand_project_library.project_number,
sar_stand_project_library.id, sar_stand_project_library.id,
ts_user.UNAME ts_user.UNAME
<if test="null != product.productName and ''!= product.productName">
and product_name like concat(concat('%',#{product.productName}),'%')
</if>
<if test="null != product.productId and ''!= product.productId">
and project_number like concat(concat('%',#{product.productId}),'%')
</if>
ORDER BY ORDER BY
PRODUCT_NAME ASC PRODUCT_NAME ASC
</select> </select>