|
@@ -399,7 +399,8 @@ public class WorkOrderManageController {
|
|
|
@ApiParam(value = "工单类型编号", required = true) @RequestParam(required = false) 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){
|
|
|
+ @ApiParam(value = "接单人编号", required = true) @RequestParam(required = true) String orderUserId,
|
|
|
+ @ApiParam(value = "父单ID", required = false) @RequestParam(required = false) String orderPid){
|
|
|
LoginUser loginUser = UserUtil.getCurrentUser();
|
|
|
WorkOrderManage workOrderManage = workOrderManageService.selectByPrimaryKey(id);
|
|
|
if(workOrderManage == null){
|
|
@@ -421,6 +422,9 @@ public class WorkOrderManageController {
|
|
|
workOrderManage.setUrgency(urgency);//紧急程度
|
|
|
workOrderManage.setOrderUserId(orderUserId);//接单人ID
|
|
|
workOrderManage.setDateLimit(dateLimit);
|
|
|
+ if(workOrderManage.getOrderPid() != null) {
|
|
|
+ workOrderManage.setOrderPid(Integer.parseInt(orderPid));
|
|
|
+ }
|
|
|
if(loginUser.getId() != null) {
|
|
|
workOrderManage.setUpdateBy(String.valueOf(loginUser.getId()));
|
|
|
workOrderManage.setSendBy(String.valueOf(loginUser.getId()));//派单人
|
|
@@ -454,7 +458,8 @@ public class WorkOrderManageController {
|
|
|
@ApiParam(value = "工单类型名称", required = true) @RequestParam(required = true) String orderType,
|
|
|
@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){
|
|
|
+ @ApiParam(value = "接单人编号", required = true) @RequestParam(required = true) String orderUserId,
|
|
|
+ @ApiParam(value = "父单ID", required = false) @RequestParam(required = false) String orderPid){
|
|
|
LoginUser loginUser = UserUtil.getCurrentUser();
|
|
|
WorkOrderManage workOrderManage = workOrderManageService.selectByPrimaryKey(id);
|
|
|
// ProcessDefinition processDefinition = workFlowService.findProcessDefinition(
|
|
@@ -490,6 +495,9 @@ public class WorkOrderManageController {
|
|
|
workOrderManage.setUrgency(urgency);//紧急程度
|
|
|
workOrderManage.setOrderUserId(orderUserId);//接单人ID
|
|
|
workOrderManage.setDateLimit(dateLimit);
|
|
|
+ if(workOrderManage.getOrderPid() != null) {
|
|
|
+ workOrderManage.setOrderPid(Integer.parseInt(orderPid));
|
|
|
+ }
|
|
|
if(loginUser.getId() != null) {
|
|
|
workOrderManage.setUpdateBy(String.valueOf(loginUser.getId()));
|
|
|
workOrderManage.setSendBy(String.valueOf(loginUser.getId()));//派单人
|