From 768a172828514388525bd87c1377fcb536dcbe16 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Thu, 16 May 2024 17:45:16 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/exam/controller/ExamCourseController.java | 11 +++++++----
 .../video/service/impl/VideoItemServiceImpl.java      |  1 +
 .../xz/entity/XzDangerousEngineeringAcceptance.java   |  2 ++
 .../xz/special/mapper/xml/XzHighJobSafeMapper.xml     |  5 +++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamCourseController.java b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamCourseController.java
index 8fd54024e..30bcb0c72 100644
--- a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamCourseController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamCourseController.java
@@ -1,5 +1,6 @@
 package com.zhgd.xmgl.modules.exam.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.xmgl.modules.exam.entity.ExamCourseRecord;
@@ -85,10 +86,12 @@ public class ExamCourseController {
         Page<ExamCourse> pageList = examCourseService.pageList(page, queryWrapper);
         Page<ExamCourseVo> examCourseVoPage = PageUtil.copyProperties(pageList, ExamCourseVo.class);
         List<Long> ids = examCourseVoPage.getRecords().stream().map(e -> e.getId()).collect(Collectors.toList());
-        List<ExamCourseRecord> list = examCourseRecordService.list(Wrappers.<ExamCourseRecord>lambdaQuery().in(ExamCourseRecord::getCourseId, ids));
-        for (ExamCourseVo record : examCourseVoPage.getRecords()) {
-            record.setRequiredWorker(list.stream().filter(e -> e.getCourseId().equals(record.getId()) && e.getType() == 1).collect(Collectors.toList()).size());
-            record.setOtherWorker(list.stream().filter(e -> e.getCourseId().equals(record.getId()) && e.getType() == 2).collect(Collectors.toList()).size());
+        if (CollUtil.isNotEmpty(ids)) {
+            List<ExamCourseRecord> list = examCourseRecordService.list(Wrappers.<ExamCourseRecord>lambdaQuery().in(ExamCourseRecord::getCourseId, ids));
+            for (ExamCourseVo record : examCourseVoPage.getRecords()) {
+                record.setRequiredWorker(list.stream().filter(e -> e.getCourseId().equals(record.getId()) && e.getType() == 1).collect(Collectors.toList()).size());
+                record.setOtherWorker(list.stream().filter(e -> e.getCourseId().equals(record.getId()) && e.getType() == 2).collect(Collectors.toList()).size());
+            }
         }
         return Result.success(examCourseVoPage);
     }
diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
index f011fef51..40736413a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
@@ -287,6 +287,7 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
                         projectVideoConfig.getPassword(), projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret());
                 Map<String, Object> result = new HashMap<>();
                 result.put("url", url);
+                result.put("serialNumber", videoItem.getSerialNumber());
                 data.put("videoInfo", result);
                 data.put("projectVideoConfig", projectVideoConfig);
             }
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzDangerousEngineeringAcceptance.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzDangerousEngineeringAcceptance.java
index 8135151a8..d2a77f745 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzDangerousEngineeringAcceptance.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzDangerousEngineeringAcceptance.java
@@ -115,6 +115,8 @@ public class XzDangerousEngineeringAcceptance implements Serializable {
     private java.util.Date updateTime;
     @ApiModelProperty(value = "1危大2动火3受限空间4盲板抽堵5高出6吊装7临时用电8动土9断路")
     private Integer type;
+    @ApiModelProperty(value = "作业票编号")
+    private String workTicketCode;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "危大工程名称（显示用，新增不用传）")
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml
index 2f8ee9e25..ef38791db 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml
@@ -42,10 +42,11 @@
             and project_sn = #{param.projectSn}
         </if>
         <if test="param.engineeringId != null and param.engineeringId != ''">
-            and enterprise_id = #{param.engineeringId}
+            and engineering_id = #{param.engineeringId}
         </if>
         AND `status` in (2, 3, 4)
-        AND type = 5 BY engineering_id) tp ON t.id = tp.engineering_id
+        AND type = 5
+        group BY engineering_id) tp ON t.id = tp.engineering_id
     </sql>
     <select id="queryList" resultType="com.zhgd.xmgl.modules.xz.special.entity.XzHighJobSafe">
         <include refid="selectTable">