|
|
@@ -179,11 +179,11 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
|
|
|
}
|
|
|
iIsJobTicketPointsService.saveBatch(isJobTicketPoints);
|
|
|
// 3.1新增作业票和钥匙的关联关系(两条数据,一条上锁,一条解锁)
|
|
|
- saveJobTicketKet(jobTicket.getTicketId());
|
|
|
+ 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();
|
|
|
@@ -233,7 +233,7 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
|
|
|
}
|
|
|
iIsJobTicketPointsService.saveBatch(isJobTicketPoints);
|
|
|
// 3.1新增作业票和钥匙的关联关系(两条数据,一条上锁,一条解锁)
|
|
|
- saveJobTicketKet(jobTicket.getTicketId());
|
|
|
+ saveJobTicketKey(jobTicket.getTicketId());
|
|
|
// 3.2新增作业票和挂锁的关联关// 3.3新增作业票和锁具的关联关系
|
|
|
List<Long> pointIds = points.stream().map(IsMachineryPoints::getPointId).collect(Collectors.toList());
|
|
|
List<IsIsolationPoint> pointList = iIsIsolationPointService.listByIds(pointIds);
|
|
|
@@ -260,7 +260,7 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
|
|
|
*
|
|
|
* @return b
|
|
|
*/
|
|
|
- private boolean saveJobTicketKet(Long ticketId) {
|
|
|
+ private boolean saveJobTicketKey(Long ticketId) {
|
|
|
IsJobTicketKey isJobTicketKey = new IsJobTicketKey();
|
|
|
isJobTicketKey.setTicketId(ticketId);
|
|
|
isJobTicketKey.setKeyStatus("0");
|