更新税款计算业务代码

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

@@ -203,8 +203,8 @@ public class TaxCalFacadeControllerBean extends AbstractTaxCalFacadeControllerBe
                         List relayTaskIDList = TaxPersonReportExFacadeFactory.getLocalInstance(ctx)
                                 .report(notReportedPersonIds, yearMonth, (String) null);
                         if (null != relayTaskIDList && relayTaskIDList.size() == 1) {
-                            IObjectPK relayTaskID = (IObjectPK) relayTaskIDList.get(0);
-                            paramMap.put("RELAYTASK", relayTaskID.toString());//前置任务id
+                            String relayTaskID = (String) relayTaskIDList.get(0);
+                            paramMap.put("RELAYTASK", relayTaskID);//前置任务id
                         }
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -236,7 +236,7 @@ public class TaxCalFacadeControllerBean extends AbstractTaxCalFacadeControllerBe
                     String jsonString = objectMapper.writeValueAsString(paramMap);
                     logger.info("税款计算 参数: " + jsonString);
                     calTaxTaskId = SYUtilsFacadeFactory.getLocalInstance(ctx).addTask(
-                            "calTaxService",
+                            "submitAsynTaxCalRequestService",
                             jsonString,
                             TaskCatalogEnum.CAL,
                             reportTaskId);

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

@@ -38,7 +38,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
- * @Description 查询算税反馈结果
+ * @Description 获取异步算税反馈结果
  * @Date 2024/9/10 15:26
  * @Created by Heyuan
  */
