|
|
@@ -408,8 +408,8 @@ public class WorkOrderManageController {
|
|
|
@GetMapping("/resubmit")
|
|
|
@ApiOperation(value = "重新派单")
|
|
|
public AjaxMessage reSubmitOrder(
|
|
|
- @ApiParam(value = "工单ID", required = true) @RequestParam(required = false) Integer id,
|
|
|
- @ApiParam(value = "工单类型编号", required = true) @RequestParam(required = false) Integer orderTypeId,
|
|
|
+ @ApiParam(value = "工单ID", required = true) @RequestParam(required = true) Integer id,
|
|
|
+ @ApiParam(value = "工单类型编号", required = true) @RequestParam(required = true) Integer orderTypeId,
|
|
|
@ApiParam(value = "紧急程度", required = true) @RequestParam(required = true) String urgency,
|
|
|
@ApiParam(value = "时限", required = true) @RequestParam(required = true) String dateLimit,
|
|
|
@ApiParam(value = "接单人编号", required = true) @RequestParam(required = true) String orderUserId,
|
|
|
@@ -422,8 +422,14 @@ public class WorkOrderManageController {
|
|
|
if(StringUtils.isEmpty(workOrderManage.getCurrentTaskId())){
|
|
|
return new AjaxMessage(ResultStatus.ERROR,"任务ID错误！");
|
|
|
}
|
|
|
+ Map<String,String> dictMap=userCenterClient.selectListByPCodes("SC_WORK_ORDER_TYPE,SC_TASK_TYPE");
|
|
|
+ //1表务、2停通水、3抢修、4漏点定位、5测漏、6违章跑水
|
|
|
+ String orderType =dictMap.get(orderTypeId.toString());
|
|
|
Map<String,Object> args=new HashMap<>();
|
|
|
args.put("assineeFormUserId",orderUserId);
|
|
|
+ args.put("工单类型",orderType);
|
|
|
+ args.put("工单编号",workOrderManage.getTaskNo());
|
|
|
+ args.put("url",String.format("?id=%s",workOrderManage.getId().toString()));
|
|
|
List<TaskPorcessResult> handleResult = workFlowService.handleTask(Action.ACTION_AUDIT,workOrderManage.getCurrentTaskId(), args, null);
|
|
|
workOrderManage.setCurrentTaskId(handleResult.size()>0?handleResult.get(0).getCurrentTaskId():null);
|
|
|
workOrderManage.setCurrentUsers(handleResult.size()>0?handleResult.get(0).getCurrentTaskUsers():null);
|
hym