Browse Source

新增公出汇总审核时间的返回

anderx 3 years ago
parent
commit
b2e0db32e7

+ 2 - 2
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -741,8 +741,8 @@
   <select id="listPublicDtails" resultType="com.goafanti.weChat.bo.OutPublicDtails">
     select a.id,b.nickname ,a.user_name userName,c.name aname,a.duration ,a.status,a.annex_url annexUrl,a.photo_url photoUrl,
     date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S') clockInTimes,a.clock_in clockIn,a.remarks,a.supplement,a.type,
-    date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.audit_info auditInfo,d.name sname,
-    date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,
+    date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.audit_info auditInfo,date_format(a.audit_time ,'%Y-%m-%d %H:%i:%S') auditTimes,
+    d.name sname, date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,
     a.plan ,a.next_plan nextPlan ,a.expected_effect expectedEffect,a.update_status updateStatus,a.assist_aid_name assistAidName,
     a.main_name mainName,a.assist,a.assistant_aid assistantAid, a.assistant_name assistantName
     from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id

+ 10 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java

@@ -45,6 +45,8 @@ public class OutPublicDtails  {
 	private String nextPlan;
 	@Excel(name = "审核信息" )
 	private String auditInfo;
+	@Excel(name = "审核时间" )
+	private String auditTimes;
 	private String annexUrl;
 	private String photoUrl;
 	@Excel(name = "修改标识",readConverterExp = "0=否,1=是",width = 8)
@@ -55,6 +57,14 @@ public class OutPublicDtails  {
 	private String assistantName;
 	private Integer assist;
 
+	public String getAuditTimes() {
+		return auditTimes;
+	}
+
+	public void setAuditTimes(String auditTimes) {
+		this.auditTimes = auditTimes;
+	}
+
 	public String getAssistantAid() {
 		return assistantAid;
 	}