税款计算任务代码更新

websrc/com/kingdee/eas/custom/shuiyou/taxCal/service/GetASynIndividualIncomeTaxFeedback.java

@@ -22,9 +22,8 @@ import com.kingdee.eas.hr.ats.AtsUtil;
 import com.kingdee.eas.hr.ats.util.AtsDateUtils;
 import com.kingdee.eas.util.app.DbUtil;
 import com.kingdee.jdbc.rowset.IRowSet;
-import com.kingdee.shr.compensation.app.incomeTax.TaxPersonRecordCollection;
-import com.kingdee.shr.compensation.app.incomeTax.TaxPersonRecordFactory;
-import com.kingdee.shr.compensation.app.incomeTax.TaxPersonRecordInfo;
+import com.kingdee.shr.compensation.CardTypeEnum;
+import com.kingdee.shr.compensation.app.incomeTax.*;
 import com.kingdee.shr.compensation.app.tax.base.*;
 import com.kingdee.shr.compensation.app.taxCal.*;
 import com.kingdee.util.StringUtils;
@@ -128,6 +127,7 @@ public class GetASynIndividualIncomeTaxFeedback implements IHRMsfService {
                 logger.info("objectMapper.writeValueAsString(taxItemConfigMap)  " + objectMapper.writeValueAsString(taxItemConfigMap));
                 //获取报送人员信息
                 getTaxPersonRecordMap(ctx);
+                logger.info("objectMapper.writeValueAsString(taxPersonRecordMap)  " + objectMapper.writeValueAsString(taxPersonRecordMap));
                 //请求成功
                 CalculateTaxResultRequest body = apiResponse.getBody();
                 //企业名称
@@ -903,14 +903,22 @@ public class GetASynIndividualIncomeTaxFeedback implements IHRMsfService {
         if (taxPersonRecordMap == null) {
             taxPersonRecordMap = new HashMap<>();
         }
-        TaxPersonRecordCollection taxPersonRecordCollection = TaxPersonRecordFactory
-                .getLocalInstance(ctx).getTaxPersonRecordCollection();
-        for (int i = 0; i < taxPersonRecordCollection.size(); i++) {
-            TaxPersonRecordInfo taxPersonRecordInfo = taxPersonRecordCollection.get(i);
-            String personId = taxPersonRecordInfo.getPerson().getId().toString();
-            String cardTypeName = taxPersonRecordInfo.getCardType().getAlias();
-            String cardNumber = taxPersonRecordInfo.getCardNumber();
-            taxPersonRecordMap.put(cardNumber + cardTypeName, personId);
+        String oql = "select bill.person.id,bill.cardType,bill.cardNumber where submitStatus='2'";
+        TaxPersonRecordEntryCollection taxPersonRecordEntryCollection =
+                TaxPersonRecordEntryFactory.getLocalInstance(ctx).getTaxPersonRecordEntryCollection(oql);
+        for (int i = 0; i < taxPersonRecordEntryCollection.size(); i++) {
+            TaxPersonRecordInfo taxPersonRecordInfo = taxPersonRecordEntryCollection.get(i).getBill();
+            if (taxPersonRecordInfo != null) {
+                String personId = taxPersonRecordInfo.getPerson().getId().toString();
+                CardTypeEnum cardType = taxPersonRecordInfo.getCardType();
+                if (cardType == null) {
+                    logger.error("获取报送人员信息 人员id[" + personId + "] 的证件类型为空!");
+                    continue;
+                }
+                String cardTypeName = cardType.getAlias();
+                String cardNumber = taxPersonRecordInfo.getCardNumber();
+                taxPersonRecordMap.put(cardNumber + cardTypeName, personId);
+            }
         }
     }
 

websrc/com/kingdee/eas/custom/shuiyou/taxCal/service/SubmitAsynTaxCalRequestService.java

@@ -641,7 +641,7 @@ public class SubmitAsynTaxCalRequestService implements IHRMsfService {
     private List<ComplexIncome> getAnnualOneTimeBonusIncomeList(
             Map<String, List<Map<String, Object>>> caluDataMap) {
         List<ComplexIncome> annualOneTimeBonusIncome = new ArrayList<>();
-        List<Map<String, Object>> list = caluDataMap.get("qnycxjjsslb");
+        List<Map<String, Object>> list = caluDataMap.get("qnycxjjlb");
         for (int i = 0; list != null && i < list.size(); i++) {
             Map<String, Object> map = list.get(i);
             ComplexIncome complexIncome = new ComplexIncome();