|
@@ -16,6 +16,7 @@ import cn.cslg.pas.domain.business.*;
|
|
|
import cn.cslg.pas.exception.XiaoShiException;
|
|
|
import cn.cslg.pas.mapper.ReportAffairCasePhaseMapper;
|
|
|
import cn.cslg.pas.mapper.ReportAffairMapper;
|
|
|
+import cn.cslg.pas.mapper.ReportProjectMapper;
|
|
|
import cn.cslg.pas.service.MailSendService;
|
|
|
import cn.cslg.pas.service.common.FileManagerService;
|
|
|
import cn.cslg.pas.service.permissions.PermissionService;
|
|
@@ -93,6 +94,9 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
|
|
|
@Autowired
|
|
|
private AssoReportCronService assoReportCronService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ReportProjectMapper reportProjectMapper;
|
|
|
+
|
|
|
/**
|
|
|
* 创建报告事务
|
|
|
*
|
|
@@ -138,8 +142,14 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
|
|
|
queryWrapper1.eq(OralTrail::getReportAffairId, id);
|
|
|
oralTrailService.remove(queryWrapper1);
|
|
|
} else if (flowType.equals(7)) {//无效决定书
|
|
|
- //删除报告无效结果与报告关联
|
|
|
Integer projectId = reportAffair.getProjectId();
|
|
|
+ //删除报告中的发文序号
|
|
|
+ ReportProject reportProject = reportProjectMapper.selectOne(new LambdaQueryWrapper<ReportProject>()
|
|
|
+ .eq(ReportProject::getProjectId, projectId));
|
|
|
+ reportProject.setId(reportProject.getId());
|
|
|
+ reportProject.setIssueNumber(null);
|
|
|
+ reportProject.updateById();
|
|
|
+ //删除报告无效结果与报告关联
|
|
|
LambdaQueryWrapper<AssoReportCron> reportCronWrapper = new LambdaQueryWrapper<>();
|
|
|
reportCronWrapper.eq(AssoReportCron::getProjectId, projectId);
|
|
|
assoReportCronService.remove(reportCronWrapper);
|