111

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -173,6 +173,7 @@ public class ActTaskService extends BaseService {
 			map.put("procDef.name", ProcessDefCache.get(task.getProcessDefinitionId()).getName());
 			map.put("procDef.version", ProcessDefCache.get(task.getProcessDefinitionId()).getVersion());
 			map.put("status","todo");
+			map.put("title",task.getProcessVariables().get("title"));
 			page.getList().add(map);
 		}
 		
@@ -191,6 +192,7 @@ public class ActTaskService extends BaseService {
 			map.put("procDef.name", ProcessDefCache.get(task.getProcessDefinitionId()).getName());
 			map.put("procDef.version", ProcessDefCache.get(task.getProcessDefinitionId()).getVersion());
 			map.put("status", "claim");
+			map.put("title",task.getProcessVariables().get("title"));
 			page.getList().add(map);
 		}
 

src/main/java/com/jeeplus/modules/sys/web/LoginController.java

@@ -4,7 +4,9 @@
 package com.jeeplus.modules.sys.web;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.Cookie;
@@ -365,7 +367,21 @@ public class LoginController extends BaseController{
 	public String home(HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
 		Act act = new Act();
 		Page<HashMap<String,String>> page = actTaskService.todoList(new  Page<HashMap<String,String>>(request, response),act);
-		model.addAttribute("actlist",page.getList());
+		List<HashMap<String, String>> list = page.getList();
+		List<Act> actlist = new ArrayList<>();
+		Act act1 = null;
+		for(HashMap<String, String> map : list){
+           act1 = new Act();
+           act1.setTaskId(map.get("task.id"));
+           act1.setTaskName(map.get("task.name"));
+           act1.setTaskDefKey(map.get("task.taskDefinitionKey"));
+           act1.setProcInsId(map.get("task.processInstanceId"));
+           act1.setProcDefId(map.get("task.processDefinitionId"));
+           act1.setStatus(map.get("status"));
+           act1.setTitle(map.get("title"));
+           actlist.add(act1);
+		}
+		model.addAttribute("actlist",actlist);
 		model.addAttribute("actCount",page.getCount());
 		return "modules/sys/login/sysHome";
 		

src/main/webapp/webpage/modules/sys/login/sysHome.jsp

@@ -155,13 +155,13 @@
 											<%--<input id="option1" type="checkbox" class="">--%>
 											<%--<span></span>--%>
 										<%--</label>--%>
-											<%--<span>${actlist.task.id}</span>--%>
-										   <a href="${ctx}/act/task/form?taskId=${list.task.id}&taskName=${list.task.name}&taskDefKey=${list.task.taskDefinitionKey}&procInsId=${list.task.processInstanceId}&procDefId=${list.task.processDefinitionId}&status=${list.status}">${actlist.vars.title}</a>
+											<%--<span>${actlist.taskId}</span>--%>
+										   <a href="${ctx}/act/task/form?taskId=${actlist.taskId}&taskName=${actlist.taskName}&taskDefKey=${actlist.taskDefKey}&procInsId=${actlist.procInsId}&procDefId=${actlist.procDefId}&status=${actlist.status}" style="color: white">${actlist.title}</a>
 									    </li>
 										</c:forEach>
 									</c:if>
 									<c:if test="${empty actlist}">
-										<span>暂无代办事项</span>
+										<span>暂无待办事项</span>
 									</c:if>
 									<%--<li class="">--%>
 										<%--<label class="checkbox1" for="option3">--%>

src/main/webapp/webpage/modules/test/activiti/oALeaveAudit.jsp

@@ -101,7 +101,7 @@
 		</div>
 		<div class="panel-body">
 		<div class="form-group text-center">
-			<h3>${oALeave.act.taskName}</h3>
+			<%--<h3>${oALeave.act.taskName}</h3>--%>
 		</div>
 		<form:form id="inputForm" modelAttribute="oALeave" action="${ctx}/test/activiti/oALeave/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>

src/main/webapp/webpage/modules/test/activiti/testAuditAudit.jsp

@@ -85,7 +85,7 @@
 		</div>
 		<div class="panel-body">
 		<div class="form-group text-center">
-			<h3>${testAudit.act.taskName}</h3>
+			<%--<h3>${testAudit.act.taskName}</h3>--%>
 		</div>
 		<table class="table table-bordered">
 		   <tbody>