diff --git a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml index 34469e1..c4f6e3c 100644 --- a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml +++ b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml @@ -1,6 +1,6 @@ + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> insert into tb_comprehensive_query @@ -14,12 +14,12 @@ gx_name, check_user_name, vio_date, - vio_place, - vio_desc, + vio_place, + vio_desc, rect_date, rect_user_name, rect_time, - rect_desc, + rect_desc, rect_status, build_before_desc, build_under_desc, @@ -81,22 +81,25 @@ #{tempFilePath}, - + - update tb_comprehensive_query set is_active ='0' - where id = #{id} and upload_type = #{uploadType} + update tb_comprehensive_query + set is_active ='0' + where id = #{id} + and upload_type = #{uploadType} - 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 + 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 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 ( - 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 + 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 @@ -230,7 +234,9 @@ - - - - - - + + + + + + - 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 ( - #{id},#{userId},#{userName},#{userId},#{userName} + #{id},#{userId},#{userName},#{userId},#{userName} ) @@ -529,17 +560,19 @@ - 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 tb_comprehensive_query pro_id = #{proId}, pro_name = #{proName}, - major_id = #{majorId}, - major_name = #{majorName}, - gx_id = #{gxId}, - gx_name = #{gxName}, + major_id = #{majorId}, + major_name = #{majorName}, + gx_id = #{gxId}, + gx_name = #{gxName}, check_user_name = #{checkUserName}, vio_date = #{vioDate}, vio_place = #{vioPlace}, @@ -571,6 +604,9 @@ - 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} diff --git a/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml b/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml index bc7b765..92456a6 100644 --- a/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml +++ b/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml @@ -69,18 +69,10 @@ pro_name = #{proName}, - major_id = #{majorId}, - - major_name = #{majorName}, - - gx_id = #{gxId}, - - gx_name = #{gxName}, - check_user_name = #{checkUserName}, diff --git a/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml b/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml index 7750286..e70615f 100644 --- a/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml +++ b/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml @@ -101,18 +101,10 @@ pro_name = #{proName}, - major_id = #{majorId}, - - major_name = #{majorName}, - - gx_id = #{gxId}, - - gx_name = #{gxName}, - check_user_name = #{checkUserName},