From 62d61e6f30f34716483152ca582895e6144154cf Mon Sep 17 00:00:00 2001 From: hshansha Date: Wed, 4 Jun 2025 10:29:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E6=B4=BB=E4=BF=AE=E6=94=B9bug?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/service/impl/PayWorkOrderBaohuoServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java index 7153700..5ff209e 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java @@ -355,6 +355,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService * 修改包活派工单 */ @Override + @Transactional public Boolean updateByBo(PayWorkOrderBaohuoBo bo) { List worktimeList = bo.getWorktimeList(); @@ -407,8 +408,10 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService searchBaohuoWorktime.setEmpId(emp.getEmpId()); List baohuoWorktimes = bhworktimeService.queryList(searchBaohuoWorktime); for (PayBaohuoWorktimeVo baohuoWorktime : baohuoWorktimes) { - if (DateCompareUtil.isContainOrOverlap(baohuoWorktime.getStime(), baohuoWorktime.getEtime(), bhworktime.getStime(), bhworktime.getEtime())) { - throw new ServiceException("员工："+ emp.getEmpName()+ "已经存在 " +DateUtil.format(bhworktime.getStime(), "yyyy-MM-dd HH:mm:ss") + " 到 " + DateUtil.format(bhworktime.getEtime(), "yyyy-MM-dd HH:mm:ss") + " 该时间段包活工单工时"); + if(!baohuoWorktime.getWoId().equals(bo.getId())){ + if (DateCompareUtil.isContainOrOverlap(baohuoWorktime.getStime(), baohuoWorktime.getEtime(), bhworktime.getStime(), bhworktime.getEtime())) { + throw new ServiceException("员工："+ emp.getEmpName()+ "已经存在 " +DateUtil.format(bhworktime.getStime(), "yyyy-MM-dd HH:mm:ss") + " 到 " + DateUtil.format(bhworktime.getEtime(), "yyyy-MM-dd HH:mm:ss") + " 该时间段包活工单工时"); + } } } }