|
|
@@ -11,13 +11,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.xunmei.common.core.constant.DictConstants;
|
|
|
import com.xunmei.common.core.constant.ErrorMsgConstants;
|
|
|
import com.xunmei.common.core.constant.SecurityConstants;
|
|
|
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlan;
|
|
|
-import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
|
|
|
import com.xunmei.common.core.domain.registerbook.domain.CoreRegisterBookPdf;
|
|
|
import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
|
|
|
import com.xunmei.common.core.enums.OrgTypeEnum;
|
|
|
import com.xunmei.common.core.enums.RegisterBookType;
|
|
|
-import com.xunmei.common.core.enums.edu.EduTrainingPlanStatus;
|
|
|
import com.xunmei.common.core.exception.ServiceException;
|
|
|
import com.xunmei.common.core.exception.SystemException;
|
|
|
import com.xunmei.common.core.thread.ThreadPoolConfig;
|
|
|
@@ -40,10 +37,7 @@ import com.xunmei.core.registerbook.service.ICoreRegisterBookPdfService;
|
|
|
import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
|
|
|
import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskBuilderService;
|
|
|
import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
|
|
|
-import com.xunmei.system.api.RemoteFileService;
|
|
|
-import com.xunmei.system.api.RemoteOrgService;
|
|
|
-import com.xunmei.system.api.RemoteRoleService;
|
|
|
-import com.xunmei.system.api.RemoteUserService;
|
|
|
+import com.xunmei.system.api.*;
|
|
|
import com.xunmei.system.api.domain.*;
|
|
|
import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
|
|
|
import io.netty.util.internal.StringUtil;
|
|
|
@@ -61,9 +55,11 @@ import javax.annotation.Resource;
|
|
|
import java.io.File;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.time.Duration;
|
|
|
import java.time.LocalDate;
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Calendar;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.List;
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -111,7 +107,8 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
|
|
|
@Autowired
|
|
|
@Qualifier(ThreadPoolConfig.SOC_EXECUTOR)
|
|
|
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ private RemoteDictDataService dictDataService;
|
|
|
@Override
|
|
|
public TableDataInfo selectPage(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
|
|
|
//未删除
|
|
|
@@ -1599,9 +1596,15 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
|
|
|
accessPdf.setOrgName(accessPdfVO.getOrgName());
|
|
|
|
|
|
List<AccessDataVo> accessDataVos = baseMapper.selectPointByTask(accessPdfVO.getTaskId());
|
|
|
+ List<SysDictData> sysDictData = dictDataService.selectDictByeType(DictConstants.CORE_REGISTRATION_PROJECT, SecurityConstants.INNER);
|
|
|
for (AccessDataVo vo : accessDataVos) {
|
|
|
vo.setProject(DictUtils.getDictLabel(DictConstants.CORE_REGISTRATION_PROJECT, Integer.parseInt(vo.getProject())));
|
|
|
+ if (ObjectUtil.isEmpty(vo.getProject())){
|
|
|
+ sysDictData.stream().filter(d->d.getDictValue().equals(vo.getProject())).findFirst().ifPresent(d->vo.setProject(d.getDictLabel()));
|
|
|
+ }
|
|
|
}
|
|
|
+ //处理没有项目的数据，或者说项目被停用的数据
|
|
|
+ accessDataVos.removeIf(d->ObjectUtil.isEmpty(d.getProject()));
|
|
|
accessPdf.setDataVos(accessDataVos);
|
|
|
accessPdf.setSignImg(getFileRealPath(accessDataVos.get(0).getSignImg(), prefixPath, staticsPath));
|
|
|
SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> remoteOrgService.selectOrgById(accessPdfVO.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
|
jingyuanchao