diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java index 53cc0d5..47e1be4 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -175,7 +175,7 @@ public class ProcessController { } @GetMapping("/detail/{id}") - public String detail(@PathVariable int id, Model model) { + public String detail(@PathVariable int id, Model model, @RequestParam(defaultValue = "false") boolean forAudit) { model.addAttribute("processId", id); ProjectProcess process = repository.findOne(id); @@ -190,6 +190,7 @@ public class ProcessController { model.addAttribute("isPrepaid", isPrepaid(project)); BigDecimal repaidAmount = getRepaidAmount(id); model.addAttribute("repaidAmount", repaidAmount); + model.addAttribute("forAudit", forAudit); if (process.getProcessType() != null) { switch (process.getProcessType()) { @@ -494,6 +495,8 @@ public class ProcessController { entity.setSealTypes(SealTypeArray.of(form.getSealTypes())); entity.setAttachmentUri(JSON.toJSONString(form.getAttachments())); + entity.setRemark(form.getRemark()); + entity.setStatus(form.getStatus()); entity.setApplyDept(form.getApplyDept()); entity.setApplyDeptId(form.getApplyDeptId()); entity.setApplyDeptLeaderId(form.getApplyDeptLeaderId()); diff --git a/src/main/resources/templates/admin/business/process-completed.ftl b/src/main/resources/templates/admin/business/process-completed.ftl index 77d79d9..b0045e7 100644 --- a/src/main/resources/templates/admin/business/process-completed.ftl +++ b/src/main/resources/templates/admin/business/process-completed.ftl @@ -86,8 +86,24 @@ - - + + + + + +