[清退] 任务提交

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -670,7 +670,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
        deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.RETIRE.id,deviceRepelDetail.getReceiveUnit(),0,StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
        TaskBto fatherTask=taskService.get(taskBto.getParentTaskId());
        taskService.moveToEnd(fatherTask);
-       isEnd(fatherTask,deviceRepelDetail.getRepelId());
+       isEnd(fatherTask,deviceRepelDetailService.findDeviceRepelDetail(fatherTask.getBillId()).getRepelId());
        deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
     }
 
@@ -682,8 +682,6 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         deviceRepelDetail.setSenderUserB(storageDeviceRepel.getUserBName());
         deviceRepelDetail.setSendUserbId(storageDeviceRepel.getUserB());
 
-
-
         addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"选择了你为签发人请阅知",new ArrayList<>(storageDeviceRepel.getUserB())));
         deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
     }