|
@@ -442,6 +442,35 @@ public class WorkOrderManageController {
|
|
return new AjaxMessage<>(ResultStatus.ERROR);
|
|
return new AjaxMessage<>(ResultStatus.ERROR);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @GetMapping("/delProcInst")
|
|
|
|
+ @ApiOperation(value = "终止流程")
|
|
|
|
+ public AjaxMessage deleteProcessInstance(
|
|
|
|
+ @ApiParam(value = "任务ID", required = true) @RequestParam(required = true) Integer id,
|
|
|
|
+ @ApiParam(value = "流程ID", required = true) @RequestParam(required = true) String processInstanceId,
|
|
|
|
+ @ApiParam(value = "流程备注", required = false) @RequestParam(required = false) String remark) {
|
|
|
|
+ Boolean delFlow = workFlowService.deleteProcessInstance(processInstanceId,remark);
|
|
|
|
+ if(delFlow ==true) {
|
|
|
|
+ WorkOrderManage workOrderManage = new WorkOrderManage();
|
|
|
|
+ workOrderManage.setId(id);
|
|
|
|
+ workOrderManage.setOrderStatus(3);//工单终止状态
|
|
|
|
+ workOrderManage.setCurrentUsers("");
|
|
|
|
+ workOrderManageService.updateByPrimaryKeySelective(workOrderManage);
|
|
|
|
+ LoginUser currentUser = UserUtil.getCurrentUser();
|
|
|
|
+ WorkFlowLog workFlowLog=new WorkFlowLog();
|
|
|
|
+ workFlowLog.setFlowId(id);
|
|
|
|
+ workFlowLog.setFlowType(1);
|
|
|
|
+ workFlowLog.setFlowResult(remark);
|
|
|
|
+ workFlowLog.setCreateBy(currentUser.getId()!=null?currentUser.getId().toString():null);
|
|
|
|
+ workFlowLog.setDateCreate(new Date());
|
|
|
|
+ workFlowLog.setHandleUserId(currentUser.getId()!=null?currentUser.getId().toString():null);
|
|
|
|
+ workFlowLog.setHandleUserName(currentUser.getUsername());
|
|
|
|
+ //记录日志
|
|
|
|
+ workFlowLogService.insert(workFlowLog);
|
|
|
|
+ return new AjaxMessage<>(ResultStatus.OK);
|
|
|
|
+ }
|
|
|
|
+ return new AjaxMessage<>(ResultStatus.ERROR);
|
|
|
|
+ }
|
|
|
|
+
|
|
@RequestMapping(value="batchDelete" , method = RequestMethod.DELETE)
|
|
@RequestMapping(value="batchDelete" , method = RequestMethod.DELETE)
|
|
@ApiOperation(value = "批量删除")
|
|
@ApiOperation(value = "批量删除")
|
|
public AjaxMessage<Integer> batchDelete( @ApiParam(value = "工单Ids") @RequestParam List<Integer> ids){
|
|
public AjaxMessage<Integer> batchDelete( @ApiParam(value = "工单Ids") @RequestParam List<Integer> ids){
|