项目详情里的审核意见
pengqiang
parent
1b47962e67
commit
ba8d4efbe4
|
|
@ -2,10 +2,7 @@ package cn.palmte.work.controller.backend;
|
||||||
|
|
||||||
import cn.palmte.work.bean.*;
|
import cn.palmte.work.bean.*;
|
||||||
import cn.palmte.work.model.*;
|
import cn.palmte.work.model.*;
|
||||||
import cn.palmte.work.service.ProjectBudgetService;
|
import cn.palmte.work.service.*;
|
||||||
import cn.palmte.work.service.ProjectEstimateService;
|
|
||||||
import cn.palmte.work.service.ProjectService;
|
|
||||||
import cn.palmte.work.service.ProjectTaskRecordService;
|
|
||||||
import cn.palmte.work.utils.FreeMarkerUtil;
|
import cn.palmte.work.utils.FreeMarkerUtil;
|
||||||
import cn.palmte.work.utils.InterfaceUtil;
|
import cn.palmte.work.utils.InterfaceUtil;
|
||||||
import cn.palmte.work.utils.Utils;
|
import cn.palmte.work.utils.Utils;
|
||||||
|
|
@ -48,6 +45,10 @@ public class ProjectController extends BaseController {
|
||||||
private ProjectBudgetService projectBudgetService;
|
private ProjectBudgetService projectBudgetService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ProjectTaskRecordService projectTaskRecordService;
|
private ProjectTaskRecordService projectTaskRecordService;
|
||||||
|
@Autowired
|
||||||
|
private ActProcInsService actProcInsService;
|
||||||
|
@Autowired
|
||||||
|
private ProjectInstanceRelationRepository projectInstanceRelationRepository;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 项目列表
|
* 项目列表
|
||||||
|
|
@ -395,6 +396,7 @@ public class ProjectController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@RequestMapping("/taskRecords/{projectId}")
|
@RequestMapping("/taskRecords/{projectId}")
|
||||||
public String taskRecords(@PathVariable int projectId, Map<String, Object> model) {
|
public String taskRecords(@PathVariable int projectId, Map<String, Object> model) {
|
||||||
|
model.put("projectId", projectId);
|
||||||
List<ProjectTaskRecord> list = projectTaskRecordService.list(projectId);
|
List<ProjectTaskRecord> list = projectTaskRecordService.list(projectId);
|
||||||
if (list != null && !list.isEmpty()) {
|
if (list != null && !list.isEmpty()) {
|
||||||
model.put("list", list);
|
model.put("list", list);
|
||||||
|
|
@ -402,6 +404,22 @@ public class ProjectController extends BaseController {
|
||||||
return "admin/project_task_record_list";
|
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<ProjectInstanceRelation> relationList = projectInstanceRelationRepository.findByProjectIdOrderByCreateTimeDesc(projectId);
|
||||||
|
if (relationList == null || relationList.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
actProcInsService.createProcInsPng(response, relationList.get(0).getProcessInsId());
|
||||||
|
}
|
||||||
|
|
||||||
@InitBinder
|
@InitBinder
|
||||||
public void initBinder(WebDataBinder webDataBinder) {
|
public void initBinder(WebDataBinder webDataBinder) {
|
||||||
webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM-dd"));
|
webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM-dd"));
|
||||||
|
|
|
||||||
|
|
@ -9,31 +9,51 @@
|
||||||
<small>审核流程</small>
|
<small>审核流程</small>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="main">
|
<div class="am-tabs am-margin" data-am-tabs>
|
||||||
<ul class="time-axis">
|
<ul class="am-tabs-nav am-nav am-nav-tabs">
|
||||||
<#if list?exists >
|
<li class="am-active"><a href="#tab1">审核记录</a></li>
|
||||||
|
<li><a href="#tab2">流程图</a></li>
|
||||||
<#list list as node>
|
|
||||||
<li class="time-axis-item">
|
|
||||||
<div class="time-axis-date" style="margin-left: -96px"> ${node.createTime} <span></span>
|
|
||||||
</div>
|
|
||||||
<div class="time-axis-title"> ${node.roleName}-${node.assigneeName}:
|
|
||||||
<#if node.taskStatus==2>审批通过</#if>
|
|
||||||
<#if node.taskStatus==3>审批不通过</#if>
|
|
||||||
</div>
|
|
||||||
<div class="time-axis-title">
|
|
||||||
${node.taskComment}
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</#list>
|
|
||||||
<#else>
|
|
||||||
<div class="am-kai" align="center">
|
|
||||||
<h3>没有找到任何记录!</h3>
|
|
||||||
</div>
|
|
||||||
</#if>
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
<div class="am-tabs-bd">
|
||||||
|
<div class="am-tab-panel am-fade am-in am-active" id="tab1">
|
||||||
|
<div class="main">
|
||||||
|
<ul class="time-axis">
|
||||||
|
<#if list?exists >
|
||||||
|
|
||||||
|
<#list list as node>
|
||||||
|
<li class="time-axis-item">
|
||||||
|
<div class="time-axis-date" style="margin-left: -96px"> ${node.createTime}
|
||||||
|
<span></span>
|
||||||
|
</div>
|
||||||
|
<div class="time-axis-title"> ${node.roleName}-${node.assigneeName}:
|
||||||
|
<#if node.taskStatus==2>审批通过</#if>
|
||||||
|
<#if node.taskStatus==3>审批不通过</#if>
|
||||||
|
</div>
|
||||||
|
<div class="time-axis-title">
|
||||||
|
${node.taskComment}
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
</#list>
|
||||||
|
<#else>
|
||||||
|
<div class="am-kai" align="center">
|
||||||
|
<h3>没有找到任何记录!</h3>
|
||||||
|
</div>
|
||||||
|
</#if>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="am-tabs-bd">
|
||||||
|
<div class="am-tab-panel am-fade am-in" id="tab2">
|
||||||
|
<img id="img" name="img" style="width: 950px" src="${base}/project/procInsPng/${projectId}">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="am-margin">
|
<div class="am-margin">
|
||||||
<button type="button" class="am-btn am-btn-warning am-btn-xs" onclick="javascript:history.go(-1);">
|
<button type="button" class="am-btn am-btn-warning am-btn-xs" onclick="javascript:history.go(-1);">
|
||||||
返回上一级
|
返回上一级
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue