yuanzhi_kuang hace 6 meses
padre
commit
b9366199a6

+ 2 - 2
src/com/kingdee/eas/custom/sendmessage/utils/SendMessageUtils.java

@@ -146,7 +146,7 @@ public class SendMessageUtils {
                 paraMap.put("callPhone", callPhone);
                 paraMap.put("urlPath", urlPath);
                 paraMap.put("personInfo", person);
-                JSONObject param = getTemplate(ctx, templateId, paraMap,messageLogsInfo);
+                LinkedHashMap<String, String> param = getTemplate(ctx, templateId, paraMap, messageLogsInfo);
                 params.put("params", param);
                 //ÇëÇó²ÎÊý
                 JSONObject jsonObject = new JSONObject();
@@ -208,7 +208,7 @@ public class SendMessageUtils {
      * @param paramMap ¸÷ÖÖ²ÎÊý
      * @return
      */
-    public static JSONObject getTemplate(Context ctx, String templateId, Map<String,Object> paramMap ,MessageLogsInfo messageLogsInfo) throws BOSException {
+    public static LinkedHashMap<String,String> getTemplate(Context ctx, String templateId, Map<String,Object> paramMap ,MessageLogsInfo messageLogsInfo) throws BOSException {
         TemplateStrategy strategy = TemplateStrategyFactory.getTemplateStrategy(templateId);
         return strategy.getTemplate(ctx, paramMap, messageLogsInfo);
     }

+ 2 - 2
src/com/kingdee/eas/custom/sendmessage/utils/TemplateStrategy.java

@@ -1,10 +1,10 @@
 package com.kingdee.eas.custom.sendmessage.utils;
 
-import com.alibaba.fastjson.JSONObject;
 import com.kingdee.bos.BOSException;
 import com.kingdee.bos.Context;
 import com.kingdee.eas.custom.logs.MessageLogsInfo;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 //
@@ -24,5 +24,5 @@ public interface TemplateStrategy {
      * @return 填充了数据的JSON对象
      * @throws BOSException 业务操作异常
      */
-    JSONObject getTemplate(Context ctx, Map<String, Object> paramMap, MessageLogsInfo messageLogsInfo) throws BOSException;
+    LinkedHashMap<String,String> getTemplate(Context ctx, Map<String, Object> paramMap, MessageLogsInfo messageLogsInfo) throws BOSException;
 };

+ 3 - 3
src/com/kingdee/eas/custom/sendmessage/utils/impl/ElectronicProofTemplate.java

@@ -1,6 +1,5 @@
 package com.kingdee.eas.custom.sendmessage.utils.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.kingdee.bos.BOSException;
 import com.kingdee.bos.Context;
 import com.kingdee.eas.basedata.person.PersonInfo;
@@ -8,13 +7,14 @@ import com.kingdee.eas.custom.logs.MessageLogsInfo;
 import com.kingdee.eas.custom.sendmessage.utils.TemplateStrategy;
 import com.kingdee.util.StringUtils;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 // ʵÏÖµç×ÓÖ¤Ã÷Ä£°å
 public class ElectronicProofTemplate implements TemplateStrategy {
     @Override
-    public JSONObject getTemplate(Context ctx, Map<String,Object> paramMap,  MessageLogsInfo messageLogsInfo) throws BOSException {
-        JSONObject param = new JSONObject();
+    public LinkedHashMap<String,String> getTemplate(Context ctx, Map<String,Object> paramMap, MessageLogsInfo messageLogsInfo) throws BOSException {
+        LinkedHashMap<String,String> param = new LinkedHashMap();
         PersonInfo personInfo = (PersonInfo) paramMap.get("personInfo");
         messageLogsInfo.setPerson(personInfo);
         param.put("name", personInfo.getName());

+ 3 - 3
src/com/kingdee/eas/custom/sendmessage/utils/impl/ResignationNoticeTemplate.java

@@ -1,6 +1,5 @@
 package com.kingdee.eas.custom.sendmessage.utils.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.kingdee.bos.BOSException;
 import com.kingdee.bos.Context;
 import com.kingdee.eas.basedata.person.PersonInfo;
@@ -14,13 +13,14 @@ import com.kingdee.util.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 // Àëְ֪ͨģ°å
 public class ResignationNoticeTemplate implements TemplateStrategy {
     @Override
-    public JSONObject getTemplate(Context ctx, Map<String,Object> paramMap,  MessageLogsInfo messageLogsInfo) throws BOSException {
-        JSONObject param = new JSONObject();
+    public LinkedHashMap<String,String>  getTemplate(Context ctx, Map<String,Object> paramMap, MessageLogsInfo messageLogsInfo) throws BOSException {
+        LinkedHashMap<String,String> param = new LinkedHashMap();
 //        IPersonContactMethod iPersonContactMethod = PersonContactMethodFactory.getLocalInstance(ctx);
 //        PersonContactMethodInfo personContactMethodInfo = iPersonContactMethod
 //                .getPersonContactMethodCollection("select * ,person.* where nCell = '" + phone + "'").get(0);

+ 8 - 5
src/com/kingdee/eas/hr/affair/app/ResignBizBillControllerBeanEx.java

@@ -1,9 +1,5 @@
 package com.kingdee.eas.hr.affair.app;
 
-import com.kingdee.bos.BOSException;
-import com.kingdee.bos.Context;
-import com.kingdee.eas.common.EASBizException;
-import com.kingdee.eas.hr.affair.HRAffairBizBillEntryInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,8 +12,15 @@ import org.slf4j.LoggerFactory;
  */
 public class ResignBizBillControllerBeanEx extends ResignBizBillControllerBean {
 	private static Logger logger = LoggerFactory.getLogger(ResignBizBillControllerBeanEx.class);
-	
 
+//	@Override
+//	protected IObjectPK _submit(Context ctx, IObjectValue model) throws BOSException, EASBizException {
+//		return super._submit(ctx, model);
+//
+//		IEnactmentService enactService = EnactmentServiceFactory.createEnactService(ctx);
+//		enactService.createProcInst()
+//
+//	}
 //	@Override
 //	protected void _doWithOtherChangeEffect(Context ctx, HRAffairBizBillEntryInfo entry)
 //			throws BOSException, EASBizException {