Merge branch 'release/个税&业务线' into custom/联特

src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java

@@ -147,6 +147,12 @@ public class EmployeeDeclareRefresh {
                     employeeDeclare.setEmploymentStatus(EmploymentStatusEnum.ABNORMAL.getValue());
                     employeeDeclare.setDismissDate(salaryArchive.getPayEndDate());
                 }
+
+                //二开，过滤起始发薪日期>=当前税款所属期的
+                Date payStartDate = salaryArchive.getPayStartDate();
+                if (!payStartDate.before(dto.getTaxCycle())) {
+                    continue;
+                }
             }
             employeeIds.add(employeeDeclare.getEmployeeId());
             result.getNewEmployeeDeclares().add(employeeDeclare);

src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java

@@ -1,5 +1,6 @@
 package com.engine.salary.service.impl;
 
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
@@ -936,7 +937,8 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
         declareStatus.setTaxDeclareStatus(taxDeclareStatusEnum.getValue());
         // 申报类型
         declareStatus.setTaxPayAmount(Util.null2String(declareTaxFeedbackResponse.getBody().get("ykjse")));
-        declareStatus.setPersonNum(Integer.parseInt(Optional.ofNullable(declareTaxFeedbackResponse.getBody().get("nsrc")).orElse("0").toString()));
+        String nsrc = Util.null2String(declareTaxFeedbackResponse.getBody().get("nsrc"));
+        declareStatus.setPersonNum(Integer.parseInt(NumberUtil.isNumber(nsrc) ? nsrc : "0"));
         declareStatus.setDeclareRequestId(declareStatus.getRequestId());
         declareStatus.setRequestId("");
         //实缴（不含滞纳金）