专项推送提交

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

@@ -27,29 +27,11 @@
             <userDefinedLogic />
             <parameters>
                 <parameter>
-                    <name>entryIDs</name>
-                    <alias>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[entryIDs].alias</alias>
-                    <description>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[entryIDs].description</description>
+                    <name>paramMap</name>
+                    <alias>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[paramMap].alias</alias>
+                    <description>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[paramMap].description</description>
                     <direction>in</direction>
-                    <dataType>String</dataType>
-                    <metadataRef />
-                    <userDefined>true</userDefined>
-                </parameter>
-                <parameter>
-                    <name>taxPeriodDate</name>
-                    <alias>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[taxPeriodDate].alias</alias>
-                    <description>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[taxPeriodDate].description</description>
-                    <direction>in</direction>
-                    <dataType>String</dataType>
-                    <metadataRef />
-                    <userDefined>true</userDefined>
-                </parameter>
-                <parameter>
-                    <name>filter</name>
-                    <alias>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[filter].alias</alias>
-                    <description>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[filter].description</description>
-                    <direction>in</direction>
-                    <dataType>String</dataType>
+                    <dataType>java.util.Map</dataType>
                     <metadataRef />
                     <userDefined>true</userDefined>
                 </parameter>
@@ -71,29 +53,11 @@
             <userDefinedLogic />
             <parameters>
                 <parameter>
-                    <name>taxPeriodDate</name>
-                    <alias>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[taxPeriodDate].alias</alias>
-                    <description>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[taxPeriodDate].description</description>
-                    <direction>in</direction>
-                    <dataType>String</dataType>
-                    <metadataRef />
-                    <userDefined>true</userDefined>
-                </parameter>
-                <parameter>
-                    <name>ids</name>
-                    <alias>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[ids].alias</alias>
-                    <description>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[ids].description</description>
+                    <name>paramMap</name>
+                    <alias>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[paramMap].alias</alias>
+                    <description>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[paramMap].description</description>
                     <direction>in</direction>
-                    <dataType>String</dataType>
-                    <metadataRef />
-                    <userDefined>true</userDefined>
-                </parameter>
-                <parameter>
-                    <name>filter</name>
-                    <alias>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[filter].alias</alias>
-                    <description>facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[filter].description</description>
-                    <direction>in</direction>
-                    <dataType>String</dataType>
+                    <dataType>java.util.Map</dataType>
                     <metadataRef />
                     <userDefined>true</userDefined>
                 </parameter>
@@ -130,35 +94,13 @@
             <lang locale="zh_CN" value="" />
             <lang locale="zh_TW" value="null" />
         </rs>
-        <rs key="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[filter].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="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[filter].description">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="" />
-            <lang locale="zh_TW" value="null" />
-        </rs>
-        <rs key="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[ids].alias">
+        <rs key="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[paramMap].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="id列表" />
-            <lang locale="zh_HK" value="id列表" />
-            <lang locale="zh_TW" value="id列表" />
+            <lang locale="zh_CN" value="参数" />
+            <lang locale="zh_HK" value="參數" />
+            <lang locale="zh_TW" value="參數" />
         </rs>
-        <rs key="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[ids].description">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="" />
-            <lang locale="zh_TW" value="null" />
-        </rs>
-        <rs key="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[taxPeriodDate].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="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[taxPeriodDate].description">
+        <rs key="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[pensionReport].parameters.parameter[paramMap].description">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="" />
             <lang locale="zh_TW" value="null" />
@@ -175,35 +117,13 @@
             <lang locale="zh_HK" value="[description][%description][invokedemo][%invokedemo][returndesc]任務i的集合[%returndesc]" />
             <lang locale="zh_TW" value="[description][%description][invokedemo][%invokedemo][returndesc]任務i的集合[%returndesc]" />
         </rs>
