Merge branch 'release/个税版本' into custom/联特

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

@@ -601,10 +601,14 @@ public class EmployeeDeclareExcelServiceImpl extends Service implements Employee
 
         Set<String> emptyNames = new HashSet<>();
         for (PropertyDescriptor pd : pds) {
-            Object srcValue = src.getPropertyValue(pd.getName());
+            String name = pd.getName();
+            if("dismissDate".equals(name)){
+                continue;
+            }
+            Object srcValue = src.getPropertyValue(name);
             // 此处判断可根据需求修改
             if (srcValue == null) {
-                emptyNames.add(pd.getName());
+                emptyNames.add(name);
             }
         }
         String[] result = new String[emptyNames.size()];

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

@@ -662,6 +662,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
         ImmutableMap<String, String> requestParam = ImmutableMap.of("requestId", employeeDeclareRecord.getRequestId());
         Map<String, String> header = SingnatureData.initHeader(Collections.emptyMap(), apiConfig.getAppKey(), apiConfig.getAppSecret());
         String res = HttpUtil.getRequest(url, header, requestParam);
+        log.info("人员报送反馈:{}", res);
         DeclareEmployeeFeedbackResponse declareEmployeeFeedbackResponse = JsonUtil.parseObject(res, DeclareEmployeeFeedbackResponse.class);
         if (Objects.isNull(declareEmployeeFeedbackResponse) || Objects.isNull(declareEmployeeFeedbackResponse.getHead())) {
             log.error("服务异常:" + res);