xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +31089 -1038
260 changed files with 31089 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 609803605d - Show all commits

4
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java
View File

@ -85,10 +85,10 @@ public class EmsTicketServiceImpl implements IEmsTicketService
@Override
public int updateEmsTicket(EmsTicket emsTicket)
{
String status = emsTicket.getStatus().toString();
String status = emsTicket.getStatus() == null ? "" : emsTicket.getStatus().toString();
String ticketNo = emsTicket.getTicketNo();
// 判断工单状态为：3-已完成
if ("3".equals(status) && !StringUtils.isEmpty(ticketNo)) {
if (!StringUtils.isEmpty(status) && "3".equals(status) && !StringUtils.isEmpty(ticketNo)) {
// 处理告警数据状态-已处理
EmsAlarmRecords emsAlarmRecords = emsAlarmRecordsMapper.getAlarmByTicketNo(ticketNo);
if (emsAlarmRecords != null) {