Browse Source

启用设备报错

2 years ago
parent
commit
5027db5fc3

+ 13 - 11
platform-service/src/main/java/com/platform/service/sb/impl/SbStatusLogServiceImpl.java

@@ -92,17 +92,19 @@ public class SbStatusLogServiceImpl extends BaseServiceImpl<SbStatusLogMapper, S
         if(model.getAfterStatus() !=null && model.getAfterStatus().equals(SbInfoStatusEnum.IN_USE.getValue())) {
             Weekend<SbStopLog> weekend = new Weekend<>(SbStopLog.class);
             weekend.weekendCriteria().andEqualTo(SbStopLog::getSbId, model.getSbId()).andEqualTo(SbStopLog::getStatus, 0);
-            SbStopLog stopLog = sbStopLogMapper.selectOneByExample(weekend);
-            // 创建新的记录,直接跳过,不记录了
-            if(stopLog != null){
-                stopLog.setStartUserId(model.getActualUser());
-                stopLog.setStartTime(now);
-                stopLog.setStartReason(model.getChangeReason());
-                stopLog.setStatus(1);
-                stopLog.setStopDuration(new BigDecimal(DateUtils.getDurationMinutes(stopLog.getStopTime(), stopLog.getStartTime())));
-                stopLog.setUpdateTime(now);
-                stopLog.setUpdateUserId(userId);
-                sbStopLogMapper.updateByPrimaryKey(stopLog);
+            List<SbStopLog> stopLogs = sbStopLogMapper.selectByExample(weekend);
+            for (SbStopLog sbStopLog:stopLogs) {
+                // 创建新的记录,直接跳过,不记录了
+                if (sbStopLog != null) {
+                    sbStopLog.setStartUserId(model.getActualUser());
+                    sbStopLog.setStartTime(now);
+                    sbStopLog.setStartReason(model.getChangeReason());
+                    sbStopLog.setStatus(1);
+                    sbStopLog.setStopDuration(new BigDecimal(DateUtils.getDurationMinutes(sbStopLog.getStopTime(), sbStopLog.getStartTime())));
+                    sbStopLog.setUpdateTime(now);
+                    sbStopLog.setUpdateUserId(userId);
+                    sbStopLogMapper.updateByPrimaryKey(sbStopLog);
+                }
             }
         }
         return sbStatusLog;