Merge remote-tracking branch 'origin/dev' into dev

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -932,7 +932,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 			wxService.sendWechatMessageByRole(SendMsgReq.builder()
 				.title("计划放行("+type+")")
 		        .content(planName+"待审批")
-		        .pageIndex("/pagesPlan/approval")
+		        .pageIndex("/pagesPlan/pass")
 	            .fromUserId(userId)
 	            .build(),approvalRuleNextLevel.getRoleId());
 		}

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -941,7 +941,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	            wxService.sendWechatMessageByRole(SendMsgReq.builder()
 	            		.title("计划放行("+type+"-防错)")
 	            		.content(planName+"待审批")
-	    		        .pageIndex("/pagesPlan/approval")
+	    		        .pageIndex("/pagesPlan/pass")
 	                    .fromUserId(userId)
 	                    .build(),approvalRuleNextLevel.getRoleId());
 	        }

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

@@ -63,7 +63,6 @@ public class FirstTaskJob implements Job {
 
         private ConcurrentMap<String, Object> paramMap;
 
-
         public AddTaskWorker(ConcurrentMap<String, Object> paramMap) {
             this.paramMap = paramMap;
         }
@@ -72,25 +71,24 @@ public class FirstTaskJob implements Job {
         public Integer call() {
             FirstTaskService firstTaskService = (FirstTaskService) paramMap.get("firstTaskService");
             LocalDate now = LocalDate.now();
-            List<FirstCalendar> cals = firstTaskService.getCalenderFirstForType();
-            for (FirstCalendar cal : cals) {
-                try {
-                    String typeFlag = cal.getTypeFlag();
-                    String[] typeFlags = typeFlag.split(",");
-                    if(typeFlags!=null && typeFlags.length>0){
-                        for(String t:typeFlags){
-                            FirstTask task = new FirstTask();
-                            task.setTask_time(now);
-                            task.setFirst_article_calendar_id(cal.getId());
-                            task.setType_flag(Integer.parseInt(t));
-                            firstTaskService.insertFirstTask(task);
-                        }
-                    }
-                } catch (Throwable e) {
-                    log.error("addTask生产任务出错",e);
-                }
+            int num = 0;
+            List<FirstCalendar> cals = firstTaskService.getCalenderFirstForType(0,now);
+            FirstTask task = new FirstTask();
+            task.setTask_time(now);
+            for(int typeFlag=0;typeFlag<=2;typeFlag++) {
+            	cals = firstTaskService.getCalenderFirstForType(typeFlag,now);
+            	num +=cals.size();
+            	for (FirstCalendar cal : cals) {
+            		try {
+            			task.setFirst_article_calendar_id(cal.getId());
+            			task.setType_flag(typeFlag);
+            			firstTaskService.insertFirstTask(task);
+            		} catch (Throwable e) {
+            			log.error("addTask生产任务出错",e);
+            		}
+            	}
             }
-            return 0;
+            return num;
         }
     }
 

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

@@ -64,8 +64,8 @@ public class TimerTaskInit {
 //        addAutoApproveErrorTask(param, sche);
 //        addOnsiteTask(param, sche);
 //        addOnsiteRemindWork(param, sche);
-//        addFirstTask(param, sche);
-        addFirstRemindWork(param, sche);
+        addFirstTask(param, sche);
+//        addFirstRemindWork(param, sche);
     }
 
     /**

application-task/src/main/java/com/factory/mapper/FirstTaskMapper.java

@@ -1,14 +1,17 @@
 package com.factory.mapper;
 
 
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
 import com.factory.base.entity.task.ApprovalUserRes;
 import com.factory.base.entity.task.ApproveEntry;
 import com.factory.base.entity.task.FirstCalendar;
 import com.factory.base.entity.task.FirstTask;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface FirstTaskMapper {
@@ -19,7 +22,7 @@ public interface FirstTaskMapper {
      *
      * @return
      */
-    List<FirstCalendar> getCalenderFirstForType();
+    List<FirstCalendar> getCalenderFirstForType(@Param("typeFlag")Integer typeFlag,@Param("date")LocalDate date);
 
 
     /**

application-task/src/main/java/com/factory/service/FirstTaskService.java

@@ -1,12 +1,13 @@
 package com.factory.service;
 
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
 import com.factory.base.entity.task.ApproveEntry;
 import com.factory.base.entity.task.FirstCalendar;
 import com.factory.base.entity.task.FirstTask;
 
-import java.util.List;
-import java.util.Map;
-
 public interface FirstTaskService {
 
     /**
@@ -14,7 +15,7 @@ public interface FirstTaskService {
      *
      * @return
      */
-    List<FirstCalendar> getCalenderFirstForType();
+    List<FirstCalendar> getCalenderFirstForType(Integer typeFlag,LocalDate date);
 
     /**
      * 添加当天任务

application-task/src/main/java/com/factory/service/impl/FirstTaskServiceImp.java

@@ -1,8 +1,7 @@
 package com.factory.service.impl;
 
-import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,8 +34,8 @@ public class FirstTaskServiceImp implements FirstTaskService {
      * @return
      */
     @Override
-    public List<FirstCalendar> getCalenderFirstForType() {
-        return firstTaskMapper.getCalenderFirstForType();
+    public List<FirstCalendar> getCalenderFirstForType(Integer typeFlag,LocalDate now) {
+        return firstTaskMapper.getCalenderFirstForType(typeFlag,now);
     }
 
     /**
@@ -149,7 +148,7 @@ public class FirstTaskServiceImp implements FirstTaskService {
                     sendMsgReq.setTitle("计划放行("+plan.get("typeFlagStr")+")");
                     sendMsgReq.setContent(planName+"待审批");
                     sendMsgReq.setEndTime(TimeUtils.getDayString(LocalDateTime.now()));
-                    sendMsgReq.setPageIndex("/pagesPlan/approval");
+                    sendMsgReq.setPageIndex("/pagesPlan/pass");
                     msgService.sendWechatMessageByRole(sendMsgReq,nextRole.getRole_id());
                 }
                 return status;

application-task/src/main/java/com/factory/service/impl/OnsiteTaskServiceImp.java

@@ -145,7 +145,7 @@ public class OnsiteTaskServiceImp implements OnsiteTaskService {
                     sendMsgReq.setTitle("计划放行("+plan.get("typeFlagStr")+"-防错)");
                     sendMsgReq.setContent(planName+"待审批");
                     sendMsgReq.setEndTime(TimeUtils.getDayString(LocalDateTime.now()));
-                    sendMsgReq.setPageIndex("/pagesPlan/approval");
+                    sendMsgReq.setPageIndex("/pagesPlan/pass");
                     msgService.sendWechatMessageByRole(sendMsgReq,nextRole.getRole_id());
                 }
                 return status;

application-task/src/main/resources/mappers/FirstTaskMapper.xml

@@ -82,8 +82,8 @@
     <select id="getCalenderFirstForType" resultType="com.factory.base.entity.task.FirstCalendar">
         SELECT b.id,b.type_flag as typeFlag
         FROM benteler_plan a
-             join first_article_calendar b on a.id = b.benteler_plan_id
-             left join first_article_task fat on b.id = fat.first_article_calendar_id and fat.task_time = now()
+             join first_article_calendar b on a.id = b.benteler_plan_id and FIND_IN_SET(#{typeFlag},b.type_flag)
+             left join first_article_task fat on b.id = fat.first_article_calendar_id and fat.type_flag = #{typeFlag} and fat.task_time = #{date} 
         WHERE 
           a.plan_type = 1
           and a.status = 4