修改直播申请审核通过后邮件发送的标题

直播申请审核的列表和详情页增加直播类型展示

修改直播申请审核通过后邮件发送的标题
直播申请审核的列表和详情页增加直播类型展示
liwei2917
1 parent 5e1c2622
Showing 4 changed files with 20 additions and 2 deletions
src/main/java/com/cnlive/shenhe/job/LiveApplyJob.java
src/main/resources/templates/email/email_templates.html
src/main/resources/templates/page/liveApply.html
src/main/resources/templates/page/liveApplyDetail.html
@@ -7,6 +7,7 @@ import com.cnlive.shenhe.entity.ShyChannel;
 import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.entity.ShyEmail;
 import com.cnlive.shenhe.entity.ShyLiveapply;
+import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyVideos;
 import com.cnlive.shenhe.mapper.ShyLiveapplyMapper;
 import com.cnlive.shenhe.serviceImpl.ChannelServiceImpl;
@@ -98,13 +99,18 @@ public class LiveApplyJob {
         	for(ShyLiveapply liveApply : shyLiveApplyList){
         		Integer notice_state = liveApply.getEmail_notice_state();//初始化通知状态
         		String notice_msg = liveApply.getEmail_notice_msg();//初始化通知消息
+        		//显示spid简称
+                ShySites shySites = sitesService.findspidDescByspid(liveApply.getSp_id());
+                if (CommonUtils.isNotNull(shySites)) {
+                	liveApply.setSpid_desc(shySites.getName());
+                }
         		for(ShyEmail shyEmail:shyEmailList){//循环需要发送邮件的邮箱
         			String startTime=CommonUtils.formatDate(liveApply.getPre_start_time(), "yyyy-MM-dd HH:mm:ss");
         			String endTime=CommonUtils.isNotNull(liveApply.getPre_end_time())?CommonUtils.formatDate(liveApply.getPre_end_time(), "yyyy-MM-dd HH:mm:ss"):"待定";
         			String content = liveApply.getSender()+"__"+liveApply.getMobile()+"__"+liveApply.getOrganization()+"__"+liveApply.getTheme()+"__"+startTime+"__"+endTime+"__"+liveApply.getLive_place()+"__"+liveApply.getPush_url()+"__"+liveApply.getPull_url();
         			String dateTime=CommonUtils.getCurrentDate("yyyy-MM-dd HH:mm:ss");//获取一个格式化后的当前时间
         			String emailAddr = shyEmail.getEmail();
-        			String title = "新直播开播申请";
+        			String title = liveApply.getSpid_desc()+"新直播开播申请";
         			String templateId = "4017";
         			Map<String, String> params = new HashMap<>();
         			params.put("appId", app_id);
@@ -5,7 +5,7 @@
 <body>
 		<div align="center" id="tabContents" class="tab-content">
 							<span style="font-size:30px;font-weight: bold;color:#F4A460;">中国网家家直播申请单</span>
-                              <table  border="1"   style="background-color:#F5FFFA;width:80%;font-size:20px;" id="table">
+                              <table  border="1" cellspacing="0"  style="background-color:#F5FFFA;width:80%;font-size:20px;" id="table">
 								<tr align="center" valign="middle" height="40px">
 								   <td width="25%" >直播发起人</td>
 								   <td width="30%" colspan="2" >
@@ -201,6 +201,11 @@
                                                 <div class="th-inner ">商务模式</div>
                                                 <div class="fht-cell"></div>
                                             </th>
+                                            <th style="text-align: center; width: 3%; " data-field="is_hot_name"
+                                                tabindex="0">
+                                                <div class="th-inner ">直播类型</div>
+                                                <div class="fht-cell"></div>
+                                            </th>
                                             <th style="text-align: center; width: 6%; " data-field="updater"
                                                 tabindex="0">
                                                 <div class="th-inner ">审核员</div>
@@ -252,6 +257,7 @@
                                             <td style="text-align: center; width: 3%;"
                                                 th:text="${liveApply.business_model=='1'?'收费':'免费'}">收费
                                             </td>
+                                            <td style="text-align: center; width: 3%;" th:text="${liveApply.live_type}">直播分类</td>
                                             <td style="text-align: center; width: 6%;" th:text="${liveApply.updater}">审核员
                                             </td>
                                             <td style="text-align: center; width: 3%;">
@@ -68,6 +68,12 @@
 								   </td>
 								</tr>
 								<tr align="center" valign="middle" height="40px">
+								   <td >直播类型</td>
+								   <td colspan="5">
+								   	   <span style="color:#DC143C" th:text="${shyLiveapply.live_type}">11111111111111</span>
+								   </td>
+								</tr>
+								<tr align="center" valign="middle" height="40px">
 								   <td >内容属性</td>
 								   <td colspan="5">
 									   <input type="checkbox" style="height: 24px;width: 24px;" th:checked="${shyLiveapply.content_property==1}" disabled/>