Merge branch 'master' of http://47.92.104.23:3000/LiuYing/jiuzhoutong

deployed_metas/com/kingdee/eas/custom/shuiyou/incomeTax/TaxSpeAddDedReportExFacade.facade

@@ -20,7 +20,7 @@
             <innerID>8f35e5f2-4d16-471e-b12e-bf40f58d2657</innerID>
             <accessLevel>public</accessLevel>
             <subClassingMode>normal</subClassingMode>
-            <returnValueType>com.kingdee.eas.custom.shuiyou.task.MessageResult</returnValueType>
+            <returnValueType>String</returnValueType>
             <metadataRef />
             <transactionAttribute>Supports</transactionAttribute>
             <userDefined>true</userDefined>

deployed_metas/com/kingdee/eas/custom/shuiyou/task/ExecutionStatusEnum.enum

@@ -32,6 +32,12 @@
             <userDefined>true</userDefined>
             <value>error</value>
         </enumValue>
+        <enumValue>
+            <name>await_w</name>
+            <alias>bizEnum[com.kingdee.eas.custom.shuiyou.task.ExecutionStatusEnum].enumValues.enumValue[await_w].alias</alias>
+            <userDefined>true</userDefined>
+            <value>await_w</value>
+        </enumValue>
     </enumValues>
     <resource>
         <rs key="bizEnum[com.kingdee.eas.custom.shuiyou.task.ExecutionStatusEnum].alias">
@@ -52,6 +58,12 @@
             <lang locale="zh_HK" value="繼續" />
             <lang locale="zh_TW" value="繼續" />
         </rs>
+        <rs key="bizEnum[com.kingdee.eas.custom.shuiyou.task.ExecutionStatusEnum].enumValues.enumValue[await_w].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="等待" />
+            <lang locale="zh_HK" value="等待" />
+            <lang locale="zh_TW" value="等待" />
+        </rs>
         <rs key="bizEnum[com.kingdee.eas.custom.shuiyou.task.ExecutionStatusEnum].enumValues.enumValue[error].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="出错" />

deployed_metas/entity_pkmapping.properties

@@ -1,10 +1,10 @@
-#Entity pk <==> bosType
-#Wed Aug 28 10:39:08 CST 2024
+#
+#Tue Sep 10 16:36:05 CST 2024
 967FE659=com.kingdee.eas.custom.shuiyou.registration.app.RegistrationInfo
-C058496F=com.kingdee.eas.custom.shuiyou.interfaceiog.app.LogInfo
-CDEBE54F=com.kingdee.eas.custom.shuiyou.interfacelog.app.LogLnfo
+5AEE9497=com.kingdee.eas.custom.shuiyou.base.app.URLConfig
+
 CDEA8832=com.kingdee.eas.custom.shuiyou.interfacelog.app.LogInfo
 CE95928B=com.kingdee.eas.custom.shuiyou.task.app.Task
-288CE569=com.kingdee.eas.custom.shuiyou.task.app.TaskRequestParam
 ECB296C1=com.kingdee.eas.custom.shuiyou.task.app.TaskRequestResult
-
+288CE569=com.kingdee.eas.custom.shuiyou.task.app.TaskRequestParam
+CDEBE54F=com.kingdee.eas.custom.shuiyou.interfacelog.app.LogLnfo

deployed_metas/facade_pkmapping.properties

@@ -1,4 +1,6 @@
-#Facade pk <==> bosType
-#Tue Aug 27 15:51:23 CST 2024
+#
+#Tue Sep 10 16:36:05 CST 2024
+83A301BC=com.kingdee.eas.custom.shuiyou.incomeTax.TaxSpeAddDedReportExFacade
 004655B1=com.kingdee.eas.custom.shuiyou.task.TaskExecuteFacade
 A069618E=com.kingdee.eas.custom.shuiyou.uitls.SYUtilsFacade
+7E4D44FA=com.kingdee.eas.custom.shuiyou.incomeTax.TaxDirectDeductionExFacade

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

@@ -20,7 +20,6 @@ import com.kingdee.eas.framework.LineResult;
 import com.kingdee.eas.framework.exception.EASMultiException;
 import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
 
