feat: There is no way the schedule
This commit is contained in:
+17
-7
@@ -12,9 +12,8 @@ import com.ydw.bat.wkflow.util.Utils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.TreeMap;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -43,12 +42,11 @@ public class OaTaskExecServiceImpl extends ServiceImpl<OaTaskExecMapper, OaTaskE
|
||||
if(!taskExecs.isEmpty()){
|
||||
OaTaskExec oaTaskExec = taskExecs.get(0);
|
||||
BusProcessNew object = (BusProcessNew) net.sf.json.JSONObject.toBean(net.sf.json.JSONObject.fromObject(oaTaskExec.getMesg()), BusProcessNew.class);
|
||||
|
||||
int days = Utils.subDayNum(oaTaskExec.getEndTime());
|
||||
if(days > 3){
|
||||
// 3天外处理 更改执行状态 1 进入定时任务 不发送OA待办
|
||||
// ????? 待
|
||||
updateOaTaskExec(taskExecs,1,2);
|
||||
getSuccess(map, "0", "操作成功");
|
||||
}else {
|
||||
if(days < 0){
|
||||
// 超时处理
|
||||
@@ -56,12 +54,14 @@ public class OaTaskExecServiceImpl extends ServiceImpl<OaTaskExecMapper, OaTaskE
|
||||
// 直接发送OA待办 重置任务状态 0
|
||||
object.setTaskStatus(0);
|
||||
oaService.sendTodoMq(object);
|
||||
getSuccess(map, "0", "操作成功");
|
||||
}else {
|
||||
// 3天内处理
|
||||
updateOaTaskExec(taskExecs,0,1);
|
||||
// 直接发送OA待办 重置任务状态 0
|
||||
object.setTaskStatus(0);
|
||||
oaService.sendTodoMq(object);
|
||||
getSuccess(map, "0", "操作成功");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,12 +69,22 @@ public class OaTaskExecServiceImpl extends ServiceImpl<OaTaskExecMapper, OaTaskE
|
||||
return map;
|
||||
}
|
||||
|
||||
private void getSuccess(Map<String, Object> map, String sign, String message) {
|
||||
map.put("sign",sign);
|
||||
map.put("message",message);
|
||||
}
|
||||
|
||||
private void updateOaTaskExec(List<OaTaskExec> taskExecs, int execStatus, int execType){
|
||||
taskExecs.forEach(taskExec -> {
|
||||
List<OaTaskExec> updateList = new ArrayList<>();
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||
|
||||
updateList.addAll(taskExecs);
|
||||
updateList.forEach(taskExec -> {
|
||||
// 任务修改为 启动状态
|
||||
taskExec.setExecStatus(execStatus);
|
||||
taskExec.setExecType(execType);
|
||||
taskExec.setUpdateTime(sdf.format(new Date()));
|
||||
});
|
||||
oaTaskExecService.updateBatchById(taskExecs);
|
||||
oaTaskExecService.updateBatchById(updateList);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user