From d27cd34e90c453a8a6d719e99017f3b2e991b0e6 Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Mon, 20 May 2024 15:09:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3:=E4=BA=A4=E6=8E=A5=E7=8F=AD?=
 =?UTF-8?q?=E5=80=BC=E7=8F=AD=E6=97=A5=E5=BF=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operational/duty/service/impl/ImsDutyRecServiceImpl.java      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
index 3f45160..bad0c0d 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
@@ -245,7 +245,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
         }
         ImsDutyLogEntity imsDutyLogEntity = recDTO.getImsDutyLogEntity();
         imsDutyLogEntity.setHandTime(DateUtil.format(new Date(),PATTERN_DATETIME));
-        imsDutyLogService.save(imsDutyLogEntity);
+        imsDutyLogService.saveOrUpdate(imsDutyLogEntity);
         // 开启值班交接班流程
         recEntity.setQrCodeContent(System.currentTimeMillis() + "");
         BladeFlow bladeFlow = this.startDutyRecProcess(recEntity, managerId);
@@ -319,6 +319,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
                 variable
         );
         Assert.isTrue(flowResult.isSuccess(),() -> {
+            log.error("交接班请求报错"+flowResult.getMsg());
             throw new ServiceException(flowResult.getMsg());
         });
         return flowResult.getData();
@@ -487,6 +488,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
             Long dutyId = imsDutyRecVO.getDutyId();
             ImsDutyLogEntity dutyLogEntity = imsDutyLogService.getOne(new LambdaQueryWrapper<ImsDutyLogEntity>() {{
                 eq(ImsDutyLogEntity::getDutyId, dutyId);
+               last(" limit 1;");
             }});
             imsDutyRecVO.setImsDutyLogEntity(dutyLogEntity);
         }
@@ -1606,10 +1608,6 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
             Integer doingNum = operateTicketInfoData.size() - finishSize - invalidSize;
             dutyLogEntity.setOperationUnFinish(doingNum.toString());
         }
-        TicketStatisticDTO ticketStatisticDTO=new TicketStatisticDTO();
-        ticketStatisticDTO.setStartDate(DateUtil.format(classEntity.getStartTime(),"yyyy-MM-dd HH:mm:ss"));
-        ticketStatisticDTO.setEndDate(DateUtil.format(classEntity.getEndTime(),"yyyy-MM-dd HH:mm:ss"));
-        ticketStatisticDTO.setDeptIds(deptId);
         return R.data(dutyLogEntity);
     }