by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: by2025:1e39769309364017304974262bbee631cc264fe1
Branches Tags
by2025:master
by2025:main
...
compare: by2025:9897bb8db71b21b569a77b14488f62472f93bf30
Branches Tags
by2025:master
by2025:main

2 Commits
1e39769309 ... 9897bb8db7

Author SHA1 Message Date
lxj
9897bb8db7 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m25s
Details
2025-08-22 18:14:28 +08:00
lxj
4a62ad17c3 修改详情逻辑 2025-08-22 18:14:17 +08:00
2 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventProcessVo.java
View File

@ -51,7 +51,7 @@ public class SisAlarmEventProcessVo implements Serializable {
private String solveName; private String solveName;
/** /**
* 工单问题回复内容 * 问题回复内容
*/ */
@ExcelProperty(value = "工单问题回复内容") @ExcelProperty(value = "工单问题回复内容")
private String workReply; private String workReply;

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventProcessServiceImpl.java
View File

@ -148,7 +148,7 @@ public class SisAlarmEventProcessServiceImpl implements ISisAlarmEventProcessSer
LambdaQueryWrapper<SisAlarmEventProcess> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<SisAlarmEventProcess> lqw = Wrappers.lambdaQuery();
lqw.eq(SisAlarmEventProcess::getAlarmId, alarmId); lqw.eq(SisAlarmEventProcess::getAlarmId, alarmId);
lqw.eq(SisAlarmEventProcess::getState, 40); lqw.eq(SisAlarmEventProcess::getState, 40);
SisAlarmEventProcessVo sisAlarmEventProcessVo = baseMapper.selectVoById(alarmId); SisAlarmEventProcessVo sisAlarmEventProcessVo = baseMapper.selectVoOne(lqw);
if (sisAlarmEventProcessVo == null) { if (sisAlarmEventProcessVo == null) {
return null; return null;
} }