From 7c05f661dc97c968b8f8299aff8e472649a7dacd Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Thu, 20 Mar 2025 16:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=B0=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safety/domain/vo/BusSafetyLogVo.java      |  2 +-
 .../domain/vo/BusSafetyWeeklyReportVo.java    |  2 +-
 .../service/IBusTeamMeetingService.java       |  4 +--
 .../service/impl/BusSafetyLogServiceImpl.java |  2 +-
 .../BusSafetyWeeklyReportServiceImpl.java     |  4 +--
 .../impl/BusTeamMeetingServiceImpl.java       | 27 +++++++++----------
 6 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyLogVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyLogVo.java
index a7c38618..4f7f6ae6 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyLogVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyLogVo.java
@@ -140,7 +140,7 @@ public class BusSafetyLogVo implements Serializable {
     /**
      * 创建人
      */
-    private IdAndNameVO createBy;
+    private IdAndNameVO creator;
 
     /**
      * 创建时间
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyWeeklyReportVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyWeeklyReportVo.java
index d088b5d7..4e741f32 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyWeeklyReportVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyWeeklyReportVo.java
@@ -64,7 +64,7 @@ public class BusSafetyWeeklyReportVo implements Serializable {
     /**
      * 文件位置
      */
-    private IdAndNameVO path;
+    private IdAndNameVO pathUrl;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusTeamMeetingService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusTeamMeetingService.java
index f837c019..6b4c8048 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusTeamMeetingService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusTeamMeetingService.java
@@ -1,6 +1,6 @@
 package org.dromara.safety.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -86,7 +86,7 @@ public interface IBusTeamMeetingService extends IService<BusTeamMeeting> {
      * @param req 站班会查询条件
      * @return 站班会查询条件封装
      */
-    QueryWrapper<BusTeamMeeting> getQueryWrapper(TeamMeetingQueryReq req);
+    LambdaQueryWrapper<BusTeamMeeting> getQueryWrapper(TeamMeetingQueryReq req);
 
     /**
      * 获取站班会分页对象视图
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyLogServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyLogServiceImpl.java
index dc0f5073..02d70d2b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyLogServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyLogServiceImpl.java
@@ -194,7 +194,7 @@ public class BusSafetyLogServiceImpl extends ServiceImpl<BusSafetyLogMapper, Bus
         Long createBy = safetyLog.getCreateBy();
         if (createBy != null) {
             BusConstructionUser createUser = constructionUserService.getById(createBy);
-            safetyLogVo.setCreateBy(IdAndNameVO.build(createUser.getId(), createUser.getUserName()));
+            safetyLogVo.setCreator(IdAndNameVO.build(createUser.getId(), createUser.getUserName()));
         }
         return safetyLogVo;
     }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyWeeklyReportServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyWeeklyReportServiceImpl.java
index 052ecd21..c9bb6d5b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyWeeklyReportServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyWeeklyReportServiceImpl.java
@@ -167,7 +167,7 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeekl
         String path = safetyWeeklyReport.getPath();
         if (StringUtils.isNotBlank(path)) {
             SysOssVo ossVo = ossService.getById(Long.valueOf(path));
-            safetyWeeklyReportVo.setPath(IdAndNameVO.build(ossVo.getOssId(), ossVo.getUrl()));
+            safetyWeeklyReportVo.setPathUrl(IdAndNameVO.build(ossVo.getOssId(), ossVo.getUrl()));
         }
         return safetyWeeklyReportVo;
     }
@@ -201,7 +201,7 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl<BusSafetyWeekl
         lqw.eq(ObjectUtils.isNotEmpty(id), BusSafetyWeeklyReport::getId, id);
         lqw.eq(ObjectUtils.isNotEmpty(projectId), BusSafetyWeeklyReport::getProjectId, projectId);
         lqw.eq(ObjectUtils.isNotEmpty(week), BusSafetyWeeklyReport::getWeek, week);
-        return null;
+        return lqw;
     }
 
     /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusTeamMeetingServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusTeamMeetingServiceImpl.java
index 2b7e0f75..559d2d90 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusTeamMeetingServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusTeamMeetingServiceImpl.java
@@ -3,7 +3,6 @@ package org.dromara.safety.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -256,10 +255,10 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
      * @return 站班会查询条件封装
      */
     @Override
-    public QueryWrapper<BusTeamMeeting> getQueryWrapper(TeamMeetingQueryReq req) {
-        QueryWrapper<BusTeamMeeting> queryWrapper = new QueryWrapper<>();
+    public LambdaQueryWrapper<BusTeamMeeting> getQueryWrapper(TeamMeetingQueryReq req) {
+        LambdaQueryWrapper<BusTeamMeeting> lqw = Wrappers.lambdaQuery();
         if (req == null) {
-            return queryWrapper;
+            return lqw;
         }
         Long id = req.getId();
         Long projectId = req.getProjectId();
@@ -273,20 +272,20 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl<BusTeamMeetingMapper,
         // JSON 数组查询
         if (CollUtil.isNotEmpty(participantIdList)) {
             for (String participantId : participantIdList) {
-                queryWrapper.like("participant_id", "\"" + participantId + "\"");
+                lqw.like(BusTeamMeeting::getParticipantId, "\"" + participantId + "\"");
             }
         }
         // 模糊查询
-        queryWrapper.like(StringUtils.isNotBlank(content), "content", content);
-        queryWrapper.like(StringUtils.isNotBlank(remark), "remark", remark);
+        lqw.like(StringUtils.isNotBlank(content), BusTeamMeeting::getContent, content);
+        lqw.like(StringUtils.isNotBlank(remark), BusTeamMeeting::getRemark, remark);
         // 精准查询
-        queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
-        queryWrapper.eq(ObjectUtils.isNotEmpty(projectId), "project_id", projectId);
-        queryWrapper.eq(ObjectUtils.isNotEmpty(teamId), "team_id", teamId);
-        queryWrapper.eq(ObjectUtils.isNotEmpty(contractorId), "contractor_id", contractorId);
-        queryWrapper.eq(ObjectUtils.isNotEmpty(meetingDate), "meeting_date", meetingDate);
-        queryWrapper.eq(ObjectUtils.isNotEmpty(compereId), "compere_id", compereId);
-        return queryWrapper;
+        lqw.eq(ObjectUtils.isNotEmpty(id), BusTeamMeeting::getId, id);
+        lqw.eq(ObjectUtils.isNotEmpty(projectId), BusTeamMeeting::getProjectId, projectId);
+        lqw.eq(ObjectUtils.isNotEmpty(teamId), BusTeamMeeting::getTeamId, teamId);
+        lqw.eq(ObjectUtils.isNotEmpty(contractorId), BusTeamMeeting::getContractorId, contractorId);
+        lqw.eq(ObjectUtils.isNotEmpty(meetingDate), BusTeamMeeting::getMeetingDate, meetingDate);
+        lqw.eq(ObjectUtils.isNotEmpty(compereId), BusTeamMeeting::getCompereId, compereId);
+        return lqw;
     }
 
     /**