-        <rs key="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[entryIDs].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="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[entryIDs].description">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="" />
-            <lang locale="zh_TW" value="null" />
-        </rs>
-        <rs key="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[filter].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="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[filter].description">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="" />
-            <lang locale="zh_TW" value="null" />
-        </rs>
-        <rs key="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[taxPeriodDate].alias">
+        <rs key="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[paramMap].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="所属周期" />
-            <lang locale="zh_HK" value="所屬週期" />
-            <lang locale="zh_TW" value="所屬週期" />
+            <lang locale="zh_CN" value="参数" />
+            <lang locale="zh_HK" value="參數" />
+            <lang locale="zh_TW" value="參數" />
         </rs>
-        <rs key="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[taxPeriodDate].description">
+        <rs key="facade[com.kingdee.eas.custom.shuiyou.incomeTax.TaxPersonReportExFacade].methods.method[report].parameters.parameter[paramMap].description">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="" />
             <lang locale="zh_TW" value="null" />

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

@@ -146,6 +146,18 @@
             <userDefined>true</userDefined>
             <value>111</value>
         </enumValue>
+        <enumValue>
+            <name>PERSONAL_PENSION</name>
+            <alias>bizEnum[com.kingdee.eas.custom.shuiyou.task.TaskCatalogEnum].enumValues.enumValue[PERSONAL_PENSION].alias</alias>
+            <userDefined>true</userDefined>
+            <value>120</value>
+        </enumValue>
+        <enumValue>
+            <name>PERSONAL_PENSION_GET</name>
+            <alias>bizEnum[com.kingdee.eas.custom.shuiyou.task.TaskCatalogEnum].enumValues.enumValue[PERSONAL_PENSION_GET].alias</alias>
+            <userDefined>true</userDefined>
+            <value>121</value>
+        </enumValue>
     </enumValues>
     <resource>
         <rs key="bizEnum[com.kingdee.eas.custom.shuiyou.task.TaskCatalogEnum].alias">
@@ -214,6 +226,18 @@
             <lang locale="zh_HK" value="三方協議獲取查詢" />
             <lang locale="zh_TW" value="三方協議獲取查詢" />
         </rs>
+        <rs key="bizEnum[com.kingdee.eas.custom.shuiyou.task.TaskCatalogEnum].enumValues.enumValue[PERSONAL_PENSION].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.TaskCatalogEnum].enumValues.enumValue[PERSONAL_PENSION_GET].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.TaskCatalogEnum].enumValues.enumValue[PERSON].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="人员报送" />

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

@@ -325,6 +325,8 @@ public class TaxDirectDeductionExFacadeControllerBean extends AbstractTaxDirectD
                         CmpDistributedLockUtils.unlock(ctx, prefix, resource);
                     }
                 }
+            }else {
+                throw new BOSException(result);
             }
         }else{
             throw new BOSException(result);

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

@@ -341,6 +341,7 @@ public class TaxPersonReportExFacadeControllerBean extends AbstractTaxPersonRepo
                         //校验 请求是否成功
                         JSONObject head = postJSON.getJSONObject("head");
                         String code = (String) head.get("code");
+                        String msg = (String) head.get("msg");
                         if ("00000000".equals(code)) {
                             JSONObject body = postJSON.getJSONObject("body");
 
@@ -354,9 +355,11 @@ public class TaxPersonReportExFacadeControllerBean extends AbstractTaxPersonRepo
                             DbUtil.executeBatch(ctx, recordSql, recordParamsList);
                             logger.info("--------->>>>>更新银行卡号状态：recordSql:" + recordSql + "------>>>>recordParamsList:" + recordParamsList);
                             arrayList.add(taskId);
+                        }else {
+                            throw new BOSException(msg);
                         }
                     }else {
-                        throw new BOSException("");
+                        throw new BOSException("参数异常");
                     }
                 }
                 return arrayList;

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

@@ -50,11 +50,11 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
     private boolean isFbSubmit;
 
     private boolean checkParams(Map<String, Object> paramMap) {
-        if (!paramMap.containsKey("accept_id") && !paramMap.containsKey("RELAYTASK")) {
-            return true;
-        } else {
+//        if (!paramMap.containsKey("accept_id") && !paramMap.containsKey("RELAYTASK")) {
+//            return true;
+//        } else {
             return !paramMap.containsKey("TaxPersonRecordEntryIDS");
-        }
+//        }
     }
 
     @Override
