添加审核人展示项信息

src/main/java/com/jeeplus/modules/workprojectnotify/entity/WorkProjectNotify.java

@@ -63,6 +63,7 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	private Date startOverDate;	//结束审核时间(开始)
 	private Date endOverDate;	//结束审核时间(结束)
 	private String initiator;	//发起人
+	private String auditor;	//审核人
 
 	public WorkProjectNotify() {
 		super();
@@ -342,4 +343,12 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	public void setInitiator(String initiator) {
 		this.initiator = initiator;
 	}
+
+	public String getAuditor() {
+		return auditor;
+	}
+
+	public void setAuditor(String auditor) {
+		this.auditor = auditor;
+	}
 }

src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -89,6 +89,10 @@
 		<include refid="workProjectNotifyColumns"/>
 		,a.wap_begin_date AS "wapCreateDate"
 		,(select user.id from work_activity_process wap left join sys_user user on wap.create_by = user.id where wap.process_instance_id = a.process_instance_id order by wap.create_date asc limit 1) as 'initiator'
+		,(select p.user_id from work_activity_process wap
+		left join work_activity_process_user p on wap.process_instance_id = p.process_id and p.count = wap.count
+		left join sys_user u on u.id = p.user_id
+		where wap.process_instance_id = 'b4b984e916114f1ca1f188e682465926' and wap.is_approval = '0'  order by wap.count asc limit 1) as 'auditor'
 		FROM work_project_notify a
 		left join sys_user su on a.create_by = su.id
 		LEFT JOIN sys_user u ON u.id = a.create_by

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyList.jsp

@@ -834,10 +834,10 @@
                         return "<span title='"+ d.content +"'>" + d.content + "</span>";
                     }}
                 ,{align:'center',title: '提交人', width:80,templet:function(d){
-                        return "<span title='"+ d.initiator +"'>" + d.initiator + "</span>";
+                        return "<span title='"+ d.submit +"'>" + d.submit + "</span>";
                     }}
                 ,{align:'center',title: '审核人', width:80,templet:function(d){
-                        return "<span title='"+ d.submit +"'>" + d.submit + "</span>";
+                        return "<span title='"+ d.auditorName +"'>" + d.auditorName + "</span>";
                     }}
                 ,{field:'status1', align:'center',title: '审批状态',width:100}
                 ,{field:'op',align:'center', title: '创建时间', width:140,templet:function(d){
@@ -860,6 +860,7 @@
                     ,"title":"${workProjectNotify.title}"
                     ,"content":"${workProjectNotify.content}"
                     ,"initiator":"${fns:getUserById(workProjectNotify.initiator).name}"
+                    ,"auditorName":"${fns:getUserById(workProjectNotify.auditor).name}"
                     ,"submit":"${fns:getUserById(workProjectNotify.createBy.id).name}"
 					,"status":"${workProjectNotify.status}"
                     ,"status1":"${fns:getDictLabel(workProjectNotify.status, 'project_notify_class', '')}"