储备项目新-待办任务储备项目名称和项目定义号显示修改

src/main/java/com/jeeplus/modules/act/entity/Act.java

@@ -3,10 +3,12 @@
  */
 package com.jeeplus.modules.act.entity;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.TimeUtils;
+import com.jeeplus.core.persistence.BaseEntity;
+import com.jeeplus.modules.act.utils.Variable;
 import org.activiti.engine.history.HistoricActivityInstance;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricTaskInstance;
@@ -14,12 +16,9 @@ import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.TimeUtils;
-import com.jeeplus.core.persistence.BaseEntity;
-import com.jeeplus.modules.act.utils.Variable;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 工作流Entity
@@ -27,7 +26,7 @@ import com.jeeplus.modules.act.utils.Variable;
  * @version 2016-11-03
  */
 public class Act extends BaseEntity<Act> {
-	
+
 	private static final long serialVersionUID = 1L;
 
 	private String taskId; 		// 任务编号
@@ -40,7 +39,7 @@ public class Act extends BaseEntity<Act> {
 
 	private String businessTable;	// 业务绑定Table
 	private String businessId;		// 业务绑定ID
-	
+
 	private String title; 		// 任务标题
 
 	private String status; 		// 任务状态（/start/todo/claim/finish）
@@ -50,7 +49,40 @@ public class Act extends BaseEntity<Act> {
 //	private String procExecUrl; 	// 流程执行（办理）RUL
 	private String comment; 	// 任务意见
 	private String flag; 		// 意见状态
-	
+
+	//储备项目名称
+	private String reserveProjectName;
+
+	//项目定义号
+	private String projectId;
+
+	//项目名称
+	private String projectName;
+
+	public String getReserveProjectName() {
+		return reserveProjectName;
+	}
+
+	public void setReserveProjectName(String reserveProjectName) {
+		this.reserveProjectName = reserveProjectName;
+	}
+
+	public String getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(String projectId) {
+		this.projectId = projectId;
+	}
+
+	public String getProjectName() {
+		return projectName;
+	}
+
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+
 	private Task task; 			// 任务对象
 	private ProcessDefinition procDef; 	// 流程定义对象
 	private ProcessInstance procIns;	// 流程实例对象
@@ -63,7 +95,7 @@ public class Act extends BaseEntity<Act> {
 
 	private Variable vars; 		// 流程变量
 //	private Variable taskVars; 	// 流程任务变量
-	
+
 	private Date beginDate;	// 开始查询日期
 	private Date endDate;	// 结束查询日期
 
@@ -72,7 +104,8 @@ public class Act extends BaseEntity<Act> {
 	public Act() {
 		super();
 	}
-	
+
+
 
 	public String getTaskId() {
 		if (taskId == null && task != null){
@@ -106,7 +139,7 @@ public class Act extends BaseEntity<Act> {
 	public void setTaskDefKey(String taskDefKey) {
 		this.taskDefKey = taskDefKey;
 	}
-	
+
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	public Date getTaskCreateDate() {
 		if (task != null){
@@ -114,7 +147,7 @@ public class Act extends BaseEntity<Act> {
 		}
 		return null;
 	}
-	
+
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	public Date getTaskEndDate() {
 		if (histTask != null){
@@ -122,7 +155,7 @@ public class Act extends BaseEntity<Act> {
 		}
 		return null;
 	}
-	
+
 	@JsonIgnore
 	public Task getTask() {
 		return task;
@@ -140,7 +173,7 @@ public class Act extends BaseEntity<Act> {
 	public void setProcDef(ProcessDefinition procDef) {
 		this.procDef = procDef;
 	}
-	
+
 	public String getProcDefName() {
 		return procDef.getName();
 	}
@@ -160,7 +193,7 @@ public class Act extends BaseEntity<Act> {
 			setBusinessId(procIns.getBusinessKey());
 		}
 	}
-	
+
 	public void setFinishedProcIns(HistoricProcessInstance procIns) {
 		//this.procIns = procIns;
 		if (procIns != null && procIns.getBusinessKey() != null&& procIns.getBusinessKey().contains(":")){
@@ -187,7 +220,7 @@ public class Act extends BaseEntity<Act> {
 	public void setTitle(String title) {
 		this.title = title;
 	}
-	
+
 	public String getStatus() {
 		return status;
 	}
@@ -320,7 +353,7 @@ public class Act extends BaseEntity<Act> {
 	public void setVars(Variable vars) {
 		this.vars = vars;
 	}
-	
+
 	/**
 	 * 通过Map设置流程变量值
 	 * @param map
@@ -359,7 +392,7 @@ public class Act extends BaseEntity<Act> {
 	public void setProcDefKey(String procDefKey) {
 		this.procDefKey = procDefKey;
 	}
-	
+
 	/**
 	 * 获取过去的任务历时
 	 * @return
@@ -370,7 +403,7 @@ public class Act extends BaseEntity<Act> {
 		}
 		return "";
 	}
-	
+
 	/**
 	 * 是否是一个待办任务
 	 * @return
@@ -378,7 +411,7 @@ public class Act extends BaseEntity<Act> {
 	public boolean isTodoTask(){
 		return "todo".equals(status) || "claim".equals(status);
 	}
-	
+
 	/**
 	 * 是否是已完成任务
 	 * @return
@@ -392,12 +425,12 @@ public class Act extends BaseEntity<Act> {
 	}
 	@Override
 	public void preInsert() {
-		
+
 	}
 
 	@Override
 	public void preUpdate() {
-		
+
 	}
 
 

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

@@ -13,6 +13,8 @@ import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.mapper.ActMapper;
 import com.jeeplus.modules.act.utils.ActUtils;
 import com.jeeplus.modules.act.utils.ProcessDefCache;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveProcessProject;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper.ReserveProcessProjectMapper;
 import com.jeeplus.modules.oa.service.OaNotifyService;
 import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
 import com.jeeplus.modules.sg.advence.activiti.service.AdvanceService;
@@ -122,6 +124,9 @@ public class ActTaskService extends BaseService {
     @Autowired
     private MaterialInfoMapper materialInfoMapper;
 
+    @Autowired
+    private ReserveProcessProjectMapper processProjectMapper;
+
     /**
      * 获取待办任务列表
      *
@@ -330,7 +335,6 @@ public class ActTaskService extends BaseService {
         List<HashMap<String, String>> result = new ArrayList<HashMap<String, String>>();
         String userId = UserUtils.getUser().getLoginName();//ObjectUtils.toString(UserUtils.getUser().getId());
 
-
         // =============== 已经签收的任务  ===============
         TaskQuery todoTaskQuery = taskService.createTaskQuery().taskAssignee(userId).active()
                 .includeProcessVariables().orderByTaskCreateTime().desc();
@@ -401,6 +405,7 @@ public class ActTaskService extends BaseService {
         }
         for (Task task : toClaimList) {
             HashMap map = new HashMap();
+//            ReserveProcessProject processProject = processProjectMapper.getBypProcInsId(task.getProcessInstanceId());
             map.put("task.assignee", task.getAssignee());
             map.put("task.id", task.getId());
             map.put("task.name", task.getName());
@@ -413,12 +418,16 @@ 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("reserveProjectName", processProject.getProjectName());
+            map.put("projectId", processProject.getProjectReserveId());
+            map.put("projectName", "");*/
             map.put("title", task.getProcessVariables().get("title"));
             page.getList().add(map);
         }
 
         for (Task task : todoList) {
             HashMap map = new HashMap();
+            ReserveProcessProject processProject = processProjectMapper.getBypProcInsId(task.getProcessInstanceId());
             map.put("task.assignee", task.getAssignee());
             map.put("task.id", task.getId());
             map.put("task.createTime", task.getCreateTime());
@@ -432,6 +441,11 @@ public class ActTaskService extends BaseService {
             map.put("procDef.version", ProcessDefCache.get(task.getProcessDefinitionId()).getVersion());
             map.put("status", "todo");
             map.put("title", task.getProcessVariables().get("title"));
+            if (processProject!=null){
+                map.put("reserveProjectName", processProject.getProjectName());
+                map.put("projectId", processProject.getProjectReserveId());
+                map.put("projectName", "");
+            }
             page.getList().add(map);
         }
 

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -152,6 +152,7 @@ public class ActTaskController extends BaseController {
     @RequestMapping(value = "todo/data")
     public Map<String, Object> todoListData(Act act, HttpServletRequest request, HttpServletResponse response, Model model, String reserveProjectName, String projectId, String projectName) throws Exception {
         Page<HashMap<String, String>> page = actTaskService.todoList(new Page<HashMap<String, String>>(request, response), act);
+
         return getBootstrapData(page);
 //        Page<HashMap<String, String>> page = actTaskService.newTodoList(new Page<HashMap<String, String>>(request, response), act, reserveProjectName, projectId, projectName);
 //        Map<String, Object> map = new HashMap<String, Object>();

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/ReserveProcessProjectMapper.java

@@ -17,6 +17,13 @@ import java.util.List;
 public interface ReserveProcessProjectMapper extends BaseMapper<ReserveProcessProject> {
 
     /**
+     * 根据流程的procInsId 查出储备项目名称，和项目定义号
+     * @param procInsId
+     * @return
+     */
+    ReserveProcessProject getBypProcInsId(String procInsId);
+
+    /**
      * 查看数据库唯一性判断字段值
      * @return
      */

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/xml/ReserveProcessProjectMapper.xml

@@ -507,4 +507,11 @@
         from cg_reserve_process
         where projectReserveId = (select projectReserveId from cg_personnel_activiti where proc_ins_id = #{procInsId})
     </select>
+    <select id="getBypProcInsId"
+            resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveProcessProject">
+        SELECT projectName,projectReserveId FROM `cg_reserve_process`
+         WHERE projectReserveId =
+         (SELECT projectReserveId FROM cg_personnel_activiti
+         WHERE proc_ins_id = #{procInsId})
+    </select>
 </mapper>

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/service/ReserveProcessProjectService.java

@@ -25,6 +25,15 @@ public class ReserveProcessProjectService extends CrudService<ReserveProcessProj
     private ReserveProcessProjectMapper dao;
 
     /**
+     * 根据流程的procInsId 查出储备项目名称，和项目定义号
+     * @param procInsId
+     * @return
+     */
+    public ReserveProcessProject getBypProcInsId(String procInsId){
+        return dao.getBypProcInsId(procInsId);
+    }
+
+    /**
      * 根据项目储备id查询项目信息
      * @param reserveManagement
      * @return

src/main/webapp/webpage/modules/bpm/task/todo/taskTodoList.js

@@ -77,15 +77,15 @@ $(document).ready(function() {
 
 		    },
 			   {
-				   field: 'task.reserveProjectName',
+				   field: 'reserveProjectName',
 				   title: '储备项目名称'
 			   },
 				   {
-					   field: 'task.projectId',
+					   field: 'projectId',
 					   title: '项目定义号'
 				   },
 				   {
-					   field: 'task.projectName',
+					   field: 'projectName',
 					   title: '项目名称'
 				   },
 			   {