并档案接口

src/com/engine/salary/remote/tax/client/EmployeeClient.java

@@ -5,6 +5,7 @@ import com.engine.salary.enums.taxagent.TaxAgentTaxReturnPasswordTypeEnum;
 import com.engine.salary.remote.tax.request.employee.BatchInvalidSubmissionRequest;
 import com.engine.salary.remote.tax.request.employee.GetCompanyEmployeeRequest;
 import com.engine.salary.remote.tax.request.employee.InformationChangeRequest;
+import com.engine.salary.remote.tax.request.employee.MergedEmployeeArchivesRequest;
 import com.engine.salary.remote.tax.response.employee.GetCompanyEmployeeResponse;
 import com.engine.salary.util.HttpUtil;
 import com.engine.salary.util.JsonUtil;
@@ -13,6 +14,7 @@ import com.engine.salary.util.SingnatureData;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -125,4 +127,47 @@ public class EmployeeClient extends TaxBaseClient {
         return res;
     }
 
+
+    public String mergedEmployeeArchives(MergedEmployeeArchivesRequest mergedEmployeeArchivesRequest) {
+
+        String url = super.apiConfig.getHost() + "gateway/iit/mergedEmployeeArchives/query";
+        mergedEmployeeArchivesRequest.setNsrsbh(returnPO.getTaxCode());
+        mergedEmployeeArchivesRequest.setBizNo(UUID.randomUUID().toString().replace("-", ""));
+        mergedEmployeeArchivesRequest.setQymc(returnPO.getTaxAgentName());
+        mergedEmployeeArchivesRequest.setDjxhid(StringUtils.isNotEmpty(returnPO.getTaxRegistrationNumber()) ? returnPO.getTaxRegistrationNumber() : null);
+        mergedEmployeeArchivesRequest.setAreaid(returnPO.getAreaCode());
+        mergedEmployeeArchivesRequest.setBmbh(StringUtils.isNotEmpty(returnPO.getDepartmentCode()) ? returnPO.getDepartmentCode() : null);
+        boolean realNamePwd = TaxAgentTaxReturnPasswordTypeEnum.REAL_NAME_PASSWORD.getValue().equals(returnPO.getPasswordType());
+        mergedEmployeeArchivesRequest.setSbmm(realNamePwd ? null : returnPO.getPwd());
+        mergedEmployeeArchivesRequest.setJmsbmm("0");
+        mergedEmployeeArchivesRequest.setSmzh(realNamePwd ? returnPO.getRealAccount() : null);
+        mergedEmployeeArchivesRequest.setSmmm(realNamePwd ? returnPO.getPwd() : null);
+        mergedEmployeeArchivesRequest.setJmsmmm("0");
+        mergedEmployeeArchivesRequest.setMmlx("" + returnPO.getPasswordType());
+
+
+        String reqJson = JsonUtil.toJsonString(mergedEmployeeArchivesRequest);
+        log.info("mergedEmployeeArchivesRequest params --- \n{}\n", reqJson);
+        Map<String, String> params = new HashMap<>(1);
+        Map<String, String> header = SingnatureData.initHeader(params, apiConfig.getAppKey(), apiConfig.getAppSecret());
+
+        //  开始请求
+        String res = HttpUtil.doPost(url, header, reqJson, HttpUtil.JSON_TYPE);
+        log.info("mergedEmployeeArchivesRequest res --- {}", res);
+//        return JsonUtil.parseObject(res, GetCompanyEmployeeResponse.class);
+        return res;
+    }
+
+    public String mergedEmployeeArchivesFeedback(String requestId) {
+
+        String url = super.apiConfig.getHost() + "gateway/iit/mergedEmployeeArchives/getFeedback";
+        Map<String, String> params = new HashMap<>(1);
+        params.put("requestId", requestId);
+        log.info("mergedEmployeeArchivesFeedback requestId --- \n{}\n", requestId);
+        Map<String, String> header = SingnatureData.initHeader(Collections.emptyMap(), apiConfig.getAppKey(), apiConfig.getAppSecret());
+        String res = HttpUtil.getRequest(url, header, params);
+        log.info("mergedEmployeeArchivesFeedback res --- {}", res);
+//        return JsonUtil.parseObject(res, GetCompanyEmployeeResponse.class);
+        return res;
+    }
 }

src/com/engine/salary/remote/tax/request/employee/MergedEmployeeArchivesRequest.java

@@ -0,0 +1,71 @@
+package com.engine.salary.remote.tax.request.employee;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MergedEmployeeArchivesRequest {
+
+
+    private String bizNo;
+
+    /**
+     * 税号    必填：是    扣缴单位纳税人识别号
+     */
+    private String nsrsbh;
+    /**
+     * 企业名称    必填：是    扣缴义务人名称：例如：测试网络科技有限公司
+     */
+    private String qymc;
+    /**
+     * 登记序号    必填：条件必填    存在多个登记序号时，需要指定传入一个.例：10117440105249764755
+     */
+    private String djxhid;
+    /**
+     * 地区编号    必填：是    6位行政区划代码,精确到市级，例如：440100,,参考省市区编码
+     */
+    private String areaid;
+    /**
+     * 部门编号    必填：条件必填    分部门代报时必传
+     */
+    private String bmbh;
+    /**
+     * 申报密码    必填：条件必填    当mmlx=0时，必填
+     */
+    private String sbmm;
+    /**
+     * 加密实名密码    必填：否    默认不传则设置为0，0表示不加密；1表示加密
+     */
+    private String jmsbmm;
+    /**
+     * 实名账号    必填：是    
+     */
+    private String smzh;
+    /**
+     * 实名密码    必填：是    
+     */
+    private String smmm;
+    /**
+     * 加密实名密码    必填：否    默认不传则设置为0，0表示不加密；1表示加密 参考3.4代报、实名密码加密说明
+     */
+    private String jmsmmm;
+
+    /**
+     * 密码类型    必填：是    0表示申报密码；  2表示实名账号实名密码
+     */
+    private String mmlx;
+
+    /**
+     * 人员列表 必填：是
+     */
+    protected List<BatchInvalidSubmissionRequest.RY> bdrys;
+
+
+    @Data
+    public static class RY {
+        private String xm;
+        private String zzlx;
+        private String zzhm;
+    }
+}

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

@@ -759,6 +759,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
         return s;
     }
 
+
     @Override
     public String syncEmploymentDate(EmployeeDeclareSyncStartDateParam param) {
         List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listAll(UseEmployeeTypeEnum.ALL);