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 dealList(List list) { + if (CollUtil.isNotEmpty(list)) { + PoliceCameraItemFileVo vo = list.get(0); + for (PoliceCameraItemFileVo fileVo : list) { + Map qualityRegionMap = qualityRegionService.getQualityRegionMapByProjectSn(vo.getProjectSn()); + fileVo.setConstructionAreaNames(EntityUtils.convertIdsToNames( + fileVo.getConstructionAreas(), + qualityRegionMap, + QualityRegion::getRegionName + )); + } + } return list; }