|
|
@@ -1,5 +1,6 @@ |
|
|
|
package com.tuoheng.miniprogram.service.impl; |
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollectionUtil; |
|
|
|
import cn.hutool.core.convert.Convert; |
|
|
|
import cn.hutool.core.date.DateField; |
|
|
|
import cn.hutool.core.date.DateTime; |
|
|
@@ -210,7 +211,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
//被分配人员对应id |
|
|
|
String assignUser = x.getAssignUser(); |
|
|
|
String[] assignUserId = assignUser.split(","); |
|
|
|
if (null == assignUserId) { |
|
|
|
if (StringUtils.isEmpty(assignUserId)) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
List<String> list = new ArrayList<>(); |
|
|
@@ -225,13 +226,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
//问题总数 |
|
|
|
List<WorkOrderFile> workOrderFiles = workOrderFileMapper.selectList(Wrappers.<WorkOrderFile>lambdaQuery() |
|
|
|
.eq(WorkOrderFile::getWorkOrderId, x.getId())); |
|
|
|
if (null == workOrderFiles) { |
|
|
|
if (CollectionUtil.isEmpty(workOrderFiles)) { |
|
|
|
throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL); |
|
|
|
} |
|
|
|
vo.setPromTotal(workOrderFiles.size()); |
|
|
|
//对应的问题id集合 |
|
|
|
List<String> inspectionFiledIds = workOrderFiles.stream().map(o -> o.getInspectionFileId()).collect(Collectors.toList()); |
|
|
|
if (null == inspectionFiledIds) { |
|
|
|
if (CollectionUtil.isEmpty(inspectionFiledIds)) { |
|
|
|
throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL); |
|
|
|
} |
|
|
|
//获取问题集合 |