From 4dcd0596a2dd210fd3061ef88ff919de61c3bfc2 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Thu, 23 Oct 2025 16:21:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E5=8F=96=E8=A7=86=E9=A2=91=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=8A=A0=E4=B8=8A=E6=96=BD=E5=B7=A5=E5=9C=BA=E7=AB=99?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/vo/PoliceCameraItemFileVo.java       |  8 ++++++++
 .../mapper/xml/PoliceCameraItemFileMapper.xml   |  1 +
 .../impl/PoliceCameraItemFileServiceImpl.java   | 17 +++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/PoliceCameraItemFileVo.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/PoliceCameraItemFileVo.java
index 7f2038293..679f72b53 100644
--- a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/PoliceCameraItemFileVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/PoliceCameraItemFileVo.java
@@ -25,4 +25,12 @@ public class PoliceCameraItemFileVo extends PoliceCameraItemFile {
     private java.lang.String workTicketNumber;
     @ApiModelProperty(value = "项目名称")
     private String projectName;
+    /**
+     * 施工场站s（多个,分割）
+     */
+    @ApiModelProperty(value = "施工场站s（多个,分割）")
+    private java.lang.String constructionAreas;
+    /**施工场站名称s（多个,分割）*/
+    @ApiModelProperty(value="施工场站名称s（多个,分割）")
+    private java.lang.String constructionAreaNames  ;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/PoliceCameraItemFileMapper.xml b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/PoliceCameraItemFileMapper.xml
index 35edd89ab..1ff4885ec 100644
--- a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/PoliceCameraItemFileMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/PoliceCameraItemFileMapper.xml
@@ -8,6 +8,7 @@
         ,wtt.type_name
         ,wt.work_ticket_number
         ,p.project_name
+        ,wt.construction_areas
         from police_camera_item_file t
         left join police_camera_item pci on pci.item_id=t.item_id
         left join work_ticket_history wth on wth.id = t.history_id
diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemFileServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemFileServiceImpl.java
index df342bb26..3e855783d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemFileServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemFileServiceImpl.java
@@ -15,6 +15,8 @@ import com.zhgd.xmgl.modules.policecamera.entity.dto.PoliceCameraItemFileDto;
 import com.zhgd.xmgl.modules.policecamera.entity.vo.PoliceCameraItemFileVo;
 import com.zhgd.xmgl.modules.policecamera.mapper.PoliceCameraItemFileMapper;
 import com.zhgd.xmgl.modules.policecamera.service.IPoliceCameraItemFileService;
+import com.zhgd.xmgl.modules.quality.entity.QualityRegion;
+import com.zhgd.xmgl.modules.quality.service.IQualityRegionService;
 import com.zhgd.xmgl.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,7 @@ import org.springframework.stereotype.Service;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -38,6 +41,9 @@ public class PoliceCameraItemFileServiceImpl extends ServiceImpl<PoliceCameraIte
     @Lazy
     @Autowired
     FileStorageService fileStorageService;
+    @Lazy
+    @Autowired
+    IQualityRegionService qualityRegionService;
     @Autowired
     private PoliceCameraItemFileMapper policeCameraItemFileMapper;
     @Lazy
@@ -66,6 +72,17 @@ public class PoliceCameraItemFileServiceImpl extends ServiceImpl<PoliceCameraIte
     }
 
     private List<PoliceCameraItemFileVo> dealList(List<PoliceCameraItemFileVo> list) {
+        if (CollUtil.isNotEmpty(list)) {
+            PoliceCameraItemFileVo vo = list.get(0);
+            for (PoliceCameraItemFileVo fileVo : list) {
+                Map<Long, QualityRegion> qualityRegionMap = qualityRegionService.getQualityRegionMapByProjectSn(vo.getProjectSn());
+                fileVo.setConstructionAreaNames(EntityUtils.convertIdsToNames(
+                        fileVo.getConstructionAreas(),
+                        qualityRegionMap,
+                        QualityRegion::getRegionName
+                ));
+            }
+        }
         return list;
     }