From d002aaac483e23fac3377bbd2a4cfcc3d21420bd Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Mon, 7 Apr 2025 17:20:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=9F=A5=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A3=80=E6=9F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QualityInspectionServiceImpl.java | 6 ------ .../service/impl/SafetyViolationServiceImpl.java | 13 +++++-------- .../imgTool/imgUpload/vo/SafetyViolationVo.java | 9 +++++++++ .../imgUpload/vo/dto/SafetyViolationDto.java | 6 +++--- .../mappers/backstage/SynthesisQueryMapper.xml | 6 +++--- .../mappers/imgUpload/QualityInspectionMapper.xml | 11 +++++------ .../mappers/imgUpload/SafetyViolationMapper.xml | 9 ++++----- 7 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java index 671de7e..28e6d68 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java @@ -93,7 +93,6 @@ public class QualityInspectionServiceImpl implements QualityInspectionService { if (num > 0) { List fileList = bean.getFileList(); List delFileList = bean.getDelFileList(); - //照片入库 if (fileList != null && !fileList.isEmpty()) { fileList.forEach(item -> { @@ -105,11 +104,6 @@ public class QualityInspectionServiceImpl implements QualityInspectionService { } //照片删除 if (delFileList != null && !delFileList.isEmpty()) { - delFileList.forEach(item -> { - item.setSourceId(bean.getId()); - item.setCreateUser(bean.getUpdateUserId()); - item.setCreateUserName(bean.getUpdateUserName()); - }); int j = safetyViolationDao.delImgPhoto(bean.getDelFileList()); } //总库修改 TODO diff --git a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java index a5e45d6..d48a075 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java @@ -100,16 +100,13 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { }); int j = dao.insertImgPhoto(bean.getFileList()); } - - - //照片删除 if (delFileList != null && !delFileList.isEmpty()) { - delFileList.forEach(item -> { - item.setSourceId(bean.getId()); - item.setCreateUser(bean.getUpdateUserId()); - item.setCreateUserName(bean.getUpdateUserName()); - }); +// delFileList.forEach(item -> { +// item.setSourceId(bean.getId()); +// item.setCreateUser(bean.getUpdateUserId()); +// item.setCreateUserName(bean.getUpdateUserName()); +// }); int j = dao.delImgPhoto(bean.getDelFileList()); } //总库修改 TODO diff --git a/src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java b/src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java index 19c4c6a..f05e82e 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java @@ -116,6 +116,15 @@ public class SafetyViolationVo extends PageEntity { */ private String rectPhotoNum; + /** + * 违章照片 + */ + private String vioPhoto; + /** + * 整改照片 + */ + private String rectPhoto; + /** * 违章照片 */ diff --git a/src/main/java/com/bonus/imgTool/imgUpload/vo/dto/SafetyViolationDto.java b/src/main/java/com/bonus/imgTool/imgUpload/vo/dto/SafetyViolationDto.java index bd03fa3..f7333cc 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/vo/dto/SafetyViolationDto.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/vo/dto/SafetyViolationDto.java @@ -120,10 +120,10 @@ public class SafetyViolationDto extends PageEntity { */ private List delFileList; - - private String keyWord; - private String proStatus; + private String proType; + + private String uploadType; } diff --git a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml index 0f1d507..3a9f2d7 100644 --- a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml +++ b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - insert into tb_coordinate_photo + insert into tb_comprehensive_query id, pro_id, @@ -30,7 +30,7 @@ create_user_id, create_time, create_user_name, - update_user_id, + update_user_id, update_user_name, update_time, data_source, @@ -62,7 +62,7 @@ #{createUserId}, #{createTime}, #{createUserName}, - #{updateUserid}, + #{updateUserId}, #{updateUserName}, #{updateTime}, #{dataSource}, diff --git a/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml b/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml index a45254d..fb4fdd6 100644 --- a/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml +++ b/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml @@ -134,13 +134,15 @@ tsv.rect_status, tsv.data_source, count(DISTINCT sfr.id) as vioPhotoNum, - count(DISTINCT sfr2.id) as rectPhotoNum + count(DISTINCT sfr2.id) as rectPhotoNum, + group_concat(DISTINCT sfr.original_file_path) as vioPhoto, + group_concat(DISTINCT sfr2.original_file_path) as rectPhoto FROM tb_quality_inspection tsv LEFT JOIN sys_file_resource sfr ON sfr.source_id = tsv.id - AND sfr.source_type = '1' and sfr.is_active = '1' + AND sfr.source_type = '3' and sfr.is_active = '1' LEFT JOIN sys_file_resource sfr2 ON sfr2.source_id = tsv.id - AND sfr2.source_type = '2' and sfr2.is_active = '1' + AND sfr2.source_type = '4' and sfr2.is_active = '1' left join tb_project tp on tp.id = tsv.pro_id and tp.is_active = '1' tsv.is_active = '1' @@ -153,9 +155,6 @@ and tsv.gx_id = #{gxId} - - and tp.pro_type = #{proType} - and tp.status = #{proStatus} diff --git a/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml b/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml index 24e9838..13d4333 100644 --- a/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml +++ b/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml @@ -147,7 +147,7 @@ update sys_file_resource set is_active = '0' WHERE id IN - + #{item.id} @@ -184,7 +184,9 @@ tsv.rect_status, tsv.data_source, count(DISTINCT sfr.id) as vioPhotoNum, - count(DISTINCT sfr2.id) as rectPhotoNum + count(DISTINCT sfr2.id) as rectPhotoNum, + group_concat(DISTINCT sfr.original_file_path) as vioPhoto, + group_concat(DISTINCT sfr2.original_file_path) as rectPhoto FROM tb_safety_violations tsv LEFT JOIN sys_file_resource sfr ON sfr.source_id = tsv.id @@ -203,9 +205,6 @@ and tsv.gx_id = #{gxId} - - and tp.pro_type = #{proType} - and tp.status = #{proStatus}