|
@@ -3,19 +3,29 @@ package cn.cslg.pas.service.report;
|
|
|
import cn.cslg.pas.common.model.cronModel.Personnel;
|
|
|
import cn.cslg.pas.common.model.cronModel.PersonnelVO;
|
|
|
import cn.cslg.pas.common.model.report.*;
|
|
|
+import cn.cslg.pas.common.model.cronModel.SystemFile;
|
|
|
+import cn.cslg.pas.common.model.report.MailMessageDTO;
|
|
|
+import cn.cslg.pas.common.model.report.QueryMatchCasePersonVO;
|
|
|
+import cn.cslg.pas.common.model.report.UpdateIprPersonDTO;
|
|
|
+import cn.cslg.pas.common.model.report.UpdateMatchCasePersonDTO;
|
|
|
import cn.cslg.pas.common.utils.CacheUtils;
|
|
|
import cn.cslg.pas.common.utils.LoginUtils;
|
|
|
import cn.cslg.pas.domain.business.AssoProjectPerson;
|
|
|
import cn.cslg.pas.domain.business.ReportProject;
|
|
|
+import cn.cslg.pas.domain.business.Project;
|
|
|
+import cn.cslg.pas.domain.business.ReportProject;
|
|
|
import cn.cslg.pas.domain.report.AssoIprReportType;
|
|
|
import cn.cslg.pas.domain.report.IprPerson;
|
|
|
import cn.cslg.pas.exception.ExceptionEnum;
|
|
|
import cn.cslg.pas.exception.XiaoShiException;
|
|
|
import cn.cslg.pas.service.business.AssoProjectPersonService;
|
|
|
import cn.cslg.pas.service.business.ReportProjectService;
|
|
|
+import cn.cslg.pas.service.business.ProjectService;
|
|
|
+import cn.cslg.pas.service.business.ReportProjectService;
|
|
|
import cn.cslg.pas.service.permissions.PermissionService;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import cn.cslg.pas.domain.report.MatchCasePerson;
|
|
@@ -43,6 +53,10 @@ public class MatchCasePersonService extends ServiceImpl<MatchCasePersonMapper, M
|
|
|
private final CacheUtils cacheUtils;
|
|
|
@Autowired
|
|
|
@Lazy
|
|
|
+ private SendReportMailService sendReportMailService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ @Lazy
|
|
|
private IprPersonService iprPersonService;
|
|
|
private final AssoProjectPersonService assoProjectPersonService;
|
|
|
private final ReportProjectService reportProjectService;
|
|
@@ -107,6 +121,7 @@ public class MatchCasePersonService extends ServiceImpl<MatchCasePersonMapper, M
|
|
|
if (type != null) {
|
|
|
this.updateReport(updateMatchCasePersonDTO.getReportId(), type);
|
|
|
}
|
|
|
+ sendReportMailService.sendMatchCasePersonMail(matchCasePerson.getProjectId(), name, email);
|
|
|
return matchCasePerson.getId();
|
|
|
}
|
|
|
|
|
@@ -337,6 +352,7 @@ public class MatchCasePersonService extends ServiceImpl<MatchCasePersonMapper, M
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|