From 19ceb728db604c07407e410cb4ce75bc1f0a57e5 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 9 Jul 2025 10:06:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/policecamera/entity/WorkTicket.java  | 16 +++++++++++-----
 .../policecamera/entity/vo/WorkTicketVo.java     |  5 -----
 .../service/impl/WorkTicketServiceImpl.java      |  8 --------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/WorkTicket.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/WorkTicket.java
index 9155216e9..80d05b0df 100644
--- a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/WorkTicket.java
+++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/WorkTicket.java
@@ -55,9 +55,9 @@ public class WorkTicket implements Serializable {
     @ApiModelProperty(value = "工作票编号")
     private java.lang.String workTicketNumber;
     /**
-     * 施工区域s（多个,分割）
+     * 施工场站s（多个,分割）
      */
-    @ApiModelProperty(value = "施工区域s（多个,分割）")
+    @ApiModelProperty(value = "施工场站s（多个,分割）")
     private java.lang.String constructionAreas;
     /**
      * 申请单位s（多个,分割）
@@ -86,10 +86,10 @@ public class WorkTicket implements Serializable {
     @ApiModelProperty(value = "施工计划时间结束")
     private java.util.Date constructionTimeEnd;
     /**
-     * 作业人员s（多个,分割）
+     * 作业人员
      */
-    @ApiModelProperty(value = "作业人员s（多个,分割）")
-    private java.lang.String operators;
+    @ApiModelProperty(value = "作业人员")
+    private java.lang.String operator;
     /**
      * 作业内容
      */
@@ -120,4 +120,10 @@ public class WorkTicket implements Serializable {
      */
     @ApiModelProperty(value = "状态：1:未开始;2:施工中;3:暂停中;4:已完工;")
     private java.lang.Integer status;
+    /**
+     * 施工地点
+     */
+    @ApiModelProperty(value = "施工地点")
+    private java.lang.String constructionAddr;
+
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/WorkTicketVo.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/WorkTicketVo.java
index 4d8c341b3..1b971e84e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/WorkTicketVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/WorkTicketVo.java
@@ -21,11 +21,6 @@ public class WorkTicketVo extends WorkTicket {
      */
     @ApiModelProperty(value = "申请单位名称s（多个,分割）")
     private java.lang.String applicantNames;
-    /**
-     * 作业人员名称s（多个,分割）
-     */
-    @ApiModelProperty(value = "作业人员名称s（多个,分割）")
-    private java.lang.String operatorNames;
     /**
      * 执法记录仪设备列表
      */
diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java
index f156791e4..a301eca9f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java
@@ -27,7 +27,6 @@ import com.zhgd.xmgl.modules.project.service.IProjectConfigService;
 import com.zhgd.xmgl.modules.quality.entity.QualityRegion;
 import com.zhgd.xmgl.modules.quality.service.IQualityRegionService;
 import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
-import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
 import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl;
 import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl;
 import com.zhgd.xmgl.util.EntityUtils;
@@ -110,7 +109,6 @@ public class WorkTicketServiceImpl extends ServiceImpl<WorkTicketMapper, WorkTic
             String projectSn = list.get(0).getProjectSn();
             Map<Long, QualityRegion> regionMap = qualityRegionService.getQualityRegionMapByProjectSn(projectSn);
             Map<Long, EnterpriseInfo> enterpriseMap = enterpriseInfoService.getEnterpriseMapByProjectSn(projectSn);
-            Map<Long, WorkerInfo> workerMap = workerInfoService.getWorkerMapByProjectSn(projectSn);
             List<Long> ticketIds = list.stream().map(WorkTicketVo::getId).collect(Collectors.toList());
             Map<Long, PoliceCameraItem> policeCameraItemMap = policeCameraItemService.getItemMapByProjectSn(projectSn);
             Map<Long, List<PoliceCameraItem>> ticketMap = workTicketCameraRelService.list(new LambdaQueryWrapper<WorkTicketCameraRel>()
@@ -129,12 +127,6 @@ public class WorkTicketServiceImpl extends ServiceImpl<WorkTicketMapper, WorkTic
                         regionMap,
                         QualityRegion::getRegionName
                 ));
-                // 设置操作人名称
-                ticketVo.setOperatorNames(EntityUtils.convertIdsToNames(
-                        ticketVo.getOperators(),
-                        workerMap,
-                        WorkerInfo::getWorkerName
-                ));
                 ticketVo.setItemList(ticketMap.get(ticketVo.getId()));
             }
         }