对接修改

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

@@ -186,9 +186,9 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
         // 3.1新增作业票和钥匙的关联关系(两条数据，一条上锁，一条解锁)
         saveJobTicketKey(jobTicket.getTicketId());
         // 3.2新增作业票和挂锁的关联关// 3.3新增作业票和锁具的关联关系
-        // List<Long> pointIds = points.stream().map(IsMachineryPoints::getPointId).collect(Collectors.toList());
-        // List<IsIsolationPoint> pointList = iIsIsolationPointService.listByIds(pointIds);
-        // saveJobTicketLockAndSet(pointList, jobTicket.getTicketId());
+        List<Long> pointIds = points.stream().map(IsMachineryPoints::getPointId).collect(Collectors.toList());
+        List<IsIsolationPoint> pointList = iIsIsolationPointService.listByIds(pointIds);
+        saveJobTicketLockAndSet(pointList, jobTicket.getTicketId());
 
         // 4.新增八大步骤信息
         JobStepEnum jobStepEnum = new JobStepEnum();
@@ -286,25 +286,25 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
 
     private boolean saveJobTicketLockAndSet(List<IsIsolationPoint> pointList, Long ticketId) {
         ArrayList<IsJobTicketLock> isJobTicketLocks = new ArrayList<>();
-        ArrayList<IsJobTicketLockset> isJobTicketLocksets = new ArrayList<>();
+        // ArrayList<IsJobTicketLockset> isJobTicketLocksets = new ArrayList<>();
         for (IsIsolationPoint point : pointList) {
-            if (point.getLockTypeId() != null) {
+            //if (point.getLockTypeId() != null) {
                 IsJobTicketLock isJobTicketLock = new IsJobTicketLock();
                 isJobTicketLock.setTicketId(ticketId);
                 isJobTicketLock.setLockStatus("0");
                 isJobTicketLocks.add(isJobTicketLock);
-            }
-            if (point.getLocksetTypeId() != null) {
+            //}
+            /*if (point.getLocksetTypeId() != null) {
                 IsJobTicketLockset isJobTicketLockset = new IsJobTicketLockset();
                 isJobTicketLockset.setJobTicketId(ticketId);
                 isJobTicketLockset.setLocksetStatus("0");
                 isJobTicketLockset.setLocksetTypeId(point.getLocksetTypeId());
                 isJobTicketLocksets.add(isJobTicketLockset);
-            }
+            }*/
         }
         // 开始批量新增
         iIsJobTicketLockService.saveBatch(isJobTicketLocks);
-        iIsJobTicketLocksetService.saveBatch(isJobTicketLocksets);
+        // iIsJobTicketLocksetService.saveBatch(isJobTicketLocksets);
         return true;
     }