@@ -62,7 +62,7 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
 
         logger.error("_report:" + paramMap);
         if (this.checkParams(paramMap)) {
-            throw new BOSException("涓撻」闄勫姞鎵ｉ櫎鐢虫姤鏈嶅姟鍙傛暟缂哄け锛岃�妫€鏌ュ弬鏁�");
+            throw new BOSException("专项附加扣除申报服务参数缺失，请检查参数");
         } else {
             String RELAYTASK = (String) paramMap.get("RELAYTASK");
             String taxUnitID = (String) paramMap.get("TAXUNITID");
@@ -182,7 +182,7 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
                                     paramMap.put("djxhid", taxUnitInfo.getRegNumber());
                                     paramMap.put("smmm", Base64Utils.decode(taxUnitInfo.getRealPassword()));
                                     paramMap.put("sbmm", Base64Utils.decode(taxUnitInfo.getDeclPassword()));
-                                    paramMap.put("xzzxxx", "鏄�");
+                                    paramMap.put("xzzxxx", "是");
 
                                     Map<String, Object> dataMap = new HashMap();
                                     dataMap.put("rylb", rylb);
@@ -209,8 +209,8 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
                                         DbUtil.executeBatch(ctx, updateRecordSQL, updateParamList);
                                     }
 
-                                    List<IObjectPK> arrayList = new ArrayList();
-                                    arrayList.add(new ObjectUuidPK(tastId));
+                                    List<String> arrayList = new ArrayList();
+                                    arrayList.add(tastId);
                                     return arrayList;
                                 }
 
@@ -304,10 +304,10 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
                                 if (StrUtil.isNotBlank(nationality)) {
                                     sixTPersonInfo.setGj(nationality);
                                 } else {
-                                    sixTPersonInfo.setGj("涓�浗");
+                                    sixTPersonInfo.setGj("中国");
                                 }
 
-                                sixTPersonInfo.setRydq("0".equals(isoversea) ? "澧冨唴" : "澧冨�");
+                                sixTPersonInfo.setRydq("0".equals(isoversea) ? "境内" : "境外");
                                 if (null != departuredate) {
                                     sixTPersonInfo.setLzrq(format.format(departuredate));
                                 } else {
@@ -325,17 +325,17 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
                                     sixTPersonInfo.setGrgbbl(null);
                                 }
                                 if (StrUtil.isNotBlank(isdisability)) {
-                                    sixTPersonInfo.setSfcj("0".equals(isdisability) ? "鍚�" : "鏄�");
+                                    sixTPersonInfo.setSfcj("0".equals(isdisability) ? "否" : "是");
                                 } else {
                                     sixTPersonInfo.setSfcj(null);
                                 }
                                 if (StrUtil.isNotBlank(ishero)) {
-                                    sixTPersonInfo.setSfls("0".equals(ishero) ? "鍚�" : "鏄�");
+                                    sixTPersonInfo.setSfls("0".equals(ishero) ? "否" : "是");
                                 } else {
                                     sixTPersonInfo.setSfls(null);
                                 }
                                 if (StrUtil.isNotBlank(isold)) {
-                                    sixTPersonInfo.setSfgl("0".equals(isold) ? "鍚�" : "鏄�");
+                                    sixTPersonInfo.setSfgl("0".equals(isold) ? "否" : "是");
                                 } else {
                                     sixTPersonInfo.setSfgl(null);
                                 }
@@ -399,11 +399,11 @@ public class TaxSpeAddDedReportExFacadeControllerBean extends AbstractTaxSpeAddD
                         }
                     } catch (Exception var27) {
                         logger.error(var27.getMessage(), var27);
-                        throw new BOSException("鐢熸垚椤归檮鍔犳墸闄ょ敵鎶ユ湇鍔℃椂锛屽垽鏂�槸鍚﹀瓨鍦ㄦ湭涓嬭浇鐨勪笓椤归檮鍔犳墸闄や俊鎭�暟鎹�嚭閿�", var27);
+                        throw new BOSException("生成项附加扣除申报服务时，判断是否存在未下载的专项附加扣除信息数据出错", var27);
                     }
                 }
             } else {
-                throw new BOSException("鐢熸垚椤归檮鍔犳墸闄ょ敵鎶ユ湇鍔℃椂锛屾湭鑾峰彇鍒板�搴旂殑绾崇◣鍗曚綅鏁版嵁锛岃�鑱旂郴绠＄悊鍛樻�鏌ユ暟鎹�槸鍚﹁�鍒犻櫎");
+                throw new BOSException("生成项附加扣除申报服务时，未获取到对应的纳税单位数据，请联系管理员检查数据是否被删除");
             }
         }
     }

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

