Преглед изворни кода

修改催款任务,专利任务

Signed-off-by: anderx <312518615@qq.com>
anderx пре 5 година
родитељ
комит
8c9b89649c

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

@@ -47,7 +47,7 @@ public enum NoticeStatus {
 	PROJECT_OUTSOURCE_YES(38,"项目外包通过"),
 	PROJECT_OUTSOURCE_NO(39,"项目外包拒绝"),
 	ORDER_ARREARS_DUN(40,"欠款催款信息"),
-	TASK_PATENT_ERROR(41,"定时专利失败"),
+	TASK_PATENT_ERROR(41,"专利提醒失败"),
 	TASK_PATENT_REMIND(42,"专利缴费提醒"),
 	OTHER(0, "其他");
 

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

@@ -91,7 +91,7 @@ public class PatentTask {
 			 if (count>=0&&count<=90) {
 					 Admin a=adminService.selectByPrimaryKey(p.getAid());
 					 //设置如果找不到用户则提醒管理员
-					 String str2="名称="+p.getName()+",email="+p.getEmail();;
+					 String str2="专利编号="+p.getPatentNo()+"名称="+p.getName()+",email="+p.getEmail();;
 					 n.setContent(str2);
 					 if(a==null) {
 						n.setContent(str2+",aid="+p.getAid());
@@ -105,6 +105,7 @@ public class PatentTask {
 						n2.setId(UUID.randomUUID().toString());
 						n2.setCreateTime(new Date());
 						n2.setReaded(0);//未读
+						n2.setContent(str2);
 						n2.setNoticeType(NoticeStatus.TASK_PATENT_ERROR.getCode());
 						n2.setAid(a.getId());
 						nlist.add(n2);

+ 6 - 6
src/main/resources/props/config_local.properties

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-jdbc.username=dev
-jdbc.password=123456
+#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+#jdbc.username=dev
+#jdbc.password=123456
 #测试
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=aftdev
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570