|
@@ -89,26 +89,28 @@ public class WorkOrderManageController {
|
|
workOrderManage.setTaskNo(DatesUtil.formatDate(new Date(),"yyyyMMddHHmmss")+String.valueOf((int) (Math.random()*(9999-1000)+1000)));
|
|
workOrderManage.setTaskNo(DatesUtil.formatDate(new Date(),"yyyyMMddHHmmss")+String.valueOf((int) (Math.random()*(9999-1000)+1000)));
|
|
workOrderManageService.insertSelective(workOrderManage);
|
|
workOrderManageService.insertSelective(workOrderManage);
|
|
int result =workOrderManage.getId();//返回新增数据的id
|
|
int result =workOrderManage.getId();//返回新增数据的id
|
|
- //发消息
|
|
|
|
- try {
|
|
|
|
- Message message=new Message();
|
|
|
|
- message.setStatus(1);
|
|
|
|
- message.setCreateBy(currentUser.getId().toString());
|
|
|
|
- message.setTenantId(currentUser.getTenantId());
|
|
|
|
- message.setMessageContent(workOrderManage.getTaskDesc());
|
|
|
|
- message.setMessageId(UUID.randomUUID().toString());
|
|
|
|
- message.setMessageType(3);
|
|
|
|
- message.setMessageTemplateId(3);
|
|
|
|
- message.setChannel(0);
|
|
|
|
- message.setUrl(String.valueOf(result));
|
|
|
|
- //获取需要发消息的用户
|
|
|
|
- List<Long> users=userCenterClient.findUserIdsForOrg();
|
|
|
|
- for(Long user : users){
|
|
|
|
- message.setUserId(user.intValue());
|
|
|
|
- messageSendUtil.send(message);
|
|
|
|
|
|
+ if(workOrderManage.getEventType()==1) {
|
|
|
|
+ //发消息
|
|
|
|
+ try {
|
|
|
|
+ Message message=new Message();
|
|
|
|
+ message.setStatus(1);
|
|
|
|
+ message.setCreateBy(currentUser.getId().toString());
|
|
|
|
+ message.setTenantId(currentUser.getTenantId());
|
|
|
|
+ message.setMessageContent(workOrderManage.getTaskDesc());
|
|
|
|
+ message.setMessageId(UUID.randomUUID().toString());
|
|
|
|
+ message.setMessageType(3);
|
|
|
|
+ message.setMessageTemplateId(3);
|
|
|
|
+ message.setChannel(0);
|
|
|
|
+ message.setUrl(String.valueOf(result));
|
|
|
|
+ //获取需要发消息的用户
|
|
|
|
+ List<Long> users=userCenterClient.findUserIdsForOrg();
|
|
|
|
+ for(Long user : users){
|
|
|
|
+ message.setUserId(user.intValue());
|
|
|
|
+ messageSendUtil.send(message);
|
|
|
|
+ }
|
|
|
|
+ }catch(Exception e){
|
|
|
|
+ e.printStackTrace();
|
|
}
|
|
}
|
|
- }catch(Exception e){
|
|
|
|
- e.printStackTrace();
|
|
|
|
}
|
|
}
|
|
|
|
|
|
return new AjaxMessage<>(ResultStatus.OK, result);
|
|
return new AjaxMessage<>(ResultStatus.OK, result);
|
|
@@ -185,7 +187,7 @@ public class WorkOrderManageController {
|
|
workFlowLog.setTaskId(plan.getCurrentTaskId());
|
|
workFlowLog.setTaskId(plan.getCurrentTaskId());
|
|
|
|
|
|
if(action!=null){
|
|
if(action!=null){
|
|
- List<TaskPorcessResult> handleResult = workFlowService.handleTask(action,plan.getCurrentTaskId(), null, null);
|
|
|
|
|
|
+ List<TaskPorcessResult> handleResult = workFlowService.handleTask(action,plan.getCurrentTaskId(), args, null);
|
|
plan.setCurrentTaskId(handleResult.size()>0?handleResult.get(0).getCurrentTaskId():null);
|
|
plan.setCurrentTaskId(handleResult.size()>0?handleResult.get(0).getCurrentTaskId():null);
|
|
plan.setCurrentUsers(handleResult.size()>0?handleResult.get(0).getCurrentTaskUsers():null);
|
|
plan.setCurrentUsers(handleResult.size()>0?handleResult.get(0).getCurrentTaskUsers():null);
|
|
plan.setCurrentTaskName(handleResult.size()>0?handleResult.get(0).getCurrentTaskName():null);
|
|
plan.setCurrentTaskName(handleResult.size()>0?handleResult.get(0).getCurrentTaskName():null);
|
|
@@ -232,7 +234,7 @@ public class WorkOrderManageController {
|
|
}
|
|
}
|
|
|
|
|
|
if(action!=null){
|
|
if(action!=null){
|
|
- List<TaskPorcessResult> handleResult = workFlowService.handleTask(action,order.getCurrentTaskId(), null, null);
|
|
|
|
|
|
+ List<TaskPorcessResult> handleResult = workFlowService.handleTask(action,order.getCurrentTaskId(), args, null);
|
|
order.setCurrentTaskId(handleResult.size()>0?handleResult.get(0).getCurrentTaskId():null);
|
|
order.setCurrentTaskId(handleResult.size()>0?handleResult.get(0).getCurrentTaskId():null);
|
|
order.setCurrentUsers(handleResult.size()>0?handleResult.get(0).getCurrentTaskUsers():null);
|
|
order.setCurrentUsers(handleResult.size()>0?handleResult.get(0).getCurrentTaskUsers():null);
|
|
order.setCurrentTaskName(handleResult.size()>0?handleResult.get(0).getCurrentTaskName():null);
|
|
order.setCurrentTaskName(handleResult.size()>0?handleResult.get(0).getCurrentTaskName():null);
|
|
@@ -404,7 +406,7 @@ public class WorkOrderManageController {
|
|
new AjaxMessage(ResultStatus.ERROR,"没有创建流程,不能提交!");
|
|
new AjaxMessage(ResultStatus.ERROR,"没有创建流程,不能提交!");
|
|
}
|
|
}
|
|
Map<String,Object> vars = new HashMap<>();
|
|
Map<String,Object> vars = new HashMap<>();
|
|
- vars.put("assineeFormUserId",loginUser.getId().toString());
|
|
|
|
|
|
+ vars.put("assineeFormUserId",orderUserId);
|
|
//巡检发送系统消息所需参数
|
|
//巡检发送系统消息所需参数
|
|
vars.put("任务类型",orderType);
|
|
vars.put("任务类型",orderType);
|
|
vars.put("任务编号",workOrderManage.getId());
|
|
vars.put("任务编号",workOrderManage.getId());
|