-import com.kingdee.eas.custom.shuiyou.task.MessageResult;
 import java.util.Map;
 import java.lang.String;
 
@@ -37,24 +36,24 @@ public abstract class AbstractTaxSpeAddDedReportExFacadeControllerBean extends A
         return new BOSObjectType("83A301BC");
     }
 
-    public MessageResult report(Context ctx, Map paramMap) throws BOSException
+    public String report(Context ctx, Map paramMap) throws BOSException
     {
         try {
             ServiceContext svcCtx = createServiceContext(new MetaDataPK("8f35e5f2-4d16-471e-b12e-bf40f58d2657"), new Object[]{ctx, paramMap});
             invokeServiceBefore(svcCtx);
             if(!svcCtx.invokeBreak()) {
-            MessageResult retValue = (MessageResult)_report(ctx, paramMap);
+            String retValue = (String)_report(ctx, paramMap);
             svcCtx.setMethodReturnValue(retValue);
             }
             invokeServiceAfter(svcCtx);
-            return (MessageResult)svcCtx.getMethodReturnValue();
+            return (String)svcCtx.getMethodReturnValue();
         } catch (BOSException ex) {
             throw ex;
         } finally {
             super.cleanUpServiceState();
         }
     }
-    protected MessageResult _report(Context ctx, Map paramMap) throws BOSException
+    protected String _report(Context ctx, Map paramMap) throws BOSException
     {    	
         return null;
     }

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

@@ -7,7 +7,6 @@ import com.kingdee.bos.util.*;
 import com.kingdee.bos.Context;
 
 import com.kingdee.bos.Context;
-import com.kingdee.eas.custom.shuiyou.task.MessageResult;
 import com.kingdee.bos.BOSException;
 import java.util.Map;
 import java.lang.String;
@@ -16,6 +15,6 @@ import com.kingdee.bos.util.*;
 
 public interface ITaxSpeAddDedReportExFacade extends IBizCtrl
 {
-    public MessageResult report(Map paramMap) throws BOSException;
+    public String report(Map paramMap) throws BOSException;
     public void save(String taskId, String result) throws BOSException;
 }

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

@@ -8,7 +8,6 @@ import com.kingdee.bos.orm.template.ORMObject;
 
 import com.kingdee.eas.custom.shuiyou.incomeTax.*;
 import com.kingdee.bos.Context;
-import com.kingdee.eas.custom.shuiyou.task.MessageResult;
 import com.kingdee.bos.BOSException;
 import java.util.Map;
 import java.lang.String;
@@ -40,7 +39,7 @@ public class TaxSpeAddDedReportExFacade extends AbstractBizCtrl implements ITaxS
      *@param paramMap ²ÎÊý
      *@return
      */
