bonus
/
yn_img_tool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试问题修改

This commit is contained in:
cwchen 2025-04-15 17:00:05 +08:00
parent 5579f0042f
commit dece94d5ca
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
View File

@ -97,10 +97,10 @@
COUNT(IF(tcq.upload_type = '3', 1, NULL)) AS safetyMeasNum, 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 = '4', 1, NULL)) AS coordinatedPhotoNum,
COUNT(IF(tcq.upload_type = '5', 1, NULL)) AS importIssuesAndPublicityNum COUNT(IF(tcq.upload_type = '5', 1, NULL)) AS importIssuesAndPublicityNum
FROM tb_comprehensive_query tcq FROM sys_file_resource sfr
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND LEFT JOIN tb_comprehensive_query tcq ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
sfr.is_active = '1' tcq.is_active = '1'
WHERE tcq.is_active = '1' WHERE sfr.is_active = '1'
<if test="roleLevel = '0' and proIds != null and proIds.size() > 0"> <if test="roleLevel = '0' and proIds != null and proIds.size() > 0">
AND tcq.pro_id IN AND tcq.pro_id IN
<foreach collection="proIds" item="proId" open="(" separator="," close=")"> <foreach collection="proIds" item="proId" open="(" separator="," close=")">
@ -127,9 +127,9 @@
IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus, IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus,
tcq.title, tcq.title,
tcq.pro_name AS proName tcq.pro_name AS proName
FROM tb_comprehensive_query tcq FROM sys_file_resource sfr
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND LEFT JOIN tb_comprehensive_query tcq ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
sfr.is_active = '1' 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 tb_photo_collect tpc ON sfr.id = tpc.file_resource_id AND tpc.collect_user_id = #{userId}
LEFT JOIN ( LEFT JOIN (
SELECT sd.dict_value,sd.dict_name SELECT sd.dict_value,sd.dict_name
@ -228,7 +228,7 @@
<if test="id!=null"> <if test="id!=null">
AND tcq.pro_id = #{id} AND tcq.pro_id = #{id}
</if> </if>
AND tcq.is_active = '1' AND sfr.is_active = '1'
</where> </where>
ORDER BY sfr.create_time DESC ORDER BY sfr.create_time DESC
</select> </select>
@ -250,10 +250,10 @@
tp.name AS proName, tp.name AS proName,
tcq.pro_id AS proId, tcq.pro_id AS proId,
MAX(sfr.create_time) AS lastUpdateTime 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 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'
<where> <where>
<if test="roleLevel = '0' and proIds != null and proIds.size() > 0"> <if test="roleLevel = '0' and proIds != null and proIds.size() > 0">
AND tcq.pro_id IN AND tcq.pro_id IN
@ -264,7 +264,7 @@
<if test="id!=null"> <if test="id!=null">
AND tcq.pro_id = #{id} AND tcq.pro_id = #{id}
</if> </if>
AND tcq.is_active = '1' AND sfr.is_active = '1'
</where> </where>
GROUP BY tcq.pro_id GROUP BY tcq.pro_id
</select> </select>

2
src/main/resources/static/js/synthesisQuery/synthesisQuery.js
View File

@ -31,6 +31,7 @@ function dataFlow(queryParams) {
console.error(page); console.error(page);
pageNum = page; pageNum = page;
let lis = []; let lis = [];
queryParams.pageNum = page;
let returnData = loadData(queryParams); let returnData = loadData(queryParams);
if (returnData != null) { if (returnData != null) {
lis = initImgData(returnData.data.list) lis = initImgData(returnData.data.list)
@ -64,6 +65,7 @@ function changeType(type, that) {
$(that).addClass("checkedElement"); $(that).addClass("checkedElement");
$(that).prev().removeClass("checkedElement").addClass("noCheckedElement"); $(that).prev().removeClass("checkedElement").addClass("noCheckedElement");
} }
initImgNum();
searchData({ searchData({
pageNum: pageNum, pageNum: pageNum,
pageSize: pageSize, pageSize: pageSize,

5
src/main/resources/static/pages/imageUpload/safetyViolations/child/safetyViolationsForm.html
View File

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="../../../../js/layui-v2.6.8/css/layui.css" media="all"> <link rel="stylesheet" href="../../../../js/layui-v2.9.14/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../../css/dataForm.css"> <link rel="stylesheet" href="../../../../css/dataForm.css">
<style> <style>
.section-title { .section-title {
@ -44,7 +44,8 @@
} }
</style> </style>
<script src="../../../../js/libs/jquery-3.7.0.min.js" charset="UTF-8" type="text/javascript"></script> <script src="../../../../js/libs/jquery-3.7.0.min.js" charset="UTF-8" type="text/javascript"></script>
<script src="../../../../js/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script> <!-- <script src="../../../../js/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script>-->
<script src="../../../../js/layui-v2.9.14/layui/layui.js" charset="UTF-8" type="text/javascript"></script>
<script src="../../../../js/publicJs.js"></script> <script src="../../../../js/publicJs.js"></script>
<script src="../../../../js/select.js"></script> <script src="../../../../js/select.js"></script>
<script src="../../../../js/dict.js"></script> <script src="../../../../js/dict.js"></script>