diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index c6db245..b5e2625 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -2,10 +2,7 @@ package cn.palmte.work.controller.backend; import cn.palmte.work.bean.*; import cn.palmte.work.model.*; -import cn.palmte.work.service.ProjectBudgetService; -import cn.palmte.work.service.ProjectEstimateService; -import cn.palmte.work.service.ProjectService; -import cn.palmte.work.service.ProjectTaskRecordService; +import cn.palmte.work.service.*; import cn.palmte.work.utils.FreeMarkerUtil; import cn.palmte.work.utils.InterfaceUtil; import cn.palmte.work.utils.Utils; @@ -48,6 +45,10 @@ public class ProjectController extends BaseController { private ProjectBudgetService projectBudgetService; @Autowired private ProjectTaskRecordService projectTaskRecordService; + @Autowired + private ActProcInsService actProcInsService; + @Autowired + private ProjectInstanceRelationRepository projectInstanceRelationRepository; /** * 项目列表 @@ -395,6 +396,7 @@ public class ProjectController extends BaseController { */ @RequestMapping("/taskRecords/{projectId}") public String taskRecords(@PathVariable int projectId, Map model) { + model.put("projectId", projectId); List list = projectTaskRecordService.list(projectId); if (list != null && !list.isEmpty()) { model.put("list", list); @@ -402,6 +404,22 @@ public class ProjectController extends BaseController { return "admin/project_task_record_list"; } + /** + * 流程实列图片 + * + * @param response + * @param projectId + * @throws Exception + */ + @RequestMapping("/procInsPng/{projectId}") + public void png(HttpServletResponse response, @PathVariable("projectId") int projectId) throws Exception { + List relationList = projectInstanceRelationRepository.findByProjectIdOrderByCreateTimeDesc(projectId); + if (relationList == null || relationList.isEmpty()) { + return; + } + actProcInsService.createProcInsPng(response, relationList.get(0).getProcessInsId()); + } + @InitBinder public void initBinder(WebDataBinder webDataBinder) { webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM-dd")); diff --git a/src/main/resources/templates/admin/project_task_record_list.ftl b/src/main/resources/templates/admin/project_task_record_list.ftl index aeba985..d5355b8 100644 --- a/src/main/resources/templates/admin/project_task_record_list.ftl +++ b/src/main/resources/templates/admin/project_task_record_list.ftl @@ -9,31 +9,51 @@ 审核流程 -
-
    - <#if list?exists > - - <#list list as node> -
  • -
    ${node.createTime} -
    -
    ${node.roleName}-${node.assigneeName}: - <#if node.taskStatus==2>审批通过 - <#if node.taskStatus==3>审批不通过 -
    -
    - ${node.taskComment} -
    -
  • - - <#else> -
    -

    没有找到任何记录!

    -
    - +
    + + +
    +
    +
    +
      + <#if list?exists > + + <#list list as node> +
    • +
      ${node.createTime} + +
      +
      ${node.roleName}-${node.assigneeName}: + <#if node.taskStatus==2>审批通过 + <#if node.taskStatus==3>审批不通过 +
      +
      + ${node.taskComment} +
      +
    • + + <#else> +
      +

      没有找到任何记录!

      +
      + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +