包活修改bug解决

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<PayBaohuoWorktime> worktimeList = bo.getWorktimeList();
 
@@ -407,8 +408,10 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
                 searchBaohuoWorktime.setEmpId(emp.getEmpId());
                 List<PayBaohuoWorktimeVo> 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") + " 该时间段包活工单工时");
+                        }
                     }
                 }
             }