邀请面试模版修改

common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeDeliverRecord.java

@@ -85,4 +85,7 @@ public class ResumeDeliverRecord {
 
 	@ApiModelProperty(value = "备注面试时间")
 	private String remarkN;
+
+	@ApiModelProperty(value = "备注面试地点")
+	private String remarkAddress;
 }

common/src/main/java/com/jpsoft/employment/modules/job/service/impl/ResumeDeliverRecordServiceImpl.java

@@ -118,7 +118,7 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 			String position="";//工作岗位
 			String positionDep="";//入职部门
 			String workAddress="";//工作地
-
+			String remarkAddress="";//面试地点
 
 			resumeDeliverContent.setJobUserId(model.getJobUserId());
 			if(recruitment!=null){
@@ -159,7 +159,7 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 					model.setJobUserId(resumeDeliver.getJobUserId());
 				}
 
-				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
+				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,null,recruitment.getAddress(),sendDate,department,
 						idCard,position,positionDep,workAddress);
 			}
 			else if(chatType.equals("3")){
@@ -168,8 +168,9 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 				userName = model.getRealName();
 				tel = model.getCompanyPhone();
 				dateTime = model.getRemarkN();
+				remarkAddress = model.getRemarkAddress();
 
-				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
+				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,remarkAddress,recruitment.getAddress(),sendDate,department,
 						idCard,position,positionDep,workAddress);
 
 			}
@@ -182,7 +183,7 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 				userName = model.getRealName();
 
 
-				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
+				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,null,recruitment.getAddress(),sendDate,department,
 						idCard,position,positionDep,workAddress);
 			}
 			else if(chatType.equals("6")){
@@ -201,7 +202,7 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 	}
 
 	private int sendMessage(ResumeDeliverRecord model,String chatType,String jobUserName,String companyName,
-							String userName,String dateTime,String tel,String address,String sendDate,String department,
+							String userName,String dateTime,String tel,String remarkAddress,String address,String sendDate,String department,
 							String idCard,String position,String positionDep,String workAddress
 	){
 		int affectCount = 0;
@@ -255,6 +256,7 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 			templateContent = templateContent.replace("{userName}",userName);
 			templateContent = templateContent.replace("{dateTime}",dateTime);
 			templateContent = templateContent.replace("{tel}",tel);
+			templateContent = templateContent.replace("{remarkAddress}",remarkAddress);
 			templateContent = templateContent.replace("{address}",address);
 			templateContent = templateContent.replace("{sendDate}",sendDate);
 			templateContent = templateContent.replace("{department}",department);

web/src/main/java/com/jpsoft/employment/modules/job/controller/ResumeDeliverController.java

@@ -149,6 +149,7 @@ public class ResumeDeliverController {
                 if (resumeDeliverRecordDTO.getChatDate() != null) {
                     ChatDateStr = sdf.format(resumeDeliverRecordDTO.getChatDate());
                 }
+                resumeDeliverRecord.setRemarkAddress(resumeDeliverRecordDTO.getRemark());
                 resumeDeliverRecord.setRemark("面试时间：" + ChatDateStr + " " + resumeDeliverRecordDTO.getChatTime());
 
                 resumeDeliverRecord.setRemarkN(ChatDateStr + " " + resumeDeliverRecordDTO.getChatTime());