|
@@ -55,11 +55,9 @@ public class TaskThread extends Thread {
|
|
|
imContents = "1100";
|
|
|
}
|
|
|
//当任务为pdf导入
|
|
|
- else if(importTaskAMVO.getType().equals(5))
|
|
|
- {
|
|
|
+ else if (importTaskAMVO.getType().equals(5)) {
|
|
|
imContents = "0001";
|
|
|
- }
|
|
|
- else if (!importTaskAMVO.getImportContent().equals(0)) {
|
|
|
+ } else if (!importTaskAMVO.getImportContent().equals(0)) {
|
|
|
imContents = MathUtils.fun(2, importTaskAMVO.getImportContent());
|
|
|
}
|
|
|
//下载字段
|
|
@@ -135,9 +133,9 @@ public class TaskThread extends Thread {
|
|
|
if (importTaskAMVO.getState().equals(1)) {
|
|
|
task.setState(2);
|
|
|
importTaskAMVO.setState(2);
|
|
|
- MailSendService mailSendService = applicationContext.getBean(MailSendService.class);
|
|
|
- task.setDoneNum(task.getAllNum());
|
|
|
- mailSendService.sendImportTaskDoneEmail("导入任务",task.getName(),task.getCreateId());
|
|
|
+
|
|
|
+ this.sendEmailDoneMail(task);
|
|
|
+
|
|
|
|
|
|
} else {
|
|
|
task.setState(importTaskAMVO.getState());
|
|
@@ -235,4 +233,16 @@ public class TaskThread extends Thread {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ public void sendEmailDoneMail(ImportTask task) {
|
|
|
+
|
|
|
+ MailSendService mailSendService = applicationContext.getBean(MailSendService.class);
|
|
|
+ task.setDoneNum(task.getAllNum());
|
|
|
+ Integer type= importTaskAMVO.getType();
|
|
|
+ if(type!=null&&type==1) {
|
|
|
+ mailSendService.sendImportTaskDoneEmail("导入任务", task.getName(), task.getCreateId());
|
|
|
+ }
|
|
|
+ else {
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|