diff --git a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml index c4f6e3c..20e63e3 100644 --- a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml +++ b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml @@ -97,10 +97,10 @@ COUNT(IF(tcq.upload_type = '3', 1, NULL)) AS safetyMeasNum, COUNT(IF(tcq.upload_type = '4', 1, NULL)) AS coordinatedPhotoNum, COUNT(IF(tcq.upload_type = '5', 1, NULL)) AS importIssuesAndPublicityNum - FROM tb_comprehensive_query tcq - LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND - sfr.is_active = '1' - WHERE tcq.is_active = '1' + FROM sys_file_resource sfr + LEFT JOIN tb_comprehensive_query tcq ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND + tcq.is_active = '1' + WHERE sfr.is_active = '1' AND tcq.pro_id IN @@ -127,9 +127,9 @@ IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus, tcq.title, tcq.pro_name AS proName - FROM tb_comprehensive_query tcq - LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND - sfr.is_active = '1' + FROM sys_file_resource sfr + LEFT JOIN tb_comprehensive_query tcq ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND + tcq.is_active = '1' LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id AND tpc.collect_user_id = #{userId} LEFT JOIN ( SELECT sd.dict_value,sd.dict_name @@ -228,7 +228,7 @@ AND tcq.pro_id = #{id} - AND tcq.is_active = '1' + AND sfr.is_active = '1' ORDER BY sfr.create_time DESC @@ -250,10 +250,10 @@ tp.name AS proName, tcq.pro_id AS proId, MAX(sfr.create_time) AS lastUpdateTime - FROM tb_comprehensive_query tcq + FROM sys_file_resource sfr + LEFT JOIN tb_comprehensive_query tcq ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND + tcq.is_active = '1' LEFT JOIN tb_project tp ON tcq.pro_id = tp.id - LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND - sfr.is_active = '1' AND tcq.pro_id IN @@ -264,7 +264,7 @@ AND tcq.pro_id = #{id} - AND tcq.is_active = '1' + AND sfr.is_active = '1' GROUP BY tcq.pro_id diff --git a/src/main/resources/static/js/synthesisQuery/synthesisQuery.js b/src/main/resources/static/js/synthesisQuery/synthesisQuery.js index 25b4c3b..4cb784f 100644 --- a/src/main/resources/static/js/synthesisQuery/synthesisQuery.js +++ b/src/main/resources/static/js/synthesisQuery/synthesisQuery.js @@ -31,6 +31,7 @@ function dataFlow(queryParams) { console.error(page); pageNum = page; let lis = []; + queryParams.pageNum = page; let returnData = loadData(queryParams); if (returnData != null) { lis = initImgData(returnData.data.list) @@ -64,6 +65,7 @@ function changeType(type, that) { $(that).addClass("checkedElement"); $(that).prev().removeClass("checkedElement").addClass("noCheckedElement"); } + initImgNum(); searchData({ pageNum: pageNum, pageSize: pageSize, diff --git a/src/main/resources/static/pages/imageUpload/safetyViolations/child/safetyViolationsForm.html b/src/main/resources/static/pages/imageUpload/safetyViolations/child/safetyViolationsForm.html index 0146791..8e218b4 100644 --- a/src/main/resources/static/pages/imageUpload/safetyViolations/child/safetyViolationsForm.html +++ b/src/main/resources/static/pages/imageUpload/safetyViolations/child/safetyViolationsForm.html @@ -2,7 +2,7 @@ - + - + +