FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: There is no way the

Browse Source
This commit is contained in:
super_liu
2021-10-14 14:44:10 +08:00
parent 75f0a6156e
commit b3311d58fe
10 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/OaTaskExecController.java
+7
View File
@@ -26,6 +26,13 @@ public class OaTaskExecController {
@Autowired
private IOaTaskExecService oaTaskExecService;
@ApiOperation(value = "查询历史")
@GetMapping("/queryEndTime")
public String queryEndTime(String pId) {
String endTime = oaTaskExecService.endTime(pId);
return endTime;
}
@ApiOperation(value = "接受任务")
@GetMapping("/execTask")
public Map<String,Object> execTask(String todoId) {
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/OaTaskExecServiceImpl.java
+19 -1
View File
@@ -67,7 +67,19 @@ public class OaTaskExecServiceImpl extends ServiceImpl<OaTaskExecMapper, OaTaskE
if(!processNews.isEmpty()){
JSONObject object = JSONObject.parseObject(processNews.get(0).getMesg());
endTime = object.getString("endTime");
}else {
if(list.size() >1){
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("TASK_ID",list.get(1).getId());
queryWrapper2.eq("P_ID",pId);
List<BusProcessNew> processNews1 = iBusProcessNewService.list(queryWrapper2);
if(!processNews1.isEmpty()){
JSONObject object = JSONObject.parseObject(processNews1.get(0).getMesg());
endTime = object.getString("endTime");
}
}
}
}
return endTime;
}
@@ -81,11 +93,17 @@ public class OaTaskExecServiceImpl extends ServiceImpl<OaTaskExecMapper, OaTaskE
List<OaTaskExec> taskExecs = oaTaskExecService.list(wrapper);
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);
BusProcessNew object = JSONObject.parseObject(oaTaskExec.getMesg(),BusProcessNew.class);
int days = Utils.subDayNum(oaTaskExec.getEndTime());
if(days > 3){
// 3天外处理 更改执行状态 1 进入定时任务 不发送OA待办
updateOaTaskExec(taskExecs,1,2);
// 但发送OA已办 接受任务 置为已办
Task task = taskService.createTaskQuery().taskId(object.getTaskId()).singleResult();
webServiceOAService.completeOA(task);
getSuccess(map, "0", "操作成功");
}else {
if(days < 0){
src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentBefore.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class UploadCommentBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("wfhxzgStep4?prcType=8");
one1.setLink("wfhxzgStep4?prcType=8&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
// 干活节点流程
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class PCAComplianceAssessmentBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("xmpg2Step6?prcType=6");
one1.setLink("xmpg2Step6?prcType=6&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
// 干活节点流程
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultBefore.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class UploadResearchResultBefore implements TaskListener {
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
JSONObject object = JSONObject.parseObject(one1.getMesg());
one1.setLink("bzzqyjStep3?prcType=3");
one1.setLink("bzzqyjStep3?prcType=3&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
// 干活节点流程
one1.setTaskStatus(2);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultBefore.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class UploadResearchResultBefore implements TaskListener {
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
JSONObject object = JSONObject.parseObject(one1.getMesg());
one1.setLink("bzdyStep3?prcType=2");
one1.setLink("bzdyStep3?prcType=2&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
// 干活节点流程
one1.setTaskStatus(2);
src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmBefore.java
+4 -2
View File
@@ -30,12 +30,14 @@ public class confirmBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("xmqdqrStep2?prcType=10");
one1.setLink("xmqdqrStep2?prcType=10&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
// 干活节点流程
one1.setTaskStatus(2);
one1.setEndTime(Utils.interceptTime(execService.endTime(delegateTask.getProcessInstanceId())));
JSONObject object = JSONObject.parseObject(one1.getMesg());
one1.setEndTime(Utils.interceptTime(object.getString("endTime")));
oaService.sendTodoMq(one1);
}
}
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateBefore.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class PEPtaskEstimateBefore implements TaskListener {
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("xmpgStep4?prcType=5");
one1.setLink("xmpgStep4?prcType=5&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
// 干活节点流程
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueBefore.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class PEPtaskLssueBefore implements TaskListener {
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
JSONObject object = JSONObject.parseObject(one1.getMesg());
one1.setLink("xmpgStep3?prcType=5");
one1.setLink("xmpgStep3?prcType=5&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
// 干活节点流程
one1.setTaskStatus(2);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainBefore.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class ExpainBefore implements TaskListener{
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzjdStep3?prcType=9");
one1.setLink("bzjdStep3?prcType=9&routerType=oa");
one1.setTaskInfo(delegateTask.getName());
// 干活节点流程