人员推送，专项附加功能修改

src/com/kingdee/eas/custom/shuiyou/incomeTax/AbstractTaxPersonReportExFacadeControllerBean.java

@@ -20,8 +20,8 @@ import com.kingdee.eas.framework.LineResult;
 import com.kingdee.eas.framework.exception.EASMultiException;
 import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
 
+import java.util.Map;
 import java.util.List;
-import java.lang.String;
 
 
 
@@ -36,13 +36,13 @@ public abstract class AbstractTaxPersonReportExFacadeControllerBean extends Abst
         return new BOSObjectType("16E375A5");
     }
 
-    public List report(Context ctx, String entryIDs, String taxPeriodDate, String filter) throws BOSException
+    public List report(Context ctx, Map paramMap) throws BOSException
     {
         try {
-            ServiceContext svcCtx = createServiceContext(new MetaDataPK("fbf633c1-1b2b-4f41-b5cf-b1bce7d1d6fb"), new Object[]{ctx, entryIDs, taxPeriodDate, filter});
+            ServiceContext svcCtx = createServiceContext(new MetaDataPK("fbf633c1-1b2b-4f41-b5cf-b1bce7d1d6fb"), new Object[]{ctx, paramMap});
             invokeServiceBefore(svcCtx);
             if(!svcCtx.invokeBreak()) {
-            List retValue = (List)_report(ctx, entryIDs, taxPeriodDate, filter);
+            List retValue = (List)_report(ctx, paramMap);
             svcCtx.setMethodReturnValue(retValue);
             }
             invokeServiceAfter(svcCtx);
@@ -53,18 +53,18 @@ public abstract class AbstractTaxPersonReportExFacadeControllerBean extends Abst
             super.cleanUpServiceState();
         }
     }
-    protected List _report(Context ctx, String entryIDs, String taxPeriodDate, String filter) throws BOSException
+    protected List _report(Context ctx, Map paramMap) throws BOSException
     {    	
         return null;
     }
 
-    public List pensionReport(Context ctx, String taxPeriodDate, String ids, String filter) throws BOSException
+    public List pensionReport(Context ctx, Map paramMap) throws BOSException
     {
         try {
-            ServiceContext svcCtx = createServiceContext(new MetaDataPK("4f7c738d-21f5-4dc1-bac6-ea612a7456b2"), new Object[]{ctx, taxPeriodDate, ids, filter});
+            ServiceContext svcCtx = createServiceContext(new MetaDataPK("4f7c738d-21f5-4dc1-bac6-ea612a7456b2"), new Object[]{ctx, paramMap});
             invokeServiceBefore(svcCtx);
             if(!svcCtx.invokeBreak()) {
-            List retValue = (List)_pensionReport(ctx, taxPeriodDate, ids, filter);
+            List retValue = (List)_pensionReport(ctx, paramMap);
             svcCtx.setMethodReturnValue(retValue);
             }
             invokeServiceAfter(svcCtx);
@@ -75,7 +75,7 @@ public abstract class AbstractTaxPersonReportExFacadeControllerBean extends Abst
             super.cleanUpServiceState();
         }
     }
-    protected List _pensionReport(Context ctx, String taxPeriodDate, String ids, String filter) throws BOSException
+    protected List _pensionReport(Context ctx, Map paramMap) throws BOSException
     {    	
         return null;
     }

src/com/kingdee/eas/custom/shuiyou/incomeTax/ITaxPersonReportExFacade.java

@@ -8,13 +8,13 @@ import com.kingdee.bos.Context;
 
 import com.kingdee.bos.Context;
 import com.kingdee.bos.BOSException;
+import java.util.Map;
 import java.util.List;
-import java.lang.String;
 import com.kingdee.bos.framework.*;
 import com.kingdee.bos.util.*;
 
 public interface ITaxPersonReportExFacade extends IBizCtrl
 {
-    public List report(String entryIDs, String taxPeriodDate, String filter) throws BOSException;
-    public List pensionReport(String taxPeriodDate, String ids, String filter) throws BOSException;
+    public List report(Map paramMap) throws BOSException;
+    public List pensionReport(Map paramMap) throws BOSException;
 }

