lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复了一些小bug

Browse Source
This commit is contained in:
lcj
2025-03-20 16:18:12 +08:00
parent 37e91a0204
commit 7c05f661dc
6 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyLogVo.java
View File

@ -140,7 +140,7 @@ public class BusSafetyLogVo implements Serializable {
/**
* 创建人
*/
private IdAndNameVO createBy;
private IdAndNameVO creator;
/**
* 创建时间

2
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/BusSafetyWeeklyReportVo.java
View File

@ -64,7 +64,7 @@ public class BusSafetyWeeklyReportVo implements Serializable {
/**
* 文件位置
*/
private IdAndNameVO path;
private IdAndNameVO pathUrl;
/**
* 备注

4
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusTeamMeetingService.java
View File

@ -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);
/**
* 获取站班会分页对象视图

2
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyLogServiceImpl.java
View File

@ -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;
}

4
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyWeeklyReportServiceImpl.java
View File

@ -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;
}
/**

27
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusTeamMeetingServiceImpl.java
View File

@ -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;
}
/**