修改逻辑删除->物理删除

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsHardwareTypeController.java

@@ -67,7 +67,8 @@ public class IsHardwareTypeController extends BaseController
         Page<IsHardwareType> result = isHardwareTypeService.page(page, Wrappers.<IsHardwareType>lambdaQuery()
                 .like(StringUtils.isNotBlank(getListDTO.getHardwareTypeName()), IsHardwareType::getHardwareTypeName, getListDTO.getHardwareTypeName())
                 .like(StringUtils.isNotBlank(getListDTO.getHardwareTypeCode()), IsHardwareType::getHardwareTypeCode, getListDTO.getHardwareTypeCode())
-                .eq(StringUtils.isNotBlank(getListDTO.getEnableFlag()), IsHardwareType::getEnableFlag, getListDTO.getEnableFlag()));
+                .eq(StringUtils.isNotBlank(getListDTO.getEnableFlag()), IsHardwareType::getEnableFlag, getListDTO.getEnableFlag())
+                .orderByDesc(IsHardwareType::getId));
         return CommonResult.success(result);
     }
 

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsJobTicketServiceImpl.java

@@ -173,8 +173,11 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
                 .in(IsJobTicketPoints::getPointId, pointIds));
         // 3.1如果查出来变更了，开始执行删除，重新增加一轮
         if (pointIds.length != isSopPoints.size()) {
-            iIsJobTicketPointsService.remove(Wrappers.<IsJobTicketPoints>lambdaQuery()
-                    .eq(IsJobTicketPoints::getTicketId, dto.getTicketId()));
+            Set<Long> recordIds = isSopPoints.stream().map(IsJobTicketPoints::getRecordId).collect(Collectors.toSet());
+            if (!recordIds.isEmpty()) {
+                String rids = StringUtils.join(recordIds.toArray(), ",");
+                iIsJobTicketPointsService.deleteIsJobTicketPointsByRecordIds(rids);
+            }
             // TODO 批量新增
             for (Long pointId : pointIds) {
                 IsJobTicketPoints isJobTicketPoints = new IsJobTicketPoints();

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsSopServiceImpl.java

@@ -135,11 +135,14 @@ public class IsSopServiceImpl extends ServiceImpl<IsSopMapper, IsSop> implements
         // 2.开始检查隔离点有没有变更
         Long[] pointIds = Convert.toLongArray(dto.getPointIds());
         List<IsSopPoints> isSopPoints = iIsSopPointsService.list(Wrappers.<IsSopPoints>lambdaQuery()
-                .eq(IsSopPoints::getSopId, dto.getSopId())
-                .in(IsSopPoints::getPointId, pointIds));
+                .eq(IsSopPoints::getSopId, dto.getSopId()));
         // 2.1如果查出来变更了，开始执行删除，重新增加一轮
         if (pointIds.length != isSopPoints.size()) {
-            iIsSopPointsService.remove(Wrappers.<IsSopPoints>lambdaQuery().eq(IsSopPoints::getSopId, dto.getSopId()));
+            Set<Long> recordIds = isSopPoints.stream().map(IsSopPoints::getRecordId).collect(Collectors.toSet());
+            if (!recordIds.isEmpty()) {
+                String rids = StringUtils.join(recordIds.toArray(), ",");
+                iIsSopPointsService.deleteIsSopPointsByRecordIds(rids);
+            }
             // TODO 批量新增
             for (Long pointId : pointIds) {
                 IsSopPoints newSopPoints = new IsSopPoints();