anderx %!s(int64=3) %!d(string=hai) anos
pai
achega
b8c2b908f1

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

@@ -720,7 +720,7 @@
     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,
     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.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
     left join admin d on b.aid=d.id where 1=1
     <if test="publicType != null">

+ 20 - 1
src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java

@@ -31,7 +31,7 @@ public class OutPublicDtails  {
 	private String clockInTimes;
 	@Excel(name = "创建时间" )
 	private String createTimes;
-	@Excel(name = "公出类型",readConverterExp = "0=业务公出,1=技术公出,2=行政公出,3=技术协单",width = 8)
+	@Excel(name = "公出类型",readConverterExp = "0=业务公出,1=技术公出,2=行政公出,3=技术协单,4=协单助手",width = 8)
 	private Integer type;
 	@Excel(name = "公出目标" )
 	private String remarks;
@@ -50,8 +50,27 @@ public class OutPublicDtails  {
 	@Excel(name = "修改标识",readConverterExp = "0=否,1=是",width = 8)
 	private Integer updateStatus;
 
+	private String assistantAid;
+	@Excel(name = "协单助手" )
+	private String assistantName;
 	private Integer assist;
 
+	public String getAssistantAid() {
+		return assistantAid;
+	}
+
+	public void setAssistantAid(String assistantAid) {
+		this.assistantAid = assistantAid;
+	}
+
+	public String getAssistantName() {
+		return assistantName;
+	}
+
+	public void setAssistantName(String assistantName) {
+		this.assistantName = assistantName;
+	}
+
 	public Integer getAssist() {
 		return assist;
 	}