Bläddra i källkod

专利提醒BUG修复

anderx 1 år sedan
förälder
incheckning
578f0f7d7c
1 ändrade filer med 25 tillägg och 31 borttagningar
  1. 25 31
      src/main/java/com/goafanti/common/task/PatentTask.java

+ 25 - 31
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -1,22 +1,5 @@
 package com.goafanti.common.task;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.Resource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.enums.NoticeStatus;
@@ -29,6 +12,17 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.SendEmailUtil;
 import com.goafanti.patent.bo.PatentNewBo;
 import com.goafanti.patent.service.PatentNewService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 
@@ -123,7 +117,6 @@ public class PatentTask {
 						n.setAid("1");
 						n.setContent(str2.toString());
 						nlist.add(n);
-						continue;
 					} else if (!SendEmailUtil.isEmail(p.getEmail())) {
 						str2.append(",管理员=").append(a.getName()).append(",邮箱不正确。");
 						n.setAid("1");
@@ -138,7 +131,6 @@ public class PatentTask {
 						n2.setNoticeType(NoticeStatus.TASK_PATENT_ERROR.getCode());
 						n2.setAid(a.getId());
 						nlist.add(n2);
-						continue;
 					} else {
 						if (p.getSalesmanRemind()==0){
 							Notice nt = new Notice();
@@ -158,19 +150,21 @@ public class PatentTask {
 							n.setNoticeType(NoticeStatus.TASK_PATENT_REMIND.getCode());
 							n.setContent(str.toString());
 							nlist.add(n);
+						}else {
+							PatentNewLog pl = new PatentNewLog();
+							str2.append("专利编号[").append(p.getPatentNo()).append("],名称[").append(p.getName()).append("],email[")
+									.append(p.getEmail().trim()).append("]");
+							String str = StrToString(str2,p.getEndDate(),status);
+							pl.setContent(str);
+							pl.setCreateTime(new Date());
+							pl.setPid(p.getId());
+							logList.add(pl);
+							n.setAid(p.getAid());
+							n.setNoticeType(NoticeStatus.TASK_PATENT_REMIND.getCode());
+							n.setContent(str);
+							nlist.add(n);
 						}
-						PatentNewLog pl = new PatentNewLog();
-						str2.append("专利编号[").append(p.getPatentNo()).append("],名称[").append(p.getName()).append("],email[")
-								.append(p.getEmail().trim()).append("]");
-						String str = StrToString(str2,p.getEndDate(),status);
-						pl.setContent(str);
-						pl.setCreateTime(new Date());
-						pl.setPid(p.getId());
-						logList.add(pl);
-						n.setAid(p.getAid());
-						n.setNoticeType(NoticeStatus.TASK_PATENT_REMIND.getCode());
-						n.setContent(str);
-						nlist.add(n);
+
 					}
 				}
 			}