-    public MessageResult report(Map paramMap) throws BOSException
+    public String report(Map paramMap) throws BOSException
     {
         try {
             return getController().report(getContext(), paramMap);

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

@@ -7,7 +7,6 @@ import com.kingdee.bos.util.*;
 import com.kingdee.bos.Context;
 
 import com.kingdee.bos.Context;
-import com.kingdee.eas.custom.shuiyou.task.MessageResult;
 import com.kingdee.bos.BOSException;
 import java.util.Map;
 import java.lang.String;
@@ -19,6 +18,6 @@ import com.kingdee.bos.framework.ejb.BizController;
 
 public interface TaxSpeAddDedReportExFacadeController extends BizController
 {
-    public MessageResult report(Context ctx, Map paramMap) throws BOSException, RemoteException;
+    public String report(Context ctx, Map paramMap) throws BOSException, RemoteException;
     public void save(Context ctx, String taskId, String result) throws BOSException, RemoteException;
 }

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

@@ -1,6 +1,7 @@
 package com.kingdee.eas.custom.shuiyou.incomeTax;
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.kingdee.bos.dao.IObjectPK;
 import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
@@ -12,11 +13,11 @@ import com.kingdee.eas.custom.shuiyou.six.osf.vo.SixTPersonInfo;
 import com.kingdee.eas.custom.shuiyou.six.osf.vo.SpecialAmountInfo;
 
 import com.kingdee.eas.custom.shuiyou.task.MessageResult;
+import com.kingdee.eas.custom.shuiyou.task.TaskCatalogEnum;
 import com.kingdee.eas.custom.shuiyou.task.TaskFactory;
 import com.kingdee.eas.custom.shuiyou.task.TaskInfo;
 import com.kingdee.eas.custom.shuiyou.uitls.ISYUtilsFacade;
 import com.kingdee.eas.custom.shuiyou.uitls.SYUtilsFacadeFactory;
-import com.kingdee.eas.custom.shuiyou.uitls.URLConfigEnum;
 import com.kingdee.eas.framework.CoreBaseCollection;
 import com.kingdee.eas.util.app.DbUtil;
 import com.kingdee.jdbc.rowset.IRowSet;
@@ -35,10 +36,9 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.lang.String;
 
-public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddDedReportExFacadeControllerBean
-{
+public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddDedReportExFacadeControllerBean {
     private static Logger logger =
-        Logger.getLogger("com.kingdee.eas.custom.shuiyou.incomeTax.TaxSpeAddDedReportExFacadeControllerBean");
+            Logger.getLogger("com.kingdee.eas.custom.shuiyou.incomeTax.TaxSpeAddDedReportExFacadeControllerBean");
 
     private static final long serialVersionUID = 1L;
 
@@ -58,29 +58,29 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
             return !paramMap.containsKey("TaxPersonRecordEntryIDS");
         }
     }
+
     @Override
-    protected MessageResult _report(Context ctx, Map paramMap) throws BOSException {
+    protected String _report(Context ctx, Map paramMap) throws BOSException {
 
-        logger.error("_report:"+paramMap);
+        logger.error("_report:" + paramMap);
         if (this.checkParams(paramMap)) {
             throw new BOSException("专项附加扣除申报服务参数缺失，请检查参数");
         } else {
-            //前置任务
-            String RELAYTASK = (String)paramMap.get("RELAYTASK");
-            String taxUnitID = (String)paramMap.get("TAXUNITID");
-            String initIds = (String)paramMap.get("initIds");
-            String period = (String)paramMap.get("PERIOD");
-            String taxPersonRecordEntryIDS = (String)paramMap.get("TaxPersonRecordEntryIDS");
+            String RELAYTASK = (String) paramMap.get("RELAYTASK");
+            String taxUnitID = (String) paramMap.get("TAXUNITID");
+            String initIds = (String) paramMap.get("initIds");
+            String period = (String) paramMap.get("PERIOD");
+            String taxPersonRecordEntryIDS = (String) paramMap.get("TaxPersonRecordEntryIDS");
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
             TaxUnitCollection taxUnitCollection = TaxUnitFactory.getLocalInstance(ctx).getTaxUnitCollection("select id,name,number,taxNumber,areaCode,regNumber,declPassword,realPassword,isAutoDeduct where id = '" + taxUnitID + "'");
-            logger.error("taxUnitCollection:"+taxUnitCollection);
+            logger.error("taxUnitCollection:" + taxUnitCollection);
             if (null != taxUnitCollection && taxUnitCollection.size() != 0) {
                 TaxUnitInfo taxUnitInfo = taxUnitCollection.get(0);
                 IsAllowedQuoted isAutoDeduct = taxUnitInfo.getIsAutoDeduct();
                 if (0 == isAutoDeduct.getValue()) {
                     return null;
                 } else {
-                    logger.error("period:"+period);
+                    logger.error("period:" + period);
                     period = period.replace("-", "");
                     int periodYear = Integer.parseInt(period.substring(0, 4));
                     int periodMonth = Integer.parseInt(period.substring(4, 6));
@@ -144,14 +144,14 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
                     ArrayList updateParamList = new ArrayList();
                     ISYUtilsFacade facade = SYUtilsFacadeFactory.getLocalInstance(ctx);
                     try {
-                        logger.error("_report:"+checkSQL);
+                        logger.error("_report:" + checkSQL);
                         IRowSet rowSet = DbUtil.executeQuery(ctx, checkSQL.toString());
                         List<SixTPersonInfo> rylb = new ArrayList();
                         CoreBaseCollection recordCollection = new CoreBaseCollection();
                         HashSet reportPersonSet = new HashSet();
 
-                        while(true) {
-                            while(true) {
+                        while (true) {
+                            while (true) {
                                 if (!rowSet.next()) {
                                     if (rylb.isEmpty()) {
                                         return null;
@@ -189,33 +189,31 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
                                     Map<String, Object> dataMap = new HashMap();
                                     dataMap.put("rylb", rylb);
                                     paramMap.put("data", dataMap);
-                                    Map<String,Object> config = facade.getConfig();
-                                    String url = config.get("ip")+ URLConfigEnum.QUERYPREDEDUCT_VALUE;
-                                    String result = facade.post(url, JSONUtil.toJsonStr(specialAmountInfo));
-//                                    if
-//                                    facade.addTask("GetQuerySpecialAmountFeedback",);
-//                                    TaskInfo taxCalTaskInfo = TaskFactory.getLocalInstance(ctx).getTaskInfo(new ObjectUuidPK(tastId));
-//
-//                                    int i = 0;
-//
-//                                    for(int size = recordCollection.size(); i < size; ++i) {
-//                                        TaxSpeAddDedRecordInfo taxSpeAddDedRecordInfo = (TaxSpeAddDedRecordInfo)recordCollection.get(i);
-//                                        taxSpeAddDedRecordInfo.put("task",taxCalTaskInfo);
-//                                    }
-//
-//                                    Object[] objects;
-//                                    for(Iterator i$ = updateParamList.iterator(); i$.hasNext(); objects[0] = tastId) {
-//                                        objects = (Object[])i$.next();
-//                                    }
-//
-//                                    TaxSpeAddDedRecordFactory.getLocalInstance(ctx).saveBatchData(recordCollection);
-//                                    if (updateParamList.size() > 0) {
-//                                        DbUtil.executeBatch(ctx, updateRecordSQL, updateParamList);
-//                                    }
-//
-//                                    List<IObjectPK> arrayList = new ArrayList();
-//                                    arrayList.add(new ObjectUuidPK(tastId));
-                                    return MessageResult.SUCCESS();
+
+                                    String tastId = facade.addTask("querySpecialAmountService", JSONUtil.toJsonStr(specialAmountInfo), TaskCatalogEnum.GETTRIAGREEMENT, RELAYTASK);
+
+                                    TaskInfo taxCalTaskInfo = TaskFactory.getLocalInstance(ctx).getTaskInfo(new ObjectUuidPK(tastId));
+
+                                    int i = 0;
+
+                                    for (int size = recordCollection.size(); i < size; ++i) {
+                                        TaxSpeAddDedRecordInfo taxSpeAddDedRecordInfo = (TaxSpeAddDedRecordInfo) recordCollection.get(i);
+                                        taxSpeAddDedRecordInfo.put("task", taxCalTaskInfo);
+                                    }
+
+                                    Object[] objects;
+                                    for (Iterator i$ = updateParamList.iterator(); i$.hasNext(); objects[0] = tastId) {
+                                        objects = (Object[]) i$.next();
+                                    }
+
+                                    TaxSpeAddDedRecordFactory.getLocalInstance(ctx).saveBatchData(recordCollection);
+                                    if (updateParamList.size() > 0) {
+                                        DbUtil.executeBatch(ctx, updateRecordSQL, updateParamList);
+                                    }
+
+                                    List<IObjectPK> arrayList = new ArrayList();
+                                    arrayList.add(new ObjectUuidPK(tastId));
+                                    return tastId;
                                 }
 
                                 String recordId = rowSet.getString("RECORDID");
@@ -286,66 +284,66 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
                                 sixTPersonInfo.setGh(personNumber);
                                 sixTPersonInfo.setSkssq(period);
                                 sixTPersonInfo.setLxdh(phoneNumber);
-                                sixTPersonInfo.setNsrzt(("1".equals(personStatus)? PersonStatusEnum.Normal.getAlias():PersonStatusEnum.NotNormal.getAlias()));
-                                if(StrUtil.isNotBlank(employedType)) {
+                                sixTPersonInfo.setNsrzt(("1".equals(personStatus) ? PersonStatusEnum.Normal.getAlias() : PersonStatusEnum.NotNormal.getAlias()));
+                                if (StrUtil.isNotBlank(employedType)) {
                                     sixTPersonInfo.setSfgy(EmployedTypeEnum.getEnum(employedType).getAlias());
-                                }else{
+                                } else {
                                     sixTPersonInfo.setSfgy(null);
                                 }
-                                if(null!=employeddate){
+                                if (null != employeddate) {
                                     sixTPersonInfo.setRzsgrq(format.format(employeddate));
-                                }else {
+                                } else {
                                     sixTPersonInfo.setRzsgrq(format.format(new Date()));
                                 }
-                                if(null!=gender) {
+                                if (null != gender) {
                                     sixTPersonInfo.setXb(Genders.getEnum(Integer.parseInt(gender)).getAlias());
-                                }else{
+                                } else {
                                     sixTPersonInfo.setXb(Genders.Male.getAlias());
                                 }
 
                                 sixTPersonInfo.setCsny(format.format(birthday));
 
-                                if(StrUtil.isNotBlank(nationality)){
+                                if (StrUtil.isNotBlank(nationality)) {
                                     sixTPersonInfo.setGj(nationality);
-                                }else{
+                                } else {
                                     sixTPersonInfo.setGj("中国");
                                 }
 
-                                sixTPersonInfo.setRydq("0".equals(isoversea)?"境内":"境外");
-                                if(null!=departuredate) {
+                                sixTPersonInfo.setRydq("0".equals(isoversea) ? "境内" : "境外");
+                                if (null != departuredate) {
                                     sixTPersonInfo.setLzrq(format.format(departuredate));
-                                }else {
+                                } else {
                                     sixTPersonInfo.setLzrq("");
                                 }
 
-                                if(StrUtil.isNotBlank(investmenttotal)){
+                                if (StrUtil.isNotBlank(investmenttotal)) {
                                     sixTPersonInfo.setGrgbze(investmenttotal);
-                                }else {
+                                } else {
                                     sixTPersonInfo.setGrgbze(null);
                                 }
-                                if(StrUtil.isNotBlank(investmentrate)){
+                                if (StrUtil.isNotBlank(investmentrate)) {
                                     sixTPersonInfo.setGrgbbl(investmentrate);
-                                }else {
+                                } else {
                                     sixTPersonInfo.setGrgbbl(null);
                                 }
-                                if(StrUtil.isNotBlank(isdisability)) {
-                                    sixTPersonInfo.setSfcj("0".equals(isdisability)?"否":"是");
-                                }else {
+                                if (StrUtil.isNotBlank(isdisability)) {
+                                    sixTPersonInfo.setSfcj("0".equals(isdisability) ? "否" : "是");
+                                } else {
                                     sixTPersonInfo.setSfcj(null);
                                 }
-                                if(StrUtil.isNotBlank(ishero)) {
-                                    sixTPersonInfo.setSfls("0".equals(ishero)?"否":"是");
-                                }else {
+                                if (StrUtil.isNotBlank(ishero)) {
+                                    sixTPersonInfo.setSfls("0".equals(ishero) ? "否" : "是");
+                                } else {
                                     sixTPersonInfo.setSfls(null);
                                 }
-                                if(StrUtil.isNotBlank(isold)) {
-                                    sixTPersonInfo.setSfgl("0".equals(isold)?"否":"是");
-                                }else {
+                                if (StrUtil.isNotBlank(isold)) {
+                                    sixTPersonInfo.setSfgl("0".equals(isold) ? "否" : "是");
+                                } else {
                                     sixTPersonInfo.setSfgl(null);
                                 }
-                                if(StrUtil.isNotBlank(deductfees)) {
+                                if (StrUtil.isNotBlank(deductfees)) {
                                     sixTPersonInfo.setSfzdw(DeductFeesEnum.getEnum(deductfees).getAlias());
-                                }else {
+                                } else {
                                     sixTPersonInfo.setSfzdw(null);
                                 }
 
@@ -353,9 +351,9 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
                                 sixTPersonInfo.setLszh(herocardnumber);
                                 sixTPersonInfo.setDzyx(email);
                                 sixTPersonInfo.setXl(edulevel);
-                                if(StrUtil.isNotBlank(position)) {
+                                if (StrUtil.isNotBlank(position)) {
                                     sixTPersonInfo.setZw(PositionTypeEnum.getEnum(position).getAlias());
-                                }else{
+                                } else {
                                     sixTPersonInfo.setZw(null);
                                 }
                                 sixTPersonInfo.setKhyh(bankname);
@@ -374,10 +372,10 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
                                 sixTPersonInfo.setBz(null);
                                 sixTPersonInfo.setCsd(birthplace);
                                 sixTPersonInfo.setSssx(taxreason);
-                                if(null!=entrydate){
+                                if (null != entrydate) {
                                     sixTPersonInfo.setScrjsj(format.format(entrydate));
                                 }
-                                if(null!=leavedate){
+                                if (null != leavedate) {
                                     sixTPersonInfo.setYjljsj(format.format(leavedate));
                                 }
 
@@ -416,7 +414,7 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
     protected void _save(Context ctx, String taskID, String result) throws BOSException {
         super._save(ctx, taskID, result);
         Map<String, Object> bodyMap = (Map) JSONUtils.convertJsonToObject(ctx, result, Map.class);
-        String code = (String)bodyMap.get("code");
+        String code = (String) bodyMap.get("code");
         if ("00000000".equals(code)) {
             String updateSql = "update T_HR_STAXSPEADDDEDRECORD set FSTATE = 40 where CFTaskID = '" + taskID + "'";
             DbUtil.execute(ctx, updateSql);

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

@@ -17,11 +17,13 @@ public class ExecutionStatusEnum extends StringEnum
     public static final String AGAIN_VALUE = "again";//alias=¼ÌÐø
     public static final String FAILED_VALUE = "failed";//alias=ʧ°Ü
     public static final String ERROR_VALUE = "error";//alias=³ö´í
+    public static final String AWAIT_W_VALUE = "await_w";//alias=µÈ´ý
 
     public static final ExecutionStatusEnum success = new ExecutionStatusEnum("success", SUCCESS_VALUE);
     public static final ExecutionStatusEnum again = new ExecutionStatusEnum("again", AGAIN_VALUE);
     public static final ExecutionStatusEnum failed = new ExecutionStatusEnum("failed", FAILED_VALUE);
     public static final ExecutionStatusEnum error = new ExecutionStatusEnum("error", ERROR_VALUE);
+    public static final ExecutionStatusEnum await_w = new ExecutionStatusEnum("await_w", AWAIT_W_VALUE);
 
     /**
      * construct function

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

@@ -2,3 +2,4 @@ success=\u6210\u529F
 again=\u7EE7\u7EED
 failed=\u5931\u8D25
 error=\u51FA\u9519
+await_w=\u7B49\u5F85

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

@@ -2,3 +2,4 @@ success=
 again=
 failed=
 error=
+await_w=

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

@@ -2,3 +2,4 @@ success=\u6210\u529F
 again=\u7EE7\u7EED
 failed=\u5931\u8D25
 error=\u51FA\u9519
+await_w=\u7B49\u5F85

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

@@ -2,3 +2,4 @@ success=\u6210\u529F
 again=\u7E7C\u7E8C
 failed=\u5931\u6557
 error=\u51FA\u932F
+await_w=\u7B49\u5F85

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

@@ -47,6 +47,17 @@ public class MessageResult<T> {
     public static MessageResult AGAIN(String msg){
         return new MessageResult(msg,ExecutionStatusEnum.again);
     }
+    /**
+     * µÈ´ý
+     * @return
+     */
+    public static MessageResult AWAIT_W(){
+        ExecutionStatusEnum await_w = ExecutionStatusEnum.await_w;
+        return new MessageResult(await_w.getAlias(),await_w);
+    }
+    public static MessageResult AWAIT_W(String msg){
+        return new MessageResult(msg,ExecutionStatusEnum.await_w);
+    }
 
     /**
      * ʧ°Ü

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

@@ -131,16 +131,17 @@ public class TaskInfo extends AbstractTaskInfo implements Serializable, Task
             Map<String,Object> paramOsf = Maps.newHashMap();
             Optional<TaskRequestParamInfo> requestParamInfo = Optional.ofNullable(this.getRequestParam());
             String param = requestParamInfo.orElse((new TaskRequestParamInfo())).getParamContent();
-            //拼接参数
-            if(StrUtil.isNotBlank(param)){
-                JSONObject jsonObject = JSONUtil.parseObj(param);
-                for(Map.Entry<String,Object> st : jsonObject.entrySet()){
-                    Optional<Object> op = Optional.ofNullable(st.getValue());
-                    paramOsf.put(st.getKey(),op.orElse("").toString());
-                }
-            }
+//            //拼接参数
+//            if(StrUtil.isNotBlank(param)){
+//                JSONObject jsonObject = JSONUtil.parseObj(param);
+//                for(Map.Entry<String,Object> st : jsonObject.entrySet()){
+//                    Optional<Object> op = Optional.ofNullable(st.getValue());
+//                    paramOsf.put(st.getKey(),op.orElse("").toString());
+//                }
+//            }
             this.setCalTime(new Date());
             paramOsf.put("this_taskId",this.getId().toString());
+            paramOsf.put("paramData",param);
             logger.info("任务："+this.getId().toString()+",请求地址："+this.getUrl()+",请求参数："+param+"。");
             //调用业务实现
             MessageResult messageResult = this.callBackOSF(paramOsf);
@@ -160,13 +161,23 @@ public class TaskInfo extends AbstractTaskInfo implements Serializable, Task
                 TaskRequestResultInfo requestResult = resultInfo.orElse(new TaskRequestResultInfo());
                 requestResult.setResultContent(requestResult.getResultContent()+";"+messageResult.getMsg());
                 requestResult.setTask(this);
+            }else if (ExecutionStatusEnum.await_w.equals(messageResult.getStatus())){
+                //设置等待,会停止这个任务。TaskStateEnum状态需要后续子任务更新。
+                // 即在任务中增加新的子任务，又需要等待子任务执行完成，才能继续的情况。
+                Optional<TaskRequestResultInfo> resultInfo = Optional.ofNullable(this.getRequestResult());
+                TaskRequestResultInfo requestResult = resultInfo.orElse(new TaskRequestResultInfo());
+                requestResult.setResultContent(requestResult.getResultContent()+";"+messageResult.getMsg());
+                requestResult.setTask(this);
+                this.setRequestState(RequestStateEnum.Successful);
+                this.setState(TaskStateEnum.RUNNING);
+                this.stop();
             }else {
                 //设置失败
                 Optional<TaskRequestResultInfo> resultInfo = Optional.ofNullable(this.getRequestResult());
                 TaskRequestResultInfo requestResult = resultInfo.orElse(new TaskRequestResultInfo());
                 requestResult.setResultContent(requestResult.getResultContent()+";"+messageResult.getMsg());
                 requestResult.setTask(this);
-                //设置失败
+
                 this.setRequestResult(requestResult);
                 this.setRequestState(RequestStateEnum.Failed);
                 this.setState(TaskStateEnum.FAIDED);

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

@@ -1,22 +1,12 @@
 package com.kingdee.eas.custom.shuiyou.uitls;
 
 import com.kingdee.bos.BOSException;
-//import com.kingdee.bos.metadata.*;
-import com.kingdee.bos.framework.*;
-import com.kingdee.bos.util.*;
 import com.kingdee.bos.Context;
-
-import com.kingdee.bos.Context;
-import com.kingdee.bos.BOSException;
 import java.util.Map;
 import com.kingdee.eas.custom.shuiyou.interfacelog.LogInfoInfo;
-import com.kingdee.eas.custom.shuiyou.interfaceiog.LogInfoInfo;
 import java.lang.String;
 import com.kingdee.eas.custom.shuiyou.task.TaskCatalogEnum;
-import com.kingdee.bos.framework.*;
 import cn.hutool.core.lang.Snowflake;
-import com.kingdee.bos.util.*;
-
 import java.rmi.RemoteException;
 import com.kingdee.bos.framework.ejb.BizController;