@@ -105,7 +105,6 @@ public class GetASynIndividualIncomeTaxFeedback implements IHRMsfService {
             ApiResponse<CalculateTaxResultRequest> apiResponse = taxRequest.getASynIndividualIncomeTaxFeedback(requestId);
             ObjectMapper mapper = new ObjectMapper();
             logInfo.setOutParameter(mapper.writeValueAsString(apiResponse));//回参
-            LogInfoFactory.getLocalInstance(ctx).save(logInfo);
             Head head = apiResponse.getHead();
             String status = head.getStatus();
             String code = head.getCode();
@@ -149,26 +148,26 @@ public class GetASynIndividualIncomeTaxFeedback implements IHRMsfService {
                 //综合所得
                 ComplexIncomeResultRequest complexIncomeResult = body.getComplexIncomeResultRequest();
                 //人员申报失败列表
-                List<EmployeeDeclareFeedback> employeeDeclareFeedbacks = complexIncomeResult.getEmployeeDeclareFeedbacks();
-                for (int i = 0; employeeDeclareFeedbacks != null && i < employeeDeclareFeedbacks.size(); i++) {
-                    EmployeeDeclareFeedback employeeDeclareFeedback = employeeDeclareFeedbacks.get(i);
-                    //姓名
-                    String name = employeeDeclareFeedback.getName();
-                    //证件类型名称
-                    String licenseType = employeeDeclareFeedback.getLicenseType();
-                    //证件号码
-                    String licenseNumber = employeeDeclareFeedback.getLicenseNumber();
-                    //报送状态 1 待报送 2 代报中 3 代报失败 4 代报成功
-                    String submissionState = employeeDeclareFeedback.getSubmissionState();
-                    //人员验证状态 0 若是身份证，状态为验证中；其他证件为暂不验证 1 验证通过 2 验证不通过 4 待验证 9 同代码0处理
-                    String authenticationState = employeeDeclareFeedback.getAuthenticationState();
-                    //失败原因
-                    String message = employeeDeclareFeedback.getMessage();
-                    //专项报送状态 2 代报成功 3 代报失败
-                    String deductionSubmissionState = employeeDeclareFeedback.getDeductionSubmissionState();
-                    //专项报送结果原因
-                    String deductionMessage = employeeDeclareFeedback.getDeductionMessage();
-                }
+//                List<EmployeeDeclareFeedback> employeeDeclareFeedbacks = complexIncomeResult.getEmployeeDeclareFeedbacks();
+//                for (int i = 0; employeeDeclareFeedbacks != null && i < employeeDeclareFeedbacks.size(); i++) {
+//                    EmployeeDeclareFeedback employeeDeclareFeedback = employeeDeclareFeedbacks.get(i);
+//                    //姓名
+//                    String name = employeeDeclareFeedback.getName();
+//                    //证件类型名称
+//                    String licenseType = employeeDeclareFeedback.getLicenseType();
+//                    //证件号码
+//                    String licenseNumber = employeeDeclareFeedback.getLicenseNumber();
+//                    //报送状态 1 待报送 2 代报中 3 代报失败 4 代报成功
+//                    String submissionState = employeeDeclareFeedback.getSubmissionState();
+//                    //人员验证状态 0 若是身份证，状态为验证中；其他证件为暂不验证 1 验证通过 2 验证不通过 4 待验证 9 同代码0处理
+//                    String authenticationState = employeeDeclareFeedback.getAuthenticationState();
+//                    //失败原因
+//                    String message = employeeDeclareFeedback.getMessage();
+//                    //专项报送状态 2 代报成功 3 代报失败
+//                    String deductionSubmissionState = employeeDeclareFeedback.getDeductionSubmissionState();
+//                    //专项报送结果原因
+//                    String deductionMessage = employeeDeclareFeedback.getDeductionMessage();
+//                }
                 logger.info("正常工资薪金算税结果对象");
                 //正常工资薪金算税结果对象
                 ComplexTaxCalculateResult normalSalarySpecIncome = complexIncomeResult.getNormalSalarySpecIncome();
@@ -229,7 +228,7 @@ public class GetASynIndividualIncomeTaxFeedback implements IHRMsfService {
             handleSuccessComplexIncome(ctx, successComplexIncomes);
             //综合算税失败薪资列表
             List<ComplexIncome> failedComplexIncomes = normalSalarySpecIncome.getFailedComplexIncomes();
-            handleFailedComplexIncome(failedComplexIncomes);
+            //handleFailedComplexIncome(failedComplexIncomes);
             //失败算税原因列表
             List<CheckTaxCalResult> failedCheckTaxCalResult = normalSalarySpecIncome.getFailedCheckTaxCalResult();
             handleFailedCheckTaxCalResult(ctx, failedCheckTaxCalResult);
@@ -248,19 +247,16 @@ public class GetASynIndividualIncomeTaxFeedback implements IHRMsfService {
                 String tableField = taxItemInitMap.get(key);
                 updateSql.append(tableField).append("=?, ");
             }
-            //updateSql.deleteCharAt(updateSql.length() - 1);
             updateSql.deleteCharAt(updateSql.lastIndexOf(","));
             updateSql.append("  where fpersonId = ? ");
             updateSql.append("  and FTAXUNITID=? and to_char(FPERIODBEGIN,'yyyy-mm-dd') >= ? and to_char(FPERIODEND,'yyyy-mm-dd') <= ? and FINCOMEITEMID=? and FSTATE =30");
             List<Object[]> sqlParams = new ArrayList<>();
-            List<Object[]> insertParams = new ArrayList<>();
             Set<String> personIds = new HashSet<>();
             Set<String> incomeitemIds = new HashSet<>();
             for (int i = 0; successComplexIncomes != null && i < successComplexIncomes.size(); i++) {
                 ComplexIncome complexIncome = successComplexIncomes.get(i);
                 Map incomeDataMap = new HashMap();
                 List updateList = new ArrayList();
-                List insertList = new ArrayList();
                 //姓名
                 String name = complexIncome.getName();
                 //证件类型名称
@@ -275,11 +271,11 @@ public class GetASynIndividualIncomeTaxFeedback implements IHRMsfService {
                     continue;
                 }
                 //受雇日期
-                String employedDate = complexIncome.getEmployedDate();
+                //String employedDate = complexIncome.getEmployedDate();
                 //离职日期
-                String resignDate = complexIncome.getResignDate();
+                //String resignDate = complexIncome.getResignDate();
                 //是否明细申报
-                String isDetailedDeclaration = complexIncome.getIsDetailedDeclaration();
+                //String isDetailedDeclaration = complexIncome.getIsDetailedDeclaration();
                 //当期收入额
                 BigDecimal income = complexIncome.getIncome();
                 incomeDataMap.put("sre", income);

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

@@ -37,12 +37,12 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
- * @Description Ë°¿î¼ÆËã
+ * @Description Ìá½»Ò첽˰¿î¼ÆËãÇëÇó
  * @Date 2024/9/2 14:30
  * @Created by Heyuan
  */
-public class CalTaxService implements IHRMsfService {
-    private static Logger logger = Logger.getLogger(CalTaxService.class);
+public class SubmitAsynTaxCalRequestService implements IHRMsfService {
+    private static Logger logger = Logger.getLogger(SubmitAsynTaxCalRequestService.class);
 
     @Override
     public MessageResult process(Context ctx, Map paramMap) throws EASBizException, BOSException {