diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java index b0b00045..c45a1238 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java @@ -158,7 +158,13 @@ public class SysSalesOrderController extends BaseController mmap.put("sysSalesOrder", sysSalesOrder); return prefix + "/edit"; } - + @GetMapping("/detail/{id}") + public String detail(@PathVariable("id") Long id, ModelMap mmap) + { + SysSalesOrder sysSalesOrder = sysSalesOrderService.selectSysSalesOrderById(id); + mmap.put("sysSalesOrder", sysSalesOrder); + return prefix + "/detail"; + } /** * 修改保存销售订单 */ @@ -358,7 +364,7 @@ public class SysSalesOrderController extends BaseController Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); String processInstanceId = task.getProcessInstanceId(); ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); - SysSalesOrderVo sysSalesOrderVo = sysSalesOrderService.selectSysSalesOrderById(new Long(processInstance.getBusinessKey())); + SysSalesOrderVo sysSalesOrderVo = sysSalesOrderService.selectSysSalesOrderById(Long.valueOf(processInstance.getBusinessKey())); mmap.put("formData", sysSalesOrderVo); mmap.put("taskId", taskId); String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1); diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html index 5b418e3d..1df6f11b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html @@ -87,21 +87,21 @@