@@ -201,7 +201,7 @@ public class TaxCalFacadeControllerBean extends AbstractTaxCalFacadeControllerBe
                         //人员报税信息报送_人员信息报送
                         List relayTaskIDList = TaxPersonReportExFacadeFactory.getLocalInstance(ctx)
                                 .report(paramMap);
-                        if (null != relayTaskIDList && relayTaskIDList.size() == 1) {
+                        if (null != relayTaskIDList && relayTaskIDList.size() > 0) {
                             String relayTaskID = (String) relayTaskIDList.get(0);
                             paramMap.put("RELAYTASK", relayTaskID);//前置任务id
                         }
@@ -221,7 +221,7 @@ public class TaxCalFacadeControllerBean extends AbstractTaxCalFacadeControllerBe
                         String jsonString = objectMapper.writeValueAsString(paramMap);
                         logger.info("专项附加扣除申报_申报 参数: " + jsonString);
                         List relayTaskIDList = TaxSpeAddDedReportExFacadeFactory.getLocalInstance(ctx).report(paramMap);
-                        if (null != relayTaskIDList && relayTaskIDList.size() == 1) {
+                        if (null != relayTaskIDList && relayTaskIDList.size() > 0) {
                             reportTaskId = (String) relayTaskIDList.get(0);
                         }
                     } catch (Exception e) {

websrc/com/kingdee/eas/custom/shuiyou/six/handler/TaxDirectDeductionListHandlerEx.java

@@ -354,7 +354,7 @@ public class TaxDirectDeductionListHandlerEx extends TaxDirectDeductionListHandl
     }
 
 
-    protected List _staffCollection(Context ctx, Map paramMap) throws BOSException {
+    protected List _staffCollection(Context ctx, Map paramMap) throws BOSException, ShrWebBizException {
 
         if (null != paramMap && null != paramMap.get("taxUnitIds") && null != paramMap.get("period")) {
             String taxUnitIds = (String)paramMap.get("taxUnitIds");
@@ -441,13 +441,13 @@ public class TaxDirectDeductionListHandlerEx extends TaxDirectDeductionListHandl
     }
 
 
-    protected synchronized void _saveStaffCollection(Context ctx, TaxUnitInfo taxUnit, String result) throws BOSException {
+    protected synchronized void _saveStaffCollection(Context ctx, TaxUnitInfo taxUnit, String result) throws BOSException, ShrWebBizException {
         JSONObject object = JSONUtil.parseObj(result);
         JSONObject head = object.getJSONObject("head");
         Map<String, Object> headMap = (Map)object.get("head");
         Map<String, Object> bodyMap = (Map)object.get("body");
         if ("00000000".equals(head.getStr("code"))) {
-            System.out.println("_saveStaffCollection:start");
+            System.out.println("_saveStaffCollection:start"+result);
             List<Map<String, Object>> kczglbList = (bodyMap.containsKey("kczglb") ? (List<Map<String, Object>>) bodyMap.get("kczglb") : null);
             if (null != kczglbList && !kczglbList.isEmpty()) {
                 String prefix = "person_collect_";
@@ -509,6 +509,8 @@ public class TaxDirectDeductionListHandlerEx extends TaxDirectDeductionListHandl
                         CmpDistributedLockUtils.unlock(ctx, prefix, resource);
                     }
                 }
+            }else {
+                throw new ShrWebBizException("δ»ñÈ¡µ½ÈËÔ±6ÍòÐÅÏ¢£¡");
             }
         }else{
             throw new BOSException(result);