通知修改

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/impl/TemplateMessageServiceImpl.java

@@ -461,6 +461,7 @@ public class TemplateMessageServiceImpl implements TemplateMessageService {
 		contentVars.put("userName", studentApplication.getInsuredName());
 		contentVars.put("companyName", studentApplication.getInsuredName());
 
+
 		content = VelocityHelper.format(content,contentVars);
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -468,6 +469,9 @@ public class TemplateMessageServiceImpl implements TemplateMessageService {
 		Map<String,Object> jsonVars = new HashMap<>();
 
 		jsonVars.put("content",content);
+		jsonVars.put("time", DateTime.now().toString("yyyy-MM-dd HH:mm"));
+		jsonVars.put("companyName",studentApplication.getInsuredName());  //增加显示被保险人企业名称
+		jsonVars.put("type", "学平险");
 
 		String json = VelocityHelper.format(templateMessage.getJson(),jsonVars);
 		JSONObject jsonObject = new JSONObject(json);

picc-common/src/main/java/com/jpsoft/picc/modules/common/utils/ItextPDFUtil.java

@@ -1096,7 +1096,7 @@ public class ItextPDFUtil {
             companyName = companyName.substring(0,6);
         }
 
-        BaseFont font = BaseFont.createFont("C:/WINDOWS/Fonts/SIMSUN.TTC,1", "Identity-H", true);// 使用系统字体
+        BaseFont font = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
         int pageSize = reader.getNumberOfPages();// 原pdf文件的总页数
         for (int i = 1; i <= pageSize; i++) {
             //左边start===============================================