防错提醒时间修正，增加任务日志

application-task/src/main/java/com/factory/init/AutoApproveErrorTaskJob.java

@@ -91,6 +91,7 @@ public class AutoApproveErrorTaskJob implements Job {
                 int maxlevel = firstTaskService.getMaxApproveLevel(null);
                 queryMap.put("approval_level", maxlevel);
                 List<ApproveEntry> approves = firstTaskService.getApproveTaskNoDeal(queryMap);
+                log.debug("FA需要自动升级放行：{}",approves.size());
                 for (ApproveEntry ap : approves) {
                     try {
                         firstTaskService.addTaskForNext(ap);
@@ -102,6 +103,7 @@ public class AutoApproveErrorTaskJob implements Job {
                 int maxlevel = onsiteTaskService.getMaxApproveLevel(null);
                 queryMap.put("approval_level", maxlevel);
                 List<ApproveEntry> approves = onsiteTaskService.getApproveTaskNoDeal(queryMap);
+                log.debug("OT需要自动升级放行：{}",approves.size());
                 for (ApproveEntry ap : approves) {
                     try {
                         onsiteTaskService.addTaskForNext(ap);

application-task/src/main/java/com/factory/init/FirstRemindJob.java

@@ -136,6 +136,7 @@ public class FirstRemindJob implements Job {
 			// 获取全部微提醒的任务
 			List<FirstCalendar> cals = firstTaskService.getRemindWork(paramQuery);
 			LocalDateTime now = LocalDateTime.now();
+			log.info("等待中1首件防错任务数量{}",cals.size());
 			for (FirstCalendar cal : cals) {
 				if (StringUtils.isNotBlank(cal.getFirstRemind()) && now
 						.isBefore(TimeUtils.paserDayTimeString(cal.getTaskTime() + " " + cal.getFirstRemind() + ":00"))) {//首件
@@ -144,7 +145,7 @@ public class FirstRemindJob implements Job {
 				} else if (now.isBefore(TimeUtils.paserDayTimeString(cal.getTaskTime() + " "+cal.getTwoRemind()+":00"))) {//200件
 					continue;
 				}
-
+				log.info("发送超期提醒到PAD{}",cal);
 				String tokenA = String.valueOf(cal.getPrincipalOneId());
 				String tokenB = String.valueOf(cal.getPrincipalTwoId());
 				Arrays.asList(tokenA, tokenB).forEach(token -> {
@@ -186,7 +187,7 @@ public class FirstRemindJob implements Job {
             List<FirstCalendar> cals = firstTaskService.getRemindWork(paramQuery);
             
             LocalDateTime now = LocalDateTime.now();
-            
+            log.info("等待中2首件防错任务数量{}",cals.size());
             for (FirstCalendar cal : cals) {
                 if (StringUtils.isNotBlank(cal.getFirstRemind()) && now
 						.isBefore(TimeUtils.paserDayTimeString(cal.getTaskTime() + " " + cal.getFirstRemind() + ":00").plusMinutes(cal.getUpleverTimeNum()))) {
@@ -196,7 +197,7 @@ public class FirstRemindJob implements Job {
 					continue;
 				}
 
-                
+                log.info("发送超期提醒到小程序{}",cal);
                 Map<String,Object> map = new HashMap<>();
                 map.put("type", type);
                 Long roleId = firstTaskService.getRemindNoworkToManager(map);

application-task/src/main/java/com/factory/init/FirstTaskJob.java

@@ -78,6 +78,7 @@ public class FirstTaskJob implements Job {
             for(int typeFlag=0;typeFlag<=1;typeFlag++) {//2中断在pad手动建立
             	cals = firstTaskService.getCalenderFirstForType(typeFlag,now);
             	num +=cals.size();
+            	log.debug("FA需要生成新任务数量：{}",cals.size());
             	for (FirstCalendar cal : cals) {
             		try {
             			task.setFirst_article_calendar_id(cal.getId());

application-task/src/main/java/com/factory/init/OnsiteRemindJob.java

@@ -161,12 +161,14 @@ public class OnsiteRemindJob implements Job {
             //获取了全部等待中的任务
             List<OnsiteCalendar> cals = onsiteTaskService.getRemindWork(paramQuery);
             LocalDateTime now = LocalDateTime.now();
+            log.info("等待中1的防错任务数量{}",cals.size());
             try {
 	            for (OnsiteCalendar cal : cals) {
-	                if (cal.getType_flag()==0&&now.isBefore(TimeUtils.paserDayTimeString(cal.getTask_time()+ " " + cal.getStart_day()+":00"))) {
+	                if (cal.getType_flag()==0&&now.isBefore(TimeUtils.paserDayTimeString(cal.getTask_time()+ " " + cal.getStart_day()+":00").plusMinutes(cal.getDay_validate()))) {
 	                   //还未到时间
 	                   continue;
 	                } 
+	                log.debug("发送工作提醒到PAD{}", cal); 
 	                String token = String.valueOf(cal.getUser_id());
 	                if (WsSessionManager.SESSION_POOL.containsKey(token)) {
 	                    
@@ -210,10 +212,10 @@ public class OnsiteRemindJob implements Job {
             //获取了全部发送工作提醒但是到期
             List<OnsiteCalendar> cals = onsiteTaskService.getRemindWork(paramQuery);
             LocalDateTime now = LocalDateTime.now();
-            
+            log.info("等待中2的防错任务数量{}",cals.size());
             for (OnsiteCalendar cal : cals) {
 				if (cal.getType_flag() == 0 && now
-						.isBefore(TimeUtils.paserDayTimeString(cal.getTask_time() + " " + cal.getStart_day() + ":00").plusMinutes(cal.getDay_validate()))) {
+						.isBefore(TimeUtils.paserDayTimeString(cal.getTask_time() + " " + cal.getStart_day() + ":00").plusMinutes(cal.getDay_validate()+cal.getDay_outtime()))) {
 					// 还未到时间
 					continue;
 				} else if (cal.getType_flag() == 1 && now.getDayOfWeek().getValue() < cal.getWeek_day()) {// 周
@@ -223,7 +225,7 @@ public class OnsiteRemindJob implements Job {
 					// 还未到时间
 					continue;
 				}
-	               
+	            log.debug("发送超期提醒到小程序{}", cal); 
                 Map<String,Object> map = new HashMap<>();
                 map.put("type", type);
                 Long roleId = onsiteTaskService.getRemindNoworkToManager(map);

application-task/src/main/java/com/factory/init/OnsiteTaskJob.java

@@ -132,6 +132,7 @@ public class OnsiteTaskJob implements Job {
             OnsiteTaskService onsiteTaskService = (OnsiteTaskService) paramMap.get("onsiteTaskService");
             //直接查询没有生成任务的
             List<OnsiteCalendar> cals = onsiteTaskService.getCalenderOnsitesForType(paramQuery);
+            log.debug("OT需要生成新任务数量：{}",cals.size());
             for (OnsiteCalendar cal : cals) {
                 try {
                         OnsiteTask task = new OnsiteTask();

common-base/src/main/java/com/factory/base/entity/task/OnsiteCalendar.java

@@ -2,6 +2,9 @@ package com.factory.base.entity.task;
 
 import java.io.Serializable;
 
+import lombok.Data;
+
+@Data
 public class OnsiteCalendar implements Serializable {
 
     private long id;
@@ -17,100 +20,4 @@ public class OnsiteCalendar implements Serializable {
     private String task_time;
     private long onsite_task_id;
 
-    public long getOnsite_task_id() {
-        return onsite_task_id;
-    }
-
-    public void setOnsite_task_id(long onsite_task_id) {
-        this.onsite_task_id = onsite_task_id;
-    }
-
-    public String getTask_time() {
-        return task_time;
-    }
-
-    public void setTask_time(String task_time) {
-        this.task_time = task_time;
-    }
-
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public long getBenteler_plan_id() {
-        return benteler_plan_id;
-    }
-
-    public void setBenteler_plan_id(long benteler_plan_id) {
-        this.benteler_plan_id = benteler_plan_id;
-    }
-
-    public String getStart_day() {
-        return start_day;
-    }
-
-    public void setStart_day(String start_day) {
-        this.start_day = start_day;
-    }
-
-    public String getEnd_day() {
-        return end_day;
-    }
-
-    public void setEnd_day(String end_day) {
-        this.end_day = end_day;
-    }
-
-    public int getDay_validate() {
-        return day_validate;
-    }
-
-    public void setDay_validate(int day_validate) {
-        this.day_validate = day_validate;
-    }
-
-    public int getDay_outtime() {
-        return day_outtime;
-    }
-
-    public void setDay_outtime(int day_outtime) {
-        this.day_outtime = day_outtime;
-    }
-
-    public int getWeek_day() {
-        return week_day;
-    }
-
-    public void setWeek_day(int week_day) {
-        this.week_day = week_day;
-    }
-
-    public int getMonth_day() {
-        return month_day;
-    }
-
-    public void setMonth_day(int month_day) {
-        this.month_day = month_day;
-    }
-
-    public int getUser_id() {
-        return user_id;
-    }
-
-    public void setUser_id(int user_id) {
-        this.user_id = user_id;
-    }
-
-    public int getType_flag() {
-        return type_flag;
-    }
-
-    public void setType_flag(int type_flag) {
-        this.type_flag = type_flag;
-    }
 }