|
@@ -9,6 +9,7 @@ import cn.cslg.pas.common.model.report.ExtraEmailDTO;
|
|
|
import cn.cslg.pas.common.model.report.MailMessageDTO;
|
|
|
import cn.cslg.pas.common.utils.CacheUtils;
|
|
|
import cn.cslg.pas.common.utils.LoginUtils;
|
|
|
+import cn.cslg.pas.common.vo.business.CronVO;
|
|
|
import cn.cslg.pas.common.vo.invalidVO.*;
|
|
|
import cn.cslg.pas.domain.BaseEntity;
|
|
|
import cn.cslg.pas.domain.business.*;
|
|
@@ -83,6 +84,12 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
|
|
|
@Autowired
|
|
|
private ReportAffairCasePhaseMapper reportAffairCasePhaseMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private AssoInvalidDecisionCronService assoInvalidDecisionCronService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private SystemDictService systemDictService;
|
|
|
+
|
|
|
/**
|
|
|
* 创建报告事务
|
|
|
*
|
|
@@ -128,6 +135,13 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
|
|
|
queryWrapper1.eq(OralTrail::getReportAffairId, id);
|
|
|
oralTrailService.remove(queryWrapper1);
|
|
|
} else if (flowType.equals(7)) {//无效决定书
|
|
|
+ //无效决定书和无效结果关联
|
|
|
+ InvalidDecisionFile decisionFile = invalidDecisionFileService.getOne(new LambdaQueryWrapper<InvalidDecisionFile>()
|
|
|
+ .eq(InvalidDecisionFile::getReportAffairId, id));
|
|
|
+ LambdaQueryWrapper<AssoInvalidDecisionCron> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ wrapper.eq(AssoInvalidDecisionCron::getInvalidDecisionId, decisionFile.getId());
|
|
|
+ assoInvalidDecisionCronService.remove(wrapper);
|
|
|
+ //无效决定书
|
|
|
LambdaQueryWrapper<InvalidDecisionFile> queryWrapper1 = new LambdaQueryWrapper<>();
|
|
|
queryWrapper1.eq(InvalidDecisionFile::getReportAffairId, id);
|
|
|
invalidDecisionFileService.remove(queryWrapper1);
|
|
@@ -217,6 +231,11 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
|
|
|
this.loadSystemFile(reportAffairVOS);
|
|
|
//装载创建人名
|
|
|
this.loadCreateName(reportAffairVOS);
|
|
|
+ List<ReportAffairVO> affairVOS = reportAffairVOS.stream().filter(i -> i.getFlowType().equals(7)).collect(Collectors.toList());
|
|
|
+ if (!CollectionUtils.isEmpty(affairVOS)) {
|
|
|
+ //装载无效决定书与无效结果关联
|
|
|
+ this.loadAssoInvalidDecisionCron(affairVOS);
|
|
|
+ }
|
|
|
}
|
|
|
return reportAffairVOS;
|
|
|
}
|
|
@@ -314,6 +333,46 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 装载无效决定书与无效结果关联
|
|
|
+ * @param reportAffairVOS
|
|
|
+ */
|
|
|
+ public void loadAssoInvalidDecisionCron(List<ReportAffairVO> reportAffairVOS) {
|
|
|
+ if (!CollectionUtils.isEmpty(reportAffairVOS)) {
|
|
|
+ List<InvalidDecisionFileVO> decisionFileVOS = reportAffairVOS.stream().map(ReportAffairVO::getInvalidDecisionFileVO).collect(Collectors.toList());
|
|
|
+ List<Integer> invalidDecisionIds = decisionFileVOS.stream().map(InvalidDecisionFileVO::getInvalidDecisionFileId).collect(Collectors.toList());
|
|
|
+ //查询核心结论
|
|
|
+ LambdaQueryWrapper<AssoInvalidDecisionCron> reportCronLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ reportCronLambdaQueryWrapper.in(AssoInvalidDecisionCron::getInvalidDecisionId, invalidDecisionIds);
|
|
|
+ List<AssoInvalidDecisionCron> crons = assoInvalidDecisionCronService.list(reportCronLambdaQueryWrapper);
|
|
|
+ List<SystemDict> systemDictList = new ArrayList<>();
|
|
|
+ if (!CollectionUtils.isEmpty(crons)) {
|
|
|
+ LambdaQueryWrapper<SystemDict> systemDictLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ systemDictLambdaQueryWrapper.eq(SystemDict::getGroupType, "ASSESS");
|
|
|
+ systemDictList = systemDictService.list(systemDictLambdaQueryWrapper);
|
|
|
+ }
|
|
|
+
|
|
|
+ for (InvalidDecisionFileVO decisionFileVO : decisionFileVOS) {
|
|
|
+ List<Integer> reCronIds = new ArrayList<>();
|
|
|
+ List<String> reCronNames = new ArrayList<>();
|
|
|
+ if (!CollectionUtils.isEmpty(crons)) {
|
|
|
+ List<AssoInvalidDecisionCron> decisionCrons = crons.stream().filter(item -> item.getInvalidDecisionId().equals(decisionFileVO.getInvalidDecisionFileId())).collect(Collectors.toList());
|
|
|
+ if (!CollectionUtils.isEmpty(decisionCrons)) {
|
|
|
+ //过滤出事件
|
|
|
+ List<Integer> cronIds = decisionCrons.stream().map(AssoInvalidDecisionCron::getCronId).collect(Collectors.toList());
|
|
|
+ List<SystemDict> systemDicts = systemDictList.stream().filter(item -> cronIds.contains(Integer.parseInt(item.getValue()))).collect(Collectors.toList());
|
|
|
+ systemDicts.forEach(item -> {
|
|
|
+ reCronIds.add(Integer.parseInt(item.getValue()));
|
|
|
+ reCronNames.add(item.getLabel());
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ decisionFileVO.setCronIds(reCronIds);
|
|
|
+ decisionFileVO.setCronNames(reCronNames);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 装载行政诉讼书
|
|
|
*
|
|
|
* @param reportAffairVO
|