src/com/kingdee/eas/custom/shuiyou/incomeTax/TaxPersonReportExFacade.java

@@ -9,8 +9,8 @@ import com.kingdee.bos.orm.template.ORMObject;
 import com.kingdee.eas.custom.shuiyou.incomeTax.*;
 import com.kingdee.bos.Context;
 import com.kingdee.bos.BOSException;
+import java.util.Map;
 import java.util.List;
-import java.lang.String;
 import com.kingdee.bos.framework.*;
 import com.kingdee.bos.util.*;
 
@@ -36,15 +36,13 @@ public class TaxPersonReportExFacade extends AbstractBizCtrl implements ITaxPers
     }
     /**
      *[description][%description][invokedemo][%invokedemo][returndesc]任务i的集合[%returndesc]-User defined method
-     *@param entryIDs 任职受雇分录
-     *@param taxPeriodDate 所属周期
-     *@param filter 过滤条件
+     *@param paramMap 参数
      *@return
      */
-    public List report(String entryIDs, String taxPeriodDate, String filter) throws BOSException
+    public List report(Map paramMap) throws BOSException
     {
         try {
-            return getController().report(getContext(), entryIDs, taxPeriodDate, filter);
+            return getController().report(getContext(), paramMap);
         }
         catch(RemoteException err) {
             throw new EJBRemoteException(err);
@@ -52,15 +50,13 @@ public class TaxPersonReportExFacade extends AbstractBizCtrl implements ITaxPers
     }
     /**
      *养老金下载-User defined method
-     *@param taxPeriodDate 所属周期
-     *@param ids id列表
-     *@param filter 过滤条件
+     *@param paramMap 参数
      *@return
      */
-    public List pensionReport(String taxPeriodDate, String ids, String filter) throws BOSException
+    public List pensionReport(Map paramMap) throws BOSException
     {
         try {
-            return getController().pensionReport(getContext(), taxPeriodDate, ids, filter);
+            return getController().pensionReport(getContext(), paramMap);
         }
         catch(RemoteException err) {
             throw new EJBRemoteException(err);

src/com/kingdee/eas/custom/shuiyou/incomeTax/TaxPersonReportExFacadeController.java

@@ -8,8 +8,8 @@ import com.kingdee.bos.Context;
 
 import com.kingdee.bos.Context;
 import com.kingdee.bos.BOSException;
+import java.util.Map;
 import java.util.List;
-import java.lang.String;
 import com.kingdee.bos.framework.*;
 import com.kingdee.bos.util.*;
 
@@ -18,6 +18,6 @@ import com.kingdee.bos.framework.ejb.BizController;
 
 public interface TaxPersonReportExFacadeController extends BizController
 {
-    public List report(Context ctx, String entryIDs, String taxPeriodDate, String filter) throws BOSException, RemoteException;
-    public List pensionReport(Context ctx, String taxPeriodDate, String ids, String filter) throws BOSException, RemoteException;
+    public List report(Context ctx, Map paramMap) throws BOSException, RemoteException;
+    public List pensionReport(Context ctx, Map paramMap) throws BOSException, RemoteException;
 }

src/com/kingdee/eas/custom/shuiyou/incomeTax/TaxPersonReportExFacadeControllerBean.java

@@ -16,7 +16,7 @@ import com.kingdee.eas.custom.shuiyou.uitls.SYUtilsFacadeFactory;
 import com.kingdee.eas.framework.CoreBaseCollection;
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.eas.util.app.DbUtil;
-import com.kingdee.shr.base.syssetting.web.json.JSONUtils;
+
 import com.kingdee.shr.compensation.BankCardStatusEnum;
 import com.kingdee.shr.compensation.IdentityStatusEnume;
 import com.kingdee.shr.compensation.IsOverseaEnum;
@@ -24,8 +24,7 @@ import com.kingdee.shr.compensation.SubmitStatusEnum;
 import com.kingdee.shr.compensation.app.entity.TaxPersonEntity;
 import com.kingdee.shr.compensation.app.entity.Triple;
 import com.kingdee.shr.compensation.app.incomeTax.*;
-import com.kingdee.shr.compensation.app.tax.TaxUnitCollection;
-import com.kingdee.shr.compensation.app.tax.TaxUnitFactory;
+
 import com.kingdee.shr.compensation.app.tax.TaxUnitInfo;
 import com.kingdee.shr.compensation.util.Base64Utils;
 import com.kingdee.shr.compensation.util.CmpDateUtil;
@@ -34,8 +33,6 @@ import com.kingdee.shr.compensation.util.filter.CmpTaxUnitPermFilter;
 import com.kingdee.util.StringUtils;
 import org.apache.log4j.Logger;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.lang.reflect.Field;
 
 import com.kingdee.bos.*;
@@ -53,13 +50,15 @@ public class TaxPersonReportExFacadeControllerBean extends AbstractTaxPersonRepo
      * 养老金下载
      */
     @Override
-    protected List _pensionReport(Context ctx, String taxPeriodDate, String ids, String filter) throws BOSException {
-
+    protected List _pensionReport(Context ctx, Map paramMap) throws BOSException {
+        String taxPeriodDate = (String) paramMap.get("taxPeriodDate");
+        String ids = (String) paramMap.get("ids");
+        String filter=(String) paramMap.get("filter");
         String curPersonPermTaxUnitSql = CmpTaxUnitPermFilter.getCurPersonPermTaxUnitSql(ctx);
         String oql = "select *,bill.*,bill.person.*,bill.nationality.*,bill.position.*,bill.birthPlace.*,bill.eduLevel.*,bill.bank.name,bill.hrBank.name,taxUnit.id,taxUnit.areacode,taxUnit.name,taxUnit.taxNumber,taxUnit.areaCode,taxUnit.regNumber,taxUnit.declPassword,taxUnit.realPassword where (submitStatus=0 or submitStatus=3) ";
-        logger.error("------------>>>>_report：" + oql);
+        //logger.error("------------>>>>_pensionReport：" + oql);
         if (!StringUtils.isEmpty(ids)) {
-            oql = oql + " and taxUnit.id in (" + curPersonPermTaxUnitSql + ")";
+            //oql = oql + " and taxUnit.id in (" + curPersonPermTaxUnitSql + ")";
             oql = oql + " and id in (" + ids + ")";
         } else {
             if (StringUtils.isEmpty(filter)) {
@@ -70,6 +69,8 @@ public class TaxPersonReportExFacadeControllerBean extends AbstractTaxPersonRepo
         }
         List<String> resultList= Lists.newArrayList();
         try {
+            String RELAYTASK = (String) paramMap.get("RELAYTASK");
+            logger.error("------------>>>>_pensionReport：" + oql);
             ITaxPersonRecordEntry iTaxPersonRecordEntry = TaxPersonRecordEntryFactory.getLocalInstance(ctx);
             TaxPersonRecordEntryCollection taxRecordEntryCollection = iTaxPersonRecordEntry.getTaxPersonRecordEntryCollection(oql);
             if (taxRecordEntryCollection.size() == 0) {
@@ -80,7 +81,7 @@ public class TaxPersonReportExFacadeControllerBean extends AbstractTaxPersonRepo
                 SimpleDateFormat skssqFormat = new SimpleDateFormat("yyyyMM");
                 Map<String, Object> returnMap = new HashMap<String, Object>();
                 Calendar cal = Calendar.getInstance();
-
+                logger.error("------------>>>>_pensionReport：" + tripleMap);
                 ISYUtilsFacade localInstance = SYUtilsFacadeFactory.getLocalInstance(ctx);
                 Map<String, Object> propt = localInstance.getConfig();
                 Iterator i$ = tripleMap.entrySet().iterator();
@@ -154,7 +155,7 @@ public class TaxPersonReportExFacadeControllerBean extends AbstractTaxPersonRepo
                     String ip = (String) propt.get("ip");
                     String url = ip + "/gateway/iit/personalPension/download";
                     logger.error("===请求参数==" + postBody + "========");
-                    String taskId = localInstance.addTask("getPensionDownloadService",JSONUtil.toJsonStr(postBody),TaskCatalogEnum.PERSON,null);
+                    String taskId = localInstance.addTask("getPensionDownloadService",JSONUtil.toJsonStr(postBody),TaskCatalogEnum.PERSONAL_PENSION,RELAYTASK);
                     resultList.add(taskId);
                 }
             }
@@ -209,14 +210,16 @@ public class TaxPersonReportExFacadeControllerBean extends AbstractTaxPersonRepo
      * 人员推送
      *
      * @param ctx
-     * @param entryIDs
-     * @param taxPeriodDate
-     * @param filter
+     * @param paramMap
      * @return
      * @throws BOSException
      */
     @Override
-    protected List _report(Context ctx, String entryIDs, String taxPeriodDate, String filter) throws BOSException {
+    protected List _report(Context ctx, Map paramMap) throws BOSException {
+        String taxPeriodDate = (String) paramMap.get("taxPeriodDate");
+        String entryIDs = (String) paramMap.get("entryIDs");
+        String filter=(String) paramMap.get("filter");
+        String RELAYTASK = (String) paramMap.get("RELAYTASK");
         String curPersonPermTaxUnitSql = CmpTaxUnitPermFilter.getCurPersonPermTaxUnitSql(ctx);
         String oql = "select *,bill.*,bill.person.*,bill.nationality.*,bill.position.*,bill.birthPlace.*,bill.eduLevel.*,bill.bank.name,bill.hrBank.name,taxUnit.id,taxUnit.areacode,taxUnit.name,taxUnit.taxNumber,taxUnit.areaCode,taxUnit.regNumber,taxUnit.declPassword,taxUnit.realPassword where (submitStatus=0 or submitStatus=3) ";
         logger.error("------------>>>>_report：" + oql);
@@ -323,6 +326,8 @@ public class TaxPersonReportExFacadeControllerBean extends AbstractTaxPersonRepo
                         person.put("grgbze", rInfo.getInvestmentTotal());//个人投资比例
                         person.put("khyhsfmz", rInfo.getBankCardProvince());//开户银行省份(名字)
                         person.put("rybscl", "否");//开户银行省份(名字)
+                        person.remove("sfkcjcfy");
+                        person.remove("khyh_sheng");
                         rylb.add(person);
                     }
                     postBody.put("rylb", rylb);
@@ -330,24 +335,28 @@ public class TaxPersonReportExFacadeControllerBean extends AbstractTaxPersonRepo
                     String url = ip + "/gateway/iit/declare/declareEmployeeInfo";
                     logger.error("===请求参数==" + postBody + "========");
                     String post = localInstance.post(url, postBody.toJSONString());
-                    System.out.println(post);
-                    JSONObject postJSON = JSONObject.parseObject(post);
-                    //校验 请求是否成功
-                    JSONObject head = postJSON.getJSONObject("head");
-                    String code = (String) head.get("code");
-                    if ("00000000".equals(code)) {
-                        JSONObject body = postJSON.getJSONObject("body");
-
-                        String taskId = localInstance.addTask("personnelReportService", JSONUtil.toJsonStr(body), TaskCatalogEnum.PERSON, null);
-                        List<Object[]> recordEntryParamsList = this.getParamsList(entryBaseCollection, taskId);
-                        String recordEntrySql = "update T_HR_STaxPersonRecordEntry set FSubmitStatus= ?, FIdentityStatus=?,CFTaskID=?, FLastReportMonth=?,FEndDate=? where fid =?";
-                        DbUtil.executeBatch(ctx, recordEntrySql, recordEntryParamsList);
-                        logger.info("--------->>>>>更新报送状态、验证状态：recordEntrySql:" + recordEntrySql + "------>>>>recordEntryParamsList:" + recordEntryParamsList + "---------->>>addTask:" + taskId);
-                        List<Object[]> recordParamsList = this.getParamsList(billBaseCollection, (String) null);
-                        String recordSql = "update T_HR_STaxPersonRecord set FBankCardStatus=? where fid =?";
-                        DbUtil.executeBatch(ctx, recordSql, recordParamsList);
-                        logger.info("--------->>>>>更新银行卡号状态：recordSql:" + recordSql + "------>>>>recordParamsList:" + recordParamsList);
-                        arrayList.add(taskId);
+                    if(null!=post) {
+                        System.out.println(post);
+                        JSONObject postJSON = JSONObject.parseObject(post);
+                        //校验 请求是否成功
+                        JSONObject head = postJSON.getJSONObject("head");
+                        String code = (String) head.get("code");
+                        if ("00000000".equals(code)) {
+                            JSONObject body = postJSON.getJSONObject("body");
+
+                            String taskId = localInstance.addTask("personnelReportService", JSONUtil.toJsonStr(body), TaskCatalogEnum.PERSON, RELAYTASK);
+                            List<Object[]> recordEntryParamsList = this.getParamsList(entryBaseCollection, taskId);
+                            String recordEntrySql = "update T_HR_STaxPersonRecordEntry set FSubmitStatus= ?, FIdentityStatus=?,CFTaskID=?, FLastReportMonth=?,FEndDate=? where fid =?";
+                            DbUtil.executeBatch(ctx, recordEntrySql, recordEntryParamsList);
+                            logger.info("--------->>>>>更新报送状态、验证状态：recordEntrySql:" + recordEntrySql + "------>>>>recordEntryParamsList:" + recordEntryParamsList + "---------->>>addTask:" + taskId);
+                            List<Object[]> recordParamsList = this.getParamsList(billBaseCollection, (String) null);
+                            String recordSql = "update T_HR_STaxPersonRecord set FBankCardStatus=? where fid =?";
+                            DbUtil.executeBatch(ctx, recordSql, recordParamsList);
+                            logger.info("--------->>>>>更新银行卡号状态：recordSql:" + recordSql + "------>>>>recordParamsList:" + recordParamsList);
+                            arrayList.add(taskId);
+                        }
+                    }else {
+                        throw new BOSException("");
                     }
                 }
                 return arrayList;

src/com/kingdee/eas/custom/shuiyou/task/MessageResult.java

@@ -68,8 +68,8 @@ public class MessageResult<T> {
         return new MessageResult(msg,ExecutionStatusEnum.failed);
     }
     public static MessageResult FAILED(){
-        ExecutionStatusEnum again = ExecutionStatusEnum.again;
-        return new MessageResult(again.getAlias(),again);
+        ExecutionStatusEnum failed = ExecutionStatusEnum.failed;
+        return new MessageResult(failed.getAlias(),failed);
     }
     public static MessageResult ERROR(String msg){
         ExecutionStatusEnum error = ExecutionStatusEnum.error;

src/com/kingdee/eas/custom/shuiyou/task/TaskCatalogEnum.java

@@ -36,6 +36,8 @@ public class TaskCatalogEnum extends IntEnum
     public static final int COLLECTION_CONFIRM_GET_VALUE = 105;//alias=人员归集确认查询
     public static final int UN_CAL_VALUE = 110;//alias=反算服务
     public static final int UN_CAL_GET_VALUE = 111;//alias=查询反算反馈结果
+    public static final int PERSONAL_PENSION_VALUE = 120;//alias=养老金下载
+    public static final int PERSONAL_PENSION_GET_VALUE = 121;//alias=养老金下载查询
 
     public static final TaskCatalogEnum PERSON = new TaskCatalogEnum("PERSON", PERSON_VALUE);
     public static final TaskCatalogEnum PERSON_GET = new TaskCatalogEnum("PERSON_GET", PERSON_GET_VALUE);
@@ -60,6 +62,8 @@ public class TaskCatalogEnum extends IntEnum
     public static final TaskCatalogEnum COLLECTION_CONFIRM_GET = new TaskCatalogEnum("COLLECTION_CONFIRM_GET", COLLECTION_CONFIRM_GET_VALUE);
     public static final TaskCatalogEnum UN_CAL = new TaskCatalogEnum("UN_CAL", UN_CAL_VALUE);
     public static final TaskCatalogEnum UN_CAL_GET = new TaskCatalogEnum("UN_CAL_GET", UN_CAL_GET_VALUE);
+    public static final TaskCatalogEnum PERSONAL_PENSION = new TaskCatalogEnum("PERSONAL_PENSION", PERSONAL_PENSION_VALUE);
+    public static final TaskCatalogEnum PERSONAL_PENSION_GET = new TaskCatalogEnum("PERSONAL_PENSION_GET", PERSONAL_PENSION_GET_VALUE);
 
     /**
      * construct function

src/com/kingdee/eas/custom/shuiyou/task/TaskCatalogEnum.properties

@@ -21,3 +21,5 @@ COLLECTION_CONFIRM=\u4EBA\u5458\u5F52\u96C6\u786E\u8BA4
 COLLECTION_CONFIRM_GET=\u4EBA\u5458\u5F52\u96C6\u786E\u8BA4\u67E5\u8BE2
 UN_CAL=\u53CD\u7B97\u670D\u52A1
 UN_CAL_GET=\u67E5\u8BE2\u53CD\u7B97\u53CD\u9988\u7ED3\u679C
+PERSONAL_PENSION=\u517B\u8001\u91D1\u4E0B\u8F7D
+PERSONAL_PENSION_GET=\u517B\u8001\u91D1\u4E0B\u8F7D\u67E5\u8BE2

src/com/kingdee/eas/custom/shuiyou/task/TaskCatalogEnum_l1.properties

@@ -21,3 +21,5 @@ COLLECTION_CONFIRM=
 COLLECTION_CONFIRM_GET=
 UN_CAL=
 UN_CAL_GET=
+PERSONAL_PENSION=
+PERSONAL_PENSION_GET=

src/com/kingdee/eas/custom/shuiyou/task/TaskCatalogEnum_l2.properties

@@ -21,3 +21,5 @@ COLLECTION_CONFIRM=\u4EBA\u5458\u5F52\u96C6\u786E\u8BA4
 COLLECTION_CONFIRM_GET=\u4EBA\u5458\u5F52\u96C6\u786E\u8BA4\u67E5\u8BE2
 UN_CAL=\u53CD\u7B97\u670D\u52A1
 UN_CAL_GET=\u67E5\u8BE2\u53CD\u7B97\u53CD\u9988\u7ED3\u679C
+PERSONAL_PENSION=\u517B\u8001\u91D1\u4E0B\u8F7D
+PERSONAL_PENSION_GET=\u517B\u8001\u91D1\u4E0B\u8F7D\u67E5\u8BE2

src/com/kingdee/eas/custom/shuiyou/task/TaskCatalogEnum_l3.properties

@@ -21,3 +21,5 @@ COLLECTION_CONFIRM=\u4EBA\u54E1\u6B78\u96C6\u78BA\u8A8D
 COLLECTION_CONFIRM_GET=\u4EBA\u54E1\u6B78\u96C6\u78BA\u8A8D\u67E5\u8A62
 UN_CAL=\u53CD\u7B97\u670D\u52D9
 UN_CAL_GET=\u67E5\u8A62\u53CD\u7B97\u53CD\u994B\u7D50\u679C
+PERSONAL_PENSION=\u990A\u8001\u91D1\u4E0B\u8F09
+PERSONAL_PENSION_GET=\u990A\u8001\u91D1\u4E0B\u8F09\u67E5\u8A62

src/com/kingdee/eas/custom/shuiyou/task/TaskInfo.java

@@ -163,7 +163,7 @@ public class TaskInfo extends AbstractTaskInfo implements Serializable, Task
                 //设置继续
                 Optional<TaskRequestResultInfo> resultInfo = Optional.ofNullable(this.getRequestResult());
                 TaskRequestResultInfo requestResult = resultInfo.orElse(new TaskRequestResultInfo());
-                requestResult.setResultContent(requestResult.getResultContent()+";"+messageResult.getMsg());
+                requestResult.setResultContent(messageResult.getMsg());
                 requestResult.setTask(this);
                 this.setRequestResult(requestResult);
             }else if (ExecutionStatusEnum.await_w.equals(messageResult.getStatus())){
@@ -171,7 +171,7 @@ public class TaskInfo extends AbstractTaskInfo implements Serializable, Task
                 //即在任务中增加新的子任务，又需要等待子任务执行完成，才能继续的情况。
                 Optional<TaskRequestResultInfo> resultInfo = Optional.ofNullable(this.getRequestResult());
                 TaskRequestResultInfo requestResult = resultInfo.orElse(new TaskRequestResultInfo());
-                requestResult.setResultContent(requestResult.getResultContent()+";"+messageResult.getMsg());
+                requestResult.setResultContent(messageResult.getMsg());
                 requestResult.setTask(this);
                 this.setRequestResult(requestResult);
                 this.setRequestState(RequestStateEnum.Successful);
@@ -181,7 +181,7 @@ public class TaskInfo extends AbstractTaskInfo implements Serializable, Task
                 //设置失败
                 Optional<TaskRequestResultInfo> resultInfo = Optional.ofNullable(this.getRequestResult());
                 TaskRequestResultInfo requestResult = resultInfo.orElse(new TaskRequestResultInfo());
-                requestResult.setResultContent(requestResult.getResultContent()+";"+messageResult.getMsg());
+                requestResult.setResultContent(messageResult.getMsg());
                 requestResult.setTask(this);
 
                 this.setRequestResult(requestResult);

src/com/kingdee/eas/custom/shuiyou/taxCal/TaxCalFacadeControllerBean.java

@@ -200,7 +200,7 @@ public class TaxCalFacadeControllerBean extends AbstractTaxCalFacadeControllerBe
                     try {
                         //人员报税信息报送_人员信息报送
                         List relayTaskIDList = TaxPersonReportExFacadeFactory.getLocalInstance(ctx)
-                                .report(notReportedPersonIds, yearMonth, (String) null);
+                                .report(paramMap);
                         if (null != relayTaskIDList && relayTaskIDList.size() == 1) {
                             String relayTaskID = (String) relayTaskIDList.get(0);
                             paramMap.put("RELAYTASK", relayTaskID);//前置任务id

src/com/kingdee/eas/custom/shuiyou/uitls/SYUtilsFacadeControllerBean.java

@@ -21,6 +21,7 @@ import com.kingdee.eas.custom.shuiyou.interfacelog.LogInfoFactory;
 
 import com.kingdee.eas.custom.shuiyou.task.*;
 
+import com.kingdee.shr.dydeploy.web.executeSql.ExceptionUtils;
 import okhttp3.*;
 import org.apache.log4j.Logger;
 
@@ -183,15 +184,15 @@ public class SYUtilsFacadeControllerBean extends AbstractSYUtilsFacadeController
             }else {
                 logInfo.setErrorInfo(sYResponse.message());//渣昫陓洘
             }
-        }catch (IOException e){
-            //e.printStackTrace();
+            logInfo.setOutParameter(result);//隙統
+        }catch (Exception e){
+            e.printStackTrace();
             logger.error(e);
-            logInfo.setErrorInfo(e.getMessage());//諉諳華硊
+            logInfo.setOutParameter( ExceptionUtils.getStackTrace(e));//隙統
         }finally {
             logInfo.setInterfaceAddress(url);//諉諳華硊
             logInfo.setInterfaceName("POST");//諉諳靡
             logInfo.setInParameter(param);//⻌統
-            logInfo.setOutParameter(result);//隙統
             this._log(ctx,logInfo);
         }
         return result;