Przeglądaj źródła

待办页面展示发起人信息

user5 2 lat temu
rodzic
commit
7b13631608

+ 9 - 0
src/main/java/com/jeeplus/modules/workprojectnotify/entity/WorkProjectNotify.java

@@ -62,6 +62,7 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	private Date endBeginDate;	//开始审核时间(结束)
 	private Date startOverDate;	//结束审核时间(开始)
 	private Date endOverDate;	//结束审核时间(结束)
+	private String initiator;	//发起人
 
 	public WorkProjectNotify() {
 		super();
@@ -333,4 +334,12 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	public void setEndOverDate(Date endOverDate) {
 		this.endOverDate = endOverDate;
 	}
+
+	public String getInitiator() {
+		return initiator;
+	}
+
+	public void setInitiator(String initiator) {
+		this.initiator = initiator;
+	}
 }

+ 1 - 0
src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -88,6 +88,7 @@
 		SELECT
 		<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'
 		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

+ 4 - 0
src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyList.jsp

@@ -834,6 +834,9 @@
                         return "<span title='"+ d.content +"'>" + d.content + "</span>";
                     }}
                 ,{align:'center',title: '提交人', width:80,templet:function(d){
+                        return "<span title='"+ d.initiator +"'>" + d.initiator + "</span>";
+                    }}
+                ,{align:'center',title: '审核人', width:80,templet:function(d){
                         return "<span title='"+ d.submit +"'>" + d.submit + "</span>";
                     }}
                 ,{field:'status1', align:'center',title: '审批状态',width:100}
@@ -856,6 +859,7 @@
                     ,"step":"${workProjectNotify.notifyRole}"
                     ,"title":"${workProjectNotify.title}"
                     ,"content":"${workProjectNotify.content}"
+                    ,"initiator":"${fns:getUserById(workProjectNotify.initiator).name}"
                     ,"submit":"${fns:getUserById(workProjectNotify.createBy.id).name}"
 					,"status":"${workProjectNotify.status}"
                     ,"status1":"${fns:getDictLabel(workProjectNotify.status, 'project_notify_class', '')}"