违章修改
This commit is contained in:
parent
70f983bd14
commit
99501cbdea
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.bonus.imgTool.backstage.dao.SynthesisQueryDao">
|
<mapper namespace="com.bonus.imgTool.backstage.dao.SynthesisQueryDao">
|
||||||
<insert id="addComprehensiveQuery">
|
<insert id="addComprehensiveQuery">
|
||||||
insert into tb_comprehensive_query
|
insert into tb_comprehensive_query
|
||||||
|
|
@ -14,12 +14,12 @@
|
||||||
<if test="gxName != null and gxName != ''">gx_name,</if>
|
<if test="gxName != null and gxName != ''">gx_name,</if>
|
||||||
<if test="checkUserName != null and checkUserName != ''">check_user_name,</if>
|
<if test="checkUserName != null and checkUserName != ''">check_user_name,</if>
|
||||||
<if test="vioDate != null">vio_date,</if>
|
<if test="vioDate != null">vio_date,</if>
|
||||||
<if test="vioPlace != null and vioPlace != ''" >vio_place,</if>
|
<if test="vioPlace != null and vioPlace != ''">vio_place,</if>
|
||||||
<if test="vioDesc != null and vioDesc != ''" >vio_desc,</if>
|
<if test="vioDesc != null and vioDesc != ''">vio_desc,</if>
|
||||||
<if test="rectDate != null">rect_date,</if>
|
<if test="rectDate != null">rect_date,</if>
|
||||||
<if test="rectUserName != null and rectUserName != ''">rect_user_name,</if>
|
<if test="rectUserName != null and rectUserName != ''">rect_user_name,</if>
|
||||||
<if test="rectTime != null">rect_time,</if>
|
<if test="rectTime != null">rect_time,</if>
|
||||||
<if test="rectDesc != null and rectDesc != ''" >rect_desc,</if>
|
<if test="rectDesc != null and rectDesc != ''">rect_desc,</if>
|
||||||
<if test="rectStatus != null">rect_status,</if>
|
<if test="rectStatus != null">rect_status,</if>
|
||||||
<if test="buildBeforeDesc != null">build_before_desc,</if>
|
<if test="buildBeforeDesc != null">build_before_desc,</if>
|
||||||
<if test="buildUnderDesc != null">build_under_desc,</if>
|
<if test="buildUnderDesc != null">build_under_desc,</if>
|
||||||
|
|
@ -83,20 +83,23 @@
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
<delete id="deleteComprehensiveQuery">
|
<delete id="deleteComprehensiveQuery">
|
||||||
update tb_comprehensive_query set is_active ='0'
|
update tb_comprehensive_query
|
||||||
where id = #{id} and upload_type = #{uploadType}
|
set is_active ='0'
|
||||||
|
where id = #{id}
|
||||||
|
and upload_type = #{uploadType}
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<!--综合查询-照片综合查询-照片数量-->
|
<!--综合查询-照片综合查询-照片数量-->
|
||||||
<select id="getImgNum" resultType="com.bonus.imgTool.backstage.entity.SynthesisNumVo">
|
<select id="getImgNum" resultType="com.bonus.imgTool.backstage.entity.SynthesisNumVo">
|
||||||
SELECT COUNT(1) AS totalNum,
|
SELECT COUNT(1) AS totalNum,
|
||||||
COUNT(IF(tcq.upload_type = '1', 1, NULL)) AS safetyVioNum,
|
COUNT(IF(tcq.upload_type = '1', 1, NULL)) AS safetyVioNum,
|
||||||
COUNT(IF(tcq.upload_type = '2', 1, NULL)) AS qualityInsNum,
|
COUNT(IF(tcq.upload_type = '2', 1, NULL)) AS qualityInsNum,
|
||||||
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 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'
|
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'
|
WHERE tcq.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
|
||||||
|
|
@ -111,27 +114,28 @@
|
||||||
|
|
||||||
<!--照片综合查询-->
|
<!--照片综合查询-->
|
||||||
<select id="getImgList" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
|
<select id="getImgList" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
|
||||||
SELECT sfr.id,
|
SELECT sfr.id,
|
||||||
sfr.original_file_path AS originalFilePath,
|
sfr.original_file_path AS originalFilePath,
|
||||||
sfr.compress_file_path AS compressFilePath,
|
sfr.compress_file_path AS compressFilePath,
|
||||||
sfr.watermark_file_path AS watermarkFilePath,
|
sfr.watermark_file_path AS watermarkFilePath,
|
||||||
sfr.upload_type AS uploadType,
|
sfr.upload_type AS uploadType,
|
||||||
CASE sfr.upload_type WHEN '1' THEN '安全违章' WHEN '2' THEN '质量检查' WHEN '3' THEN '安全措施落实'
|
CASE sfr.upload_type WHEN '1' THEN '安全违章' WHEN '2' THEN '质量检查' WHEN '3' THEN '安全措施落实'
|
||||||
WHEN '4' THEN '协调照片' WHEN '5' THEN '重要事项及宣传类' ELSE '' END AS uploadTypeName,
|
WHEN '4' THEN '协调照片' WHEN '5' THEN '重要事项及宣传类' ELSE '' END AS uploadTypeName,
|
||||||
sfr.create_time AS uploadTime,
|
sfr.create_time AS uploadTime,
|
||||||
source_type AS sourceType,
|
source_type AS sourceType,
|
||||||
A.dict_name AS sourceTypeName,
|
A.dict_name AS sourceTypeName,
|
||||||
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 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'
|
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
|
||||||
|
sfr.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
|
||||||
FROM sys_distinct sd
|
FROM sys_distinct sd
|
||||||
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
|
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
|
||||||
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
|
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
|
||||||
) A ON A.dict_value = sfr.source_type
|
) A ON A.dict_value = sfr.source_type
|
||||||
<where>
|
<where>
|
||||||
<if test="queryType == 1">
|
<if test="queryType == 1">
|
||||||
|
|
@ -230,7 +234,9 @@
|
||||||
</select>
|
</select>
|
||||||
<!--获取水印照片地址-->
|
<!--获取水印照片地址-->
|
||||||
<select id="getSyData" resultType="java.lang.String">
|
<select id="getSyData" resultType="java.lang.String">
|
||||||
SELECT watermark_file_path FROM sys_file_resource WHERE id = #{id}
|
SELECT watermark_file_path
|
||||||
|
FROM sys_file_resource
|
||||||
|
WHERE id = #{id}
|
||||||
</select>
|
</select>
|
||||||
<!--项目分类统计-->
|
<!--项目分类统计-->
|
||||||
<select id="getProClassifyStatisticsList"
|
<select id="getProClassifyStatisticsList"
|
||||||
|
|
@ -246,7 +252,8 @@
|
||||||
MAX(sfr.create_time) AS lastUpdateTime
|
MAX(sfr.create_time) AS lastUpdateTime
|
||||||
FROM tb_comprehensive_query tcq
|
FROM tb_comprehensive_query tcq
|
||||||
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'
|
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
|
||||||
|
|
@ -263,7 +270,7 @@
|
||||||
</select>
|
</select>
|
||||||
<!--项目分类统计-查看图片详情-->
|
<!--项目分类统计-查看图片详情-->
|
||||||
<select id="getProImgList" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
|
<select id="getProImgList" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
|
||||||
SELECT sfr.id,
|
SELECT sfr.id,
|
||||||
sfr.original_file_path AS originalFilePath,
|
sfr.original_file_path AS originalFilePath,
|
||||||
sfr.compress_file_path AS compressFilePath,
|
sfr.compress_file_path AS compressFilePath,
|
||||||
sfr.watermark_file_path AS watermarkFilePath,
|
sfr.watermark_file_path AS watermarkFilePath,
|
||||||
|
|
@ -277,12 +284,13 @@
|
||||||
tcq.title,
|
tcq.title,
|
||||||
tcq.pro_name AS proName
|
tcq.pro_name AS proName
|
||||||
FROM tb_comprehensive_query tcq
|
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'
|
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
|
||||||
|
sfr.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
|
||||||
FROM sys_distinct sd
|
FROM sys_distinct sd
|
||||||
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
|
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
|
||||||
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
|
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
|
||||||
) A ON A.dict_value = sfr.source_type
|
) A ON A.dict_value = sfr.source_type
|
||||||
<where>
|
<where>
|
||||||
|
|
@ -421,76 +429,7 @@
|
||||||
</select>
|
</select>
|
||||||
<!--获取图片-->
|
<!--获取图片-->
|
||||||
<select id="getImgs" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
|
<select id="getImgs" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
|
||||||
SELECT sfr.id,
|
SELECT sfr.id,
|
||||||
sfr.original_file_path AS originalFilePath,
|
|
||||||
sfr.compress_file_path AS compressFilePath,
|
|
||||||
sfr.watermark_file_path AS watermarkFilePath,
|
|
||||||
sfr.upload_type AS uploadType,
|
|
||||||
CASE sfr.upload_type WHEN '1' THEN '安全违章' WHEN '2' THEN '质量检查' WHEN '3' THEN '安全措施落实'
|
|
||||||
WHEN '4' THEN '协调照片' WHEN '5' THEN '重要事项及宣传类' ELSE '' END AS uploadTypeName,
|
|
||||||
sfr.create_time AS uploadTime,
|
|
||||||
sfr.source_type AS sourceType,
|
|
||||||
A.dict_name AS sourceTypeName,
|
|
||||||
IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus
|
|
||||||
FROM sys_file_resource sfr
|
|
||||||
LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id AND tpc.collect_user_id = #{params.userId}
|
|
||||||
LEFT JOIN (
|
|
||||||
SELECT sd.dict_value,sd.dict_name
|
|
||||||
FROM sys_distinct sd
|
|
||||||
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
|
|
||||||
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
|
|
||||||
) A ON A.dict_value = sfr.source_type
|
|
||||||
<where>
|
|
||||||
AND sfr.source_id = #{params.id} AND sfr.upload_type = #{params.uploadType} AND sfr.source_type = #{type} AND sfr.is_active = '1'
|
|
||||||
</where>
|
|
||||||
</select>
|
|
||||||
<!--查询原图/水印照片-->
|
|
||||||
<select id="findByAlbumId" resultType="com.bonus.imgTool.backstage.entity.Photo">
|
|
||||||
SELECT sfr.id AS photoId,
|
|
||||||
IF(#{type} = '1',sfr.original_file_path,sfr.watermark_file_path) AS filePath,
|
|
||||||
sfr.upload_type AS uploadType,
|
|
||||||
CASE sfr.upload_type WHEN '1' THEN '安全违章' WHEN '2' THEN '质量检查' WHEN '3' THEN '安全措施落实'
|
|
||||||
WHEN '4' THEN '协调照片' WHEN '5' THEN '重要事项及宣传类' ELSE '' END AS uploadTypeName,
|
|
||||||
A.dict_name AS sourceTypeName,
|
|
||||||
tcq.title
|
|
||||||
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'
|
|
||||||
LEFT JOIN (
|
|
||||||
SELECT sd.dict_value,sd.dict_name
|
|
||||||
FROM sys_distinct sd
|
|
||||||
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
|
|
||||||
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
|
|
||||||
) A ON A.dict_value = sfr.source_type
|
|
||||||
WHERE tcq.pro_id = #{proId} AND tcq.is_active = '1'
|
|
||||||
ORDER BY sfr.create_time DESC
|
|
||||||
</select>
|
|
||||||
<!--查询图片未生成水印照片的数据-->
|
|
||||||
<select id="generateWatermark" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
|
|
||||||
SELECT sfr.id,
|
|
||||||
sfr.original_file_path AS originalFilePath,
|
|
||||||
sfr.compress_file_path AS compressFilePath,
|
|
||||||
sfr.watermark_file_path AS watermarkFilePath,
|
|
||||||
sfr.upload_type AS uploadType,
|
|
||||||
CASE sfr.upload_type WHEN '1' THEN '安全违章' WHEN '2' THEN '质量检查' WHEN '3' THEN '安全措施落实'
|
|
||||||
WHEN '4' THEN '协调照片' WHEN '5' THEN '重要事项及宣传类' ELSE '' END AS uploadTypeName,
|
|
||||||
sfr.create_time AS uploadTime,
|
|
||||||
source_type AS sourceType,
|
|
||||||
A.dict_name AS sourceTypeName,
|
|
||||||
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'
|
|
||||||
LEFT JOIN (
|
|
||||||
SELECT sd.dict_value,sd.dict_name
|
|
||||||
FROM sys_distinct sd
|
|
||||||
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
|
|
||||||
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
|
|
||||||
) A ON A.dict_value = sfr.source_type
|
|
||||||
WHERE tcq.pro_id = #{proId} AND tcq.is_active = '1' AND sfr.watermark_file_path IS NULL
|
|
||||||
</select>
|
|
||||||
|
|
||||||
<select id="getPhotoImgList" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
|
|
||||||
SELECT sfr.id,
|
|
||||||
sfr.original_file_path AS originalFilePath,
|
sfr.original_file_path AS originalFilePath,
|
||||||
sfr.compress_file_path AS compressFilePath,
|
sfr.compress_file_path AS compressFilePath,
|
||||||
sfr.watermark_file_path AS watermarkFilePath,
|
sfr.watermark_file_path AS watermarkFilePath,
|
||||||
|
|
@ -498,29 +437,121 @@
|
||||||
CASE sfr.upload_type WHEN '1' THEN '安全违章' WHEN '2' THEN '质量检查' WHEN '3' THEN '安全措施落实'
|
CASE sfr.upload_type WHEN '1' THEN '安全违章' WHEN '2' THEN '质量检查' WHEN '3' THEN '安全措施落实'
|
||||||
WHEN '4' THEN '协调照片' WHEN '5' THEN '重要事项及宣传类' ELSE '' END AS uploadTypeName,
|
WHEN '4' THEN '协调照片' WHEN '5' THEN '重要事项及宣传类' ELSE '' END AS uploadTypeName,
|
||||||
sfr.create_time AS uploadTime,
|
sfr.create_time AS uploadTime,
|
||||||
source_type AS sourceType,
|
sfr.source_type AS sourceType,
|
||||||
A.dict_name AS sourceTypeName,
|
A.dict_name AS sourceTypeName,
|
||||||
IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus,
|
IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus
|
||||||
tcq.title,
|
FROM sys_file_resource sfr
|
||||||
tcq.pro_name AS proName
|
LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id AND tpc.collect_user_id = #{params.userId}
|
||||||
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'
|
|
||||||
LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id
|
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT sd.dict_value,sd.dict_name
|
SELECT sd.dict_value,sd.dict_name
|
||||||
FROM sys_distinct sd
|
FROM sys_distinct sd
|
||||||
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
|
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
|
||||||
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
|
WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0
|
||||||
) A ON A.dict_value = sfr.source_type
|
) A ON A.dict_value = sfr.source_type
|
||||||
WHERE sfr.source_id = #{id} AND sfr.source_type = #{sourceType} and sfr.is_active = '1' AND tcq.is_active = '1'
|
<where>
|
||||||
|
AND sfr.source_id = #{params.id} AND sfr.upload_type = #{params.uploadType} AND sfr.source_type = #{type}
|
||||||
|
AND sfr.is_active = '1'
|
||||||
|
</where>
|
||||||
|
</select>
|
||||||
|
<!--查询原图/水印照片-->
|
||||||
|
<select id="findByAlbumId" resultType="com.bonus.imgTool.backstage.entity.Photo">
|
||||||
|
SELECT sfr.id AS photoId,
|
||||||
|
IF(#{type} = '1', sfr.original_file_path, sfr.watermark_file_path) AS filePath,
|
||||||
|
sfr.upload_type AS uploadType,
|
||||||
|
CASE sfr.upload_type
|
||||||
|
WHEN '1' THEN '安全违章'
|
||||||
|
WHEN '2' THEN '质量检查'
|
||||||
|
WHEN '3' THEN '安全措施落实'
|
||||||
|
WHEN '4' THEN '协调照片'
|
||||||
|
WHEN '5' THEN '重要事项及宣传类'
|
||||||
|
ELSE '' END AS uploadTypeName,
|
||||||
|
A.dict_name AS sourceTypeName,
|
||||||
|
tcq.title
|
||||||
|
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'
|
||||||
|
LEFT JOIN (SELECT sd.dict_value, sd.dict_name
|
||||||
|
FROM sys_distinct sd
|
||||||
|
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
|
||||||
|
WHERE sd2.dict_code = 'file_source_type'
|
||||||
|
AND sd.del_flag = 0) A ON A.dict_value = sfr.source_type
|
||||||
|
WHERE tcq.pro_id = #{proId}
|
||||||
|
AND tcq.is_active = '1'
|
||||||
|
ORDER BY sfr.create_time DESC
|
||||||
|
</select>
|
||||||
|
<!--查询图片未生成水印照片的数据-->
|
||||||
|
<select id="generateWatermark" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
|
||||||
|
SELECT sfr.id,
|
||||||
|
sfr.original_file_path AS originalFilePath,
|
||||||
|
sfr.compress_file_path AS compressFilePath,
|
||||||
|
sfr.watermark_file_path AS watermarkFilePath,
|
||||||
|
sfr.upload_type AS uploadType,
|
||||||
|
CASE sfr.upload_type
|
||||||
|
WHEN '1' THEN '安全违章'
|
||||||
|
WHEN '2' THEN '质量检查'
|
||||||
|
WHEN '3' THEN '安全措施落实'
|
||||||
|
WHEN '4' THEN '协调照片'
|
||||||
|
WHEN '5' THEN '重要事项及宣传类'
|
||||||
|
ELSE '' END AS uploadTypeName,
|
||||||
|
sfr.create_time AS uploadTime,
|
||||||
|
source_type AS sourceType,
|
||||||
|
A.dict_name AS sourceTypeName,
|
||||||
|
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'
|
||||||
|
LEFT JOIN (SELECT sd.dict_value, sd.dict_name
|
||||||
|
FROM sys_distinct sd
|
||||||
|
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
|
||||||
|
WHERE sd2.dict_code = 'file_source_type'
|
||||||
|
AND sd.del_flag = 0) A ON A.dict_value = sfr.source_type
|
||||||
|
WHERE tcq.pro_id = #{proId}
|
||||||
|
AND tcq.is_active = '1'
|
||||||
|
AND sfr.watermark_file_path IS NULL
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<select id="getPhotoImgList" resultType="com.bonus.imgTool.backstage.entity.SynthesisQueryVo">
|
||||||
|
SELECT sfr.id,
|
||||||
|
sfr.original_file_path AS originalFilePath,
|
||||||
|
sfr.compress_file_path AS compressFilePath,
|
||||||
|
sfr.watermark_file_path AS watermarkFilePath,
|
||||||
|
sfr.upload_type AS uploadType,
|
||||||
|
CASE sfr.upload_type
|
||||||
|
WHEN '1' THEN '安全违章'
|
||||||
|
WHEN '2' THEN '质量检查'
|
||||||
|
WHEN '3' THEN '安全措施落实'
|
||||||
|
WHEN '4' THEN '协调照片'
|
||||||
|
WHEN '5' THEN '重要事项及宣传类'
|
||||||
|
ELSE '' END AS uploadTypeName,
|
||||||
|
sfr.create_time AS uploadTime,
|
||||||
|
source_type AS sourceType,
|
||||||
|
A.dict_name AS sourceTypeName,
|
||||||
|
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'
|
||||||
|
LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id
|
||||||
|
LEFT JOIN (SELECT sd.dict_value, sd.dict_name
|
||||||
|
FROM sys_distinct sd
|
||||||
|
LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
|
||||||
|
WHERE sd2.dict_code = 'file_source_type'
|
||||||
|
AND sd.del_flag = 0) A ON A.dict_value = sfr.source_type
|
||||||
|
WHERE sfr.source_id = #{id}
|
||||||
|
AND sfr.source_type = #{sourceType}
|
||||||
|
and sfr.is_active = '1'
|
||||||
|
AND tcq.is_active = '1'
|
||||||
ORDER BY sfr.create_time DESC
|
ORDER BY sfr.create_time DESC
|
||||||
</select>
|
</select>
|
||||||
<!--收藏/取消收藏图片-->
|
<!--收藏/取消收藏图片-->
|
||||||
<update id="collectData">
|
<update id="collectData">
|
||||||
<if test="collectType == 1">
|
<if test="collectType == 1">
|
||||||
INSERT INTO tb_photo_collect (file_resource_id, collect_user_id,collect_user_name, create_user,create_user_name)
|
INSERT INTO tb_photo_collect (file_resource_id, collect_user_id,collect_user_name,
|
||||||
|
create_user,create_user_name)
|
||||||
VALUES (
|
VALUES (
|
||||||
#{id},#{userId},#{userName},#{userId},#{userName}
|
#{id},#{userId},#{userName},#{userId},#{userName}
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
<if test="collectType == 2">
|
<if test="collectType == 2">
|
||||||
|
|
@ -529,17 +560,19 @@
|
||||||
</update>
|
</update>
|
||||||
<!--生成水印照片-->
|
<!--生成水印照片-->
|
||||||
<update id="updateSyData">
|
<update id="updateSyData">
|
||||||
UPDATE sys_file_resource SET watermark_file_path = #{watermarkFilePath} WHERE id = #{id}
|
UPDATE sys_file_resource
|
||||||
|
SET watermark_file_path = #{watermarkFilePath}
|
||||||
|
WHERE id = #{id}
|
||||||
</update>
|
</update>
|
||||||
<update id="updateComprehensiveQuery">
|
<update id="updateComprehensiveQuery">
|
||||||
update tb_comprehensive_query
|
update tb_comprehensive_query
|
||||||
<trim prefix="SET" suffixOverrides=",">
|
<trim prefix="SET" suffixOverrides=",">
|
||||||
<if test="proId != null">pro_id = #{proId},</if>
|
<if test="proId != null">pro_id = #{proId},</if>
|
||||||
<if test="proName != null">pro_name = #{proName},</if>
|
<if test="proName != null">pro_name = #{proName},</if>
|
||||||
<if test="majorId != null">major_id = #{majorId},</if>
|
major_id = #{majorId},
|
||||||
<if test="majorName != null">major_name = #{majorName},</if>
|
major_name = #{majorName},
|
||||||
<if test="gxId != null">gx_id = #{gxId},</if>
|
gx_id = #{gxId},
|
||||||
<if test="gxName != null">gx_name = #{gxName},</if>
|
gx_name = #{gxName},
|
||||||
<if test="checkUserName != null">check_user_name = #{checkUserName},</if>
|
<if test="checkUserName != null">check_user_name = #{checkUserName},</if>
|
||||||
<if test="vioDate != null">vio_date = #{vioDate},</if>
|
<if test="vioDate != null">vio_date = #{vioDate},</if>
|
||||||
<if test="vioPlace != null">vio_place = #{vioPlace},</if>
|
<if test="vioPlace != null">vio_place = #{vioPlace},</if>
|
||||||
|
|
@ -571,6 +604,9 @@
|
||||||
</update>
|
</update>
|
||||||
<!--更新下载任务-->
|
<!--更新下载任务-->
|
||||||
<update id="updateTaskDownload">
|
<update id="updateTaskDownload">
|
||||||
UPDATE tb_download_task SET file_path = #{params.filePath},failure_time = #{nowTime} WHERE id = #{params.id}
|
UPDATE tb_download_task
|
||||||
|
SET file_path = #{params.filePath},
|
||||||
|
failure_time = #{nowTime}
|
||||||
|
WHERE id = #{params.id}
|
||||||
</update>
|
</update>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
|
|
@ -69,18 +69,10 @@
|
||||||
<if test="proName != null">
|
<if test="proName != null">
|
||||||
pro_name = #{proName},
|
pro_name = #{proName},
|
||||||
</if>
|
</if>
|
||||||
<if test="majorId != null">
|
|
||||||
major_id = #{majorId},
|
major_id = #{majorId},
|
||||||
</if>
|
|
||||||
<if test="majorName != null">
|
|
||||||
major_name = #{majorName},
|
major_name = #{majorName},
|
||||||
</if>
|
|
||||||
<if test="gxId != null">
|
|
||||||
gx_id = #{gxId},
|
gx_id = #{gxId},
|
||||||
</if>
|
|
||||||
<if test="gxName != null">
|
|
||||||
gx_name = #{gxName},
|
gx_name = #{gxName},
|
||||||
</if>
|
|
||||||
<if test="checkUserName != null">
|
<if test="checkUserName != null">
|
||||||
check_user_name = #{checkUserName},
|
check_user_name = #{checkUserName},
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
|
|
@ -101,18 +101,10 @@
|
||||||
<if test="proName != null">
|
<if test="proName != null">
|
||||||
pro_name = #{proName},
|
pro_name = #{proName},
|
||||||
</if>
|
</if>
|
||||||
<if test="majorId != null">
|
|
||||||
major_id = #{majorId},
|
major_id = #{majorId},
|
||||||
</if>
|
|
||||||
<if test="majorName != null">
|
|
||||||
major_name = #{majorName},
|
major_name = #{majorName},
|
||||||
</if>
|
|
||||||
<if test="gxId != null">
|
|
||||||
gx_id = #{gxId},
|
gx_id = #{gxId},
|
||||||
</if>
|
|
||||||
<if test="gxName != null">
|
|
||||||
gx_name = #{gxName},
|
gx_name = #{gxName},
|
||||||
</if>
|
|
||||||
<if test="checkUserName != null">
|
<if test="checkUserName != null">
|
||||||
check_user_name = #{checkUserName},
|
check_user_name = #{checkUserName},
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue