Просмотр исходного кода

专利任务修改

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
26f70c6927

+ 1 - 0
src/main/java/com/goafanti/common/enums/NoticeStatus.java

@@ -48,6 +48,7 @@ public enum NoticeStatus {
 	PROJECT_OUTSOURCE_NO(39,"项目外包拒绝"),
 	ORDER_ARREARS_DUN(40,"欠款催款信息"),
 	TASK_PATENT_ERROR(41,"定时专利失败"),
+	TASK_PATENT_REMIND(42,"专利缴费提醒"),
 	OTHER(0, "其他");
 
 	private NoticeStatus(Integer code, String desc) {

+ 6 - 1
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -90,10 +90,10 @@ public class PatentTask {
 			 int count = (int) ((ted.getTimeInMillis()-ced.getTimeInMillis()) / (1000*3600*24));
 			 Notice n =new Notice();
 				n.setId(UUID.randomUUID().toString());
-				n.setNoticeType(NoticeStatus.ORDER_NO.getCode());
 				n.setCreateTime(new Date());
 				n.setReaded(0);//未读
 				n.setAid("1");
+				n.setNoticeType(NoticeStatus.TASK_PATENT_ERROR.getCode());
 			 if (count>=0&&count<=90) {
 					 Admin a=adminService.selectByPrimaryKey(p.getAid());
 					 //设置如果找不到用户则提醒
@@ -107,6 +107,10 @@ public class PatentTask {
 					 }else if (!SendEmailUtil.isEmail(p.getEmail())) {
 						 EmailBo emailBo = new EmailBo( "专利提醒失败【邮件】",  AFTConstants.ADMIN_EMAIL,  "超管", "平台",  "系统",str2);
 						SendEmailUtil.getInstance().send(emailBo);
+						if (SendEmailUtil.isEmail(a.getEmail())) {
+							emailBo = new EmailBo( "专利提醒失败【邮件】",  a.getEmail(),"超管", "平台",  "系统",str2 );
+							SendEmailUtil.getInstance().send(emailBo);
+						}
 						nlist.add(n);
 							continue;
 						
@@ -132,6 +136,7 @@ public class PatentTask {
 					 patentNewService.addPatenNewLog(pl);
 					 n.setAid(p.getAid());
 					 n.setContent(str);
+					 n.setNoticeType(NoticeStatus.TASK_PATENT_REMIND.getCode());
 					 nlist.add(n);
 					 Thread.sleep(2000);
 				}

+ 5 - 1
src/main/java/com/goafanti/personnel/controller/AdminPersonnelApiController.java

@@ -47,7 +47,11 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "姓名", "姓名"));
 			return res;
 		}
-		
+		int x=personnelService.checkDoorId(i.getDoorId());
+		if (x>0) {
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "门禁", "门禁"));
+			return res;
+		}
 		if ( !StringUtils.isBlank(i.getBirthdays())) {
 			try {
 				i.setBirthday(DateUtils.StringToDate(i.getBirthdays(), AFTConstants.YYYYMMDD));