diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index 69b12aa04..ffa532b2a 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -163,7 +163,11 @@ public class SIAccountBiz extends Service {
         OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
         queryParam.setOrderRule(orderRule);
 
+        //系统人员福利台账明细
         List<InsuranceAccountDetailPO> list = getInsuranceAccountDetailMapper().list(queryParam);
+        //非系统各人员台账明细
+        List<InsuranceAccountDetailPO> extList = getInsuranceAccountDetailMapper().extList(queryParam);
+        list.addAll(extList);
 
         PageInfo<InsuranceAccountDetailPO> pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
                 list, InsuranceAccountDetailPO.class);
diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java
index a3d3f10ab..07a965ef7 100644
--- a/src/com/engine/salary/biz/SIArchivesBiz.java
+++ b/src/com/engine/salary/biz/SIArchivesBiz.java
@@ -29,6 +29,7 @@ import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO;
 import com.engine.salary.entity.sischeme.po.InsuranceSchemePO;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
 import com.engine.salary.enums.UserStatusEnum;
+import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum;
 import com.engine.salary.enums.siaccount.EmployeeStatusEnum;
 import com.engine.salary.enums.sicategory.*;
 import com.engine.salary.exception.SalaryRunTimeException;
@@ -691,6 +692,13 @@ public class SIArchivesBiz {
                 }
                 encryptUtil.encrypt(updateOtherInfo, InsuranceArchivesOtherSchemePO.class);
                 otherSchemeMapper.updateById(updateOtherInfo);
+                //更新base_info表状态
+                InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId());
+                if(baseInfoPO != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
+                    //对于非系统人员，编辑后状态切换为正在缴纳
+                    baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
+                    getInsuranceBaseInfoMapper().updateById(baseInfoPO);
+                }
                 sqlSession.commit();
             } else {
                 otherSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesOtherSchemePO.builder()
@@ -729,6 +737,10 @@ public class SIArchivesBiz {
                             .paymentOrganization(param.getPaymentOrganization())
                             .build());
                     baseInfoPO.setOtherArchivesId(otherInfos.get(0).getId());
+                    //对于非系统人员，编辑后状态切换为正在缴纳
+                    if (baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
+                        baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
+                    }
                     getInsuranceBaseInfoMapper().updateById(baseInfoPO);
                 } else {
                     throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "档案不存在！"));
@@ -790,7 +802,13 @@ public class SIArchivesBiz {
                 }
                 encryptUtil.encrypt(updateFundInfo, InsuranceArchivesFundSchemePO.class);
                 fundSchemeMapper.updateById(updateFundInfo);
-
+                //更新base_info表状态
+                InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId());
+                if(baseInfoPO != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
+                    //对于非系统人员，编辑后状态切换为正在缴纳
+                    baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
+                    getInsuranceBaseInfoMapper().updateById(baseInfoPO);
+                }
                 sqlSession.commit();
             } else {
                 fundSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesFundSchemePO.builder()
@@ -831,6 +849,10 @@ public class SIArchivesBiz {
                             .paymentOrganization(param.getPaymentOrganization())
                             .build());
                     baseInfoPO.setFundArchivesId(fundInfos.get(0).getId());
+                    //对于非系统人员，编辑后状态切换为正在缴纳
+                    if (baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
+                        baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
+                    }
                     getInsuranceBaseInfoMapper().updateById(baseInfoPO);
                 } else {
                     throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "档案不存在！"));
@@ -899,7 +921,13 @@ public class SIArchivesBiz {
                 }
                 encryptUtil.encrypt(updateSocialInfo, InsuranceArchivesSocialSchemePO.class);
                 socialSchemeMapper.updateById(updateSocialInfo);
-
+                //更新base_info表状态
+                InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId());
+                if(baseInfoPO != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
+                    //对于非系统人员，编辑后状态切换为正在缴纳
+                    baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
+                    getInsuranceBaseInfoMapper().updateById(baseInfoPO);
+                }
                 sqlSession.commit();
             } else {
                 socialSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesSocialSchemePO.builder()
@@ -940,6 +968,10 @@ public class SIArchivesBiz {
                             .paymentOrganization(param.getPaymentOrganization())
                             .build());
                     baseInfoPO.setSocialArchivesId(socialInfos.get(0).getId());
+                    //对于非系统人员，编辑后状态切换为正在缴纳
+                    if (baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
+                        baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
+                    }
                     getInsuranceBaseInfoMapper().updateById(baseInfoPO);
                 } else {
                     throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "档案不存在！"));
diff --git a/src/com/engine/salary/entity/sischeme/param/SISchemaImportParam.java b/src/com/engine/salary/entity/sischeme/param/SISchemaImportParam.java
index 0581b2c5f..7e49621c2 100644
--- a/src/com/engine/salary/entity/sischeme/param/SISchemaImportParam.java
+++ b/src/com/engine/salary/entity/sischeme/param/SISchemaImportParam.java
@@ -18,6 +18,13 @@ public class SISchemaImportParam {
     @DataCheck(require = true,message = "imageId为空")
     String imageId;
 
-    //福利执行状态
+    /**
+     * 福利执行状态
+     */
     String runStatus;
+
+    /**
+     * 是否是外部人员
+     */
+    boolean isExtEmp;
 }
diff --git a/src/com/engine/salary/mapper/InsuranceExportMapper.java b/src/com/engine/salary/mapper/InsuranceExportMapper.java
index ffed6713f..2464c49de 100644
--- a/src/com/engine/salary/mapper/InsuranceExportMapper.java
+++ b/src/com/engine/salary/mapper/InsuranceExportMapper.java
@@ -21,4 +21,8 @@ public interface InsuranceExportMapper {
     List<AccountExportPO> exportAccount(@Param("paymentStatus") Integer paymentStatus, @Param("param") InsuranceExportParam param);
 
     List<AccountExportPO> exportRecessionAccount(@Param("paymentStatus") Integer paymentStatus, @Param("param") InsuranceExportParam param);
+
+    List<AccountExportPO> exportExtAccount(@Param("paymentStatus") Integer paymentStatus, @Param("param") InsuranceExportParam param);
+
+    List<ExcelAccountExportPO> exportExtExcelAccount(@Param("param") InsuranceComparisonResultQueryParam param);
 }
diff --git a/src/com/engine/salary/mapper/InsuranceExportMapper.xml b/src/com/engine/salary/mapper/InsuranceExportMapper.xml
index 517eb1672..481c44a30 100644
--- a/src/com/engine/salary/mapper/InsuranceExportMapper.xml
+++ b/src/com/engine/salary/mapper/InsuranceExportMapper.xml
@@ -193,4 +193,102 @@
             ORDER BY  ${param.orderRule.orderRule}  ${param.orderRule.ascOrDesc}
         </if>
     </select>
+
+    <select id="exportExtAccount" resultType="com.engine.salary.entity.siexport.po.AccountExportPO">
+        SELECT a.*,
+        e.username       AS userName,
+        e.mobile         AS telephone,
+        d.departmentname AS departmentName,
+        e.status         AS userStatus,
+        e.workcode       AS workcode
+        FROM (
+        SELECT *
+        from hrsa_bill_detail
+        WHERE delete_type = 0
+        AND bill_month = #{param.billMonth}
+        AND payment_status = #{paymentStatus}
+        AND payment_organization = #{param.paymentOrganization}
+        ) a
+        LEFT JOIN hrsa_external_employee e ON e.ID = a.employee_id
+        LEFT JOIN hrmdepartment d ON d.id = e.department_id
+        LEFT JOIN hrmsubcompany c ON c.id = e.subcompany_id
+        where e.status not in (7)
+        <!-- 排序 -->
+    </select>
+    <select id="exportExtAccount" resultType="com.engine.salary.entity.siexport.po.AccountExportPO" databaseId="oracle">
+        SELECT a.*,
+        e.username       AS userName,
+        e.mobile         AS telephone,
+        d.departmentname AS departmentName,
+        e.status         AS userStatus,
+        e.workcode       AS workcode
+        FROM (
+        SELECT *
+        from hrsa_bill_detail
+        WHERE delete_type = 0
+        AND bill_month = #{param.billMonth}
+        AND payment_status = #{paymentStatus}
+        AND payment_organization = #{param.paymentOrganization}
+        ) a
+        LEFT JOIN hrsa_external_employee e ON e.ID = a.employee_id
+        LEFT JOIN hrmdepartment d ON d.id = e.department_id
+        LEFT JOIN hrmsubcompany c ON c.id = e.subcompany_id
+        where e.status not in (7)
+        <!-- 排序 -->
+    </select>
+    <select id="exportExtAccount" resultType="com.engine.salary.entity.siexport.po.AccountExportPO" databaseId="sqlserver">
+        SELECT a.*,
+        e.username       AS userName,
+        e.mobile         AS telephone,
+        d.departmentname AS departmentName,
+        e.status         AS userStatus,
+        e.workcode       AS workcode
+        FROM (
+        SELECT *
+        from hrsa_bill_detail
+        WHERE delete_type = 0
+        AND bill_month = #{param.billMonth}
+        AND payment_status = #{paymentStatus}
+        AND payment_organization = #{param.paymentOrganization}
+        ) a
+        LEFT JOIN hrsa_external_employee e ON e.ID = a.employee_id
+        LEFT JOIN hrmdepartment d ON d.id = e.department_id
+        LEFT JOIN hrmsubcompany c ON c.id = e.subcompany_id
+        where e.status not in (7)
+        <!-- 排序 -->
+    </select>
+
+    <select id="exportExtExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO">
+        SELECT
+        a.*,e.username AS userName,e.mobile AS telephone,d.departmentname AS departmentName,e.status AS userStatus,e.workcode AS workcode
+        FROM(
+        SELECT * from hrsa_excel_bill_detail
+        WHERE  delete_type = 0 AND bill_month = #{param.billMonth} AND payment_status = #{param.paymentStatus} AND payment_organization = #{param.paymentOrganization}
+        )a
+        LEFT JOIN hrsa_external_employee e ON e.ID = a.employee_id
+        LEFT JOIN hrmdepartment d ON d.id = e.department_id
+        where          e.status not in (7)
+    </select>
+    <select id="exportExtExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO" databaseId="oracle">
+         SELECT
+        a.*,e.username AS userName,e.mobile AS telephone,d.departmentname AS departmentName,e.status AS userStatus,e.workcode AS workcode
+        FROM(
+        SELECT * from hrsa_excel_bill_detail
+        WHERE  delete_type = 0 AND bill_month = #{param.billMonth} AND payment_status = #{param.paymentStatus} AND payment_organization = #{param.paymentOrganization}
+        )a
+        LEFT JOIN hrsa_external_employee e ON e.ID = a.employee_id
+        LEFT JOIN hrmdepartment d ON d.id = e.department_id
+        where          e.status not in (7)
+     </select>
+    <select id="exportExtExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO" databaseId="sqlserver">
+           SELECT
+        a.*,e.username AS userName,e.mobile AS telephone,d.departmentname AS departmentName,e.status AS userStatus,e.workcode AS workcode
+        FROM(
+        SELECT * from hrsa_excel_bill_detail
+        WHERE  delete_type = 0 AND bill_month = #{param.billMonth} AND payment_status = #{param.paymentStatus} AND payment_organization = #{param.paymentOrganization}
+        )a
+        LEFT JOIN hrsa_external_employee e ON e.ID = a.employee_id
+        LEFT JOIN hrmdepartment d ON d.id = e.department_id
+        where          e.status not in (7)
+     </select>
 </mapper>
diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.java b/src/com/engine/salary/mapper/datacollection/EmployMapper.java
index 557198e80..4f3aa8ed4 100644
--- a/src/com/engine/salary/mapper/datacollection/EmployMapper.java
+++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.java
@@ -87,6 +87,8 @@ public interface EmployMapper {
 
 
     List<HrmInfoDTO> listHrmInfoByIdAndName(@Param("param") HrmQueryParam param);
+    List<HrmInfoDTO> listExtHrmInfoByIdAndName(@Param("param") HrmQueryParam param);
+
 
     /**
      * 根据部门名称查询部门
diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
index b54ee6cba..29ce5fcbe 100644
--- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
@@ -8,7 +8,8 @@
                d.DEPARTMENTNAME as departmentName,
                e.status,
                e.mobile,
-               e.workcode
+               e.workcode,
+               'false' as extEmp
         from hrmresource e
                  left join hrmdepartment d on e.departmentid = d.id
         where e.status not in (7)
@@ -385,4 +386,64 @@
         where e.status not in (7)
           AND e.enddate >= #{dismissDate}
     </select>
+
+    <select id="listExtHrmInfoByIdAndName" resultType="com.engine.salary.entity.hrm.dto.HrmInfoDTO">
+        select e.id as employeeId,
+        e.username as username
+        from hrsa_external_employee e
+        where 1=1
+        <if test="param.ids != null and param.ids.size()>0">
+            AND e.id IN
+            <foreach collection="param.ids" open="(" item="id" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="param.userName != null and param.userName != ''">
+            AND
+            (
+            e.username like CONCAT('%',#{param.userName},'%')
+            )
+        </if>
+    </select>
+
+    <select id="listExtHrmInfoByIdAndName" resultType="com.engine.salary.entity.hrm.dto.HrmInfoDTO" databaseId="sqlserver">
+        select e.id as employeeId,
+        e.username as username
+        from hrsa_external_employee e
+        where 1=1
+        <if test="param.ids != null and param.ids.size()>0">
+            AND e.id IN
+            <foreach collection="param.ids" open="(" item="id" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="param.userName != null and param.userName != ''">
+            AND
+            (
+            e.username like '%'+#{param.userName}+'%'
+            )
+        </if>
+    </select>
+
+    <select id="listExtHrmInfoByIdAndName" resultType="com.engine.salary.entity.hrm.dto.HrmInfoDTO" databaseId="oracle">
+        select e.id as employeeId,
+        e.username as username
+        from hrsa_external_employee e
+        where 1=1
+        <if test="param.ids != null and param.ids.size()>0">
+            AND e.id IN
+            <foreach collection="param.ids" open="(" item="id" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="param.userName != null and param.userName != ''">
+            AND
+            (
+            e.username like '%'||#{param.userName}||'%'
+            )
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml b/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml
index 0a8ac06b9..e04017e35 100644
--- a/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml
@@ -239,7 +239,8 @@
                d.DEPARTMENTNAME as departmentName,
                e.status,
                e.mobile,
-               e.workcode
+               e.workcode,
+               'true' as extEmp
         from hrsa_external_employee e
                  left join hrmdepartment d on e.department_id = d.id
     </select>
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
index 94843ff71..2dec937ca 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
@@ -24,6 +24,14 @@ public interface InsuranceAccountDetailMapper {
      */
     List<InsuranceAccountDetailPO> list(@Param("param") InsuranceAccountDetailParam queryParam);
 
+    /**
+     * 查询正常缴纳列表_非系统人员
+     *
+     * @param queryParam
+     * @return
+     */
+    List<InsuranceAccountDetailPO> extList(@Param("param") InsuranceAccountDetailParam queryParam);
+
     /**
      * 通过id查询
      */
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index 6535e2f0b..6540a705d 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -254,6 +254,94 @@
         </if>
     </sql>
 
+    <sql id="extParamSql">
+        <if test="param.userName != null and param.userName != ''">
+            AND
+            (
+            e.userName like CONCAT('%',#{param.userName},'%')
+            )
+        </if>
+        <if test="param.workcode != null and param.workcode != ''">
+            AND e.workcode like CONCAT('%',#{param.workcode},'%')
+        </if>
+        <if test="param.employeeIds != null and param.employeeIds.size()>0">
+            AND t.employee_id IN
+            <foreach collection="param.employeeIds" open="(" item="employeeId" separator="," close=")">
+                #{employeeId}
+            </foreach>
+        </if>
+        <if test="param.recessionMonthList != null and param.recessionMonthList.size()>0">
+            AND t.bill_month IN
+            <foreach collection="param.recessionMonthList" open="(" item="recessionMonth" separator="," close=")">
+                #{recessionMonth}
+            </foreach>
+        </if>
+        <if test="param.taxAgents != null and param.taxAgents.size()>0">
+            AND t.payment_organization IN
+            <foreach collection="param.taxAgents" open="(" item="taxAgent" separator="," close=")">
+                #{taxAgent}
+            </foreach>
+        </if>
+    </sql>
+    <sql id="extParamSql" databaseId="oracle">
+        <if test="param.userName != null and param.userName != ''">
+            AND
+            (
+            e.userName like '%'||#{param.userName}||'%'
+            )
+        </if>
+        <if test="param.workcode != null and param.workcode != ''">
+            AND e.workcode like '%'||#{param.workcode}||'%'
+        </if>
+        <if test="param.employeeIds != null and param.employeeIds.size()>0">
+            AND t.employee_id IN
+            <foreach collection="param.employeeIds" open="(" item="employeeId" separator="," close=")">
+                #{employeeId}
+            </foreach>
+        </if>
+        <if test="param.recessionMonthList != null and param.recessionMonthList.size()>0">
+            AND t.bill_month IN
+            <foreach collection="param.recessionMonthList" open="(" item="recessionMonth" separator="," close=")">
+                #{recessionMonth}
+            </foreach>
+        </if>
+        <if test="param.taxAgents != null and param.taxAgents.size()>0">
+            AND t.payment_organization IN
+            <foreach collection="param.taxAgents" open="(" item="taxAgent" separator="," close=")">
+                #{taxAgent}
+            </foreach>
+        </if>
+    </sql>
+    <sql id="extParamSql" databaseId="sqlserver">
+        <if test="param.userName != null and param.userName != ''">
+            AND
+            (
+            e.userName like '%'+#{param.userName}+'%'
+            )
+        </if>
+        <if test="param.workcode != null and param.workcode != ''">
+            AND e.workcode like '%'+#{param.workcode}+'%'
+        </if>
+        <if test="param.employeeIds != null and param.employeeIds.size()>0">
+            AND t.employee_id IN
+            <foreach collection="param.employeeIds" open="(" item="employeeId" separator="," close=")">
+                #{employeeId}
+            </foreach>
+        </if>
+        <if test="param.recessionMonthList != null and param.recessionMonthList.size()>0">
+            AND t.bill_month IN
+            <foreach collection="param.recessionMonthList" open="(" item="recessionMonth" separator="," close=")">
+                #{recessionMonth}
+            </foreach>
+        </if>
+        <if test="param.taxAgents != null and param.taxAgents.size()>0">
+            AND t.payment_organization IN
+            <foreach collection="param.taxAgents" open="(" item="taxAgent" separator="," close=")">
+                #{taxAgent}
+            </foreach>
+        </if>
+    </sql>
+
 
     <select id="list" resultMap="BaseResultMap">
         SELECT
@@ -274,6 +362,22 @@
         </if>
     </select>
 
+    <select id="extList" resultMap="BaseResultMap">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM
+        hrsa_bill_detail t
+        left join hrsa_external_employee e on e.ID = t.employee_id
+        LEFT JOIN hrmdepartment d ON d.id = e.department_id
+        LEFT JOIN hrmsubcompany c ON c.id = e.subcompany_id
+        WHERE t.delete_type = 0
+        and e.status not in (7)
+        <include refid="paramSqlCommon"/>
+        <include refid="extParamSql"/>
+        <!-- 排序 -->
+
+    </select>
+
     <select id="selectList" resultMap="BaseResultMap">
         SELECT
         t.employee_id,t.social_sum,t.fund_sum,t.other_sum,t.fund_pay_org,t.social_pay_org,
diff --git a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
index 1b550bb71..dcb3b5f1f 100644
--- a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
+++ b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
@@ -38,6 +38,7 @@ import org.springframework.beans.BeanUtils;
 import weaver.file.ImageFileManager;
 import weaver.general.Util;
 import weaver.hrm.User;
+import weaver.hrm.company.DepartmentComInfo;
 
 import java.io.InputStream;
 import java.util.*;
@@ -323,7 +324,10 @@ public class ExtEmpServiceImpl extends Service implements ExtEmpService {
                 Long employeeId = 0L;
 
                 String username = (String) map.getOrDefault(SalaryI18nUtil.getI18nLabel(25034, "姓名"), "");
-                String departmentName = (String) map.getOrDefault(SalaryI18nUtil.getI18nLabel(27511, "部门"), "");
+                String departmentFullName = (String) map.getOrDefault(SalaryI18nUtil.getI18nLabel(27511, "部门"), "");
+                String[] split = departmentFullName.split(">");
+                String departmentName = split[split.length - 1];
+
                 String subcompanyName = (String) map.getOrDefault(SalaryI18nUtil.getI18nLabel(33553, "分部"), "");
                 String companystartdate = (String) map.getOrDefault(SalaryI18nUtil.getI18nLabel(1516, "入职日期"), "");
 
@@ -346,6 +350,7 @@ public class ExtEmpServiceImpl extends Service implements ExtEmpService {
                 //校验部门、分部
                 List<SubCompanyInfo> subCompanyInfos = new ArrayList<>();
                 List<DeptInfo> deptInfos = new ArrayList<>();
+                List<DeptInfo> targetDeptRange = new ArrayList<>();
                 if (StringUtils.isNotBlank(subcompanyName)) {
                     subCompanyInfos = getEmployMapper().getSubCompanyInfosByName(subcompanyName);
                     if (subCompanyInfos.size() == 0) {
@@ -356,7 +361,18 @@ public class ExtEmpServiceImpl extends Service implements ExtEmpService {
                     }
                 }
                 if (StringUtils.isNotBlank(departmentName)) {
-                    deptInfos = getEmployMapper().getDeptInfosByName(departmentName);
+                    List<DeptInfo>  toDealDeptInfos = getEmployMapper().getDeptInfosByName(departmentName);
+                    //筛选出匹配导入部门全路径的部门信息
+                    DepartmentComInfo dci = new DepartmentComInfo();
+                    deptInfos = toDealDeptInfos.stream().filter(f -> {
+                        try {
+                            String departmentRealPath = dci.getDepartmentRealPath(f.getId().toString());
+                            return departmentRealPath.contains(departmentFullName);
+                        } catch (Exception e) {
+                            throw new SalaryRunTimeException(e.getMessage());
+                        }
+                    }).collect(Collectors.toList());
+
                     if (deptInfos.size() == 0) {
                         isError = true;
                         Map<String, String> errorMessageMap = Maps.newHashMap();
@@ -392,7 +408,7 @@ public class ExtEmpServiceImpl extends Service implements ExtEmpService {
                     if(subCompanyInfos.size() == 0 && deptInfos.size() > 1) {
                         isError = true;
                         Map<String, String> errorMessageMap = Maps.newHashMap();
-                        errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(0,  "系统中存在重复部门信息，无法指定当前人员关联的唯一部门，请通过填写部门所属的分部信息来缩小部门筛选范围"));
+                        errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(0,  "系统中存在重复部门信息，无法指定当前人员关联的唯一部门，请细化部门上级部门或填写部门所属的分部信息来缩小部门筛选范围"));
                         excelComments.add(errorMessageMap);
                     } else if (subCompanyInfos.size() > 1 && deptInfos.size() == 0) {
                         //部门结果数为0，分部结果数大于1，则无法匹配
@@ -415,7 +431,7 @@ public class ExtEmpServiceImpl extends Service implements ExtEmpService {
                         } else if (targetDeptInfos.size() > 1) {
                             isError = true;
                             Map<String, String> errorMessageMap = Maps.newHashMap();
-                            errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(0,  "该组数据中的部门和分部信息在系统中出现多组匹配的部门和分布组合，无法指定唯一的部门和分部组合"));
+                            errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(0,  "该组数据中的部门和分部信息在系统中出现多组匹配的部门和分部组合，无法指定唯一的部门和分部组合"));
                             excelComments.add(errorMessageMap);
                         } else {
                             targetSubCompanyInfos = subCompanyInfos.stream().filter(f -> f.getId().equals(targetDeptInfos.get(0).getSubcompanyid1())).collect(Collectors.toList());
diff --git a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java
index 2fe3ba1c6..89f725a87 100644
--- a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java
@@ -148,7 +148,11 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar
         insuranceExportParam.setBillMonth(queryParam.getBillMonth());
         insuranceExportParam.setPaymentOrganization(queryParam.getPaymentOrganization());
         insuranceExportParam.setOrderRule(orderRule);
+        //系统人员核算明细
         List<AccountExportPO> accountExportPOS = getInsuranceExportMapper().exportAccount(queryParam.getPaymentStatus(), insuranceExportParam);
+        //非系统人员核算明细
+        List<AccountExportPO> extAccountExportPOS = getInsuranceExportMapper().exportExtAccount(queryParam.getPaymentStatus(), insuranceExportParam);
+        accountExportPOS.addAll(extAccountExportPOS);
         //如果入参包含姓名信息
         if (queryParam.getUserName() != null) {
             accountExportPOS = accountExportPOS.stream().filter(v -> v.getUserName().contains(queryParam.getUserName())).collect(Collectors.toList());
@@ -165,7 +169,11 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar
 
         encryptUtil.decryptList(accountExportPOS, AccountExportPO.class);
         //2-查询线下对比数据
+        //系统人员对比数据
         List<ExcelAccountExportPO> excelAccountExportPOS = getInsuranceExportMapper().exportExcelAccount(queryParam);
+        //非系统人员对比数据
+        List<ExcelAccountExportPO> extExcelAccountExportPOS = getInsuranceExportMapper().exportExtExcelAccount(queryParam);
+        excelAccountExportPOS.addAll(extExcelAccountExportPOS);
         encryptUtil.decryptList(excelAccountExportPOS, ExcelAccountExportPO.class);
 
         //整理线上核算记录相关的福利方案，并以此整理需要对比的福利项类别数据
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 599f27b24..95042d4c6 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -346,7 +346,11 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
         queryParam.setOrderRule(orderRule);
 
+        //系统人员核算明细
         List<InsuranceAccountDetailPO> list = getInsuranceAccountDetailMapper().list(queryParam);
+        //非系统人员核算明细
+        List<InsuranceAccountDetailPO> extList = getInsuranceAccountDetailMapper().extList(queryParam);
+        list.addAll(extList);
         PageInfo<InsuranceAccountDetailPO> pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(),queryParam.getPageSize(),
                 list, InsuranceAccountDetailPO.class);
         List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = pageInfo.getList();
@@ -412,7 +416,11 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
         queryParam.setOrderRule(orderRule);
 
+        //系统人员核算明细
         List<InsuranceAccountDetailPO> list = getInsuranceAccountDetailMapper().list(queryParam);
+        //非系统人员核算明细
+        List<InsuranceAccountDetailPO> extList = getInsuranceAccountDetailMapper().extList(queryParam);
+        list.addAll(extList);
         PageInfo<InsuranceAccountDetailPO> pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(),queryParam.getPageSize(),
                 list, InsuranceAccountDetailPO.class);
         List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = pageInfo.getList();
@@ -469,7 +477,11 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         queryParam.setOrderRule(orderRule);
 
         SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        //系统人员核算明细
         List<InsuranceAccountDetailPO> list = getInsuranceAccountDetailMapper().list(queryParam);
+        //非系统人员核算明细
+        List<InsuranceAccountDetailPO> extList = getInsuranceAccountDetailMapper().extList(queryParam);
+        list.addAll(extList);
         PageInfo<InsuranceAccountDetailPO> pageInfo = new PageInfo<>(list, InsuranceAccountDetailPO.class);
         List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = pageInfo.getList();
         encryptUtil.decryptList(insuranceAccountDetailPOS, InsuranceAccountDetailPO.class);
@@ -1524,7 +1536,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 //        Map<String, Long> taxAgentNameMap = SalaryEntityUtil.convert2Map(taxAgents, TaxAgentPO::getName, TaxAgentPO::getId);
 
         // 获取租户下所有的人员
-        List<DataCollectionEmployee> salaryEmployees = getSalaryEmployeeService(user).listAll(UseEmployeeTypeEnum.ORG);
+        List<DataCollectionEmployee> salaryEmployees = getSalaryEmployeeService(user).listAll(UseEmployeeTypeEnum.ALL);
 
         // 失败的数量
         int failCount = 0;
@@ -2282,7 +2294,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         }
 
         // 获取租户下所有的人员
-        List<DataCollectionEmployee> salaryEmployees = getSalaryEmployeeService(user).listAll(UseEmployeeTypeEnum.ORG);
+        List<DataCollectionEmployee> salaryEmployees = getSalaryEmployeeService(user).listAll(UseEmployeeTypeEnum.ALL);
 
         // 失败的数量
         int failCount = 0;
@@ -3235,7 +3247,11 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
         queryParam.setOrderRule(orderRule);
 
+        //系统人员核算明细
         List<InsuranceAccountDetailPO> list = getInsuranceAccountDetailMapper().list(queryParam);
+        //非系统人员核算明细
+        List<InsuranceAccountDetailPO> extList = getInsuranceAccountDetailMapper().extList(queryParam);
+        list.addAll(extList);
         encryptUtil.decryptList(list, InsuranceAccountDetailPO.class);
         //数据组装
         List<Map<String, Object>> records = getService(user).buildCommonRecords(list, employeeId);
@@ -3270,7 +3286,11 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
         queryParam.setOrderRule(orderRule);
 
+        //系统人员核算明细
         List<InsuranceAccountDetailPO> list = getInsuranceAccountDetailMapper().list(queryParam);
+        //非系统人员核算明细
+        List<InsuranceAccountDetailPO> extList = getInsuranceAccountDetailMapper().extList(queryParam);
+        list.addAll(extList);
         encryptUtil.decryptList(list, InsuranceAccountDetailPO.class);
         //数据组装
         List<Map<String, Object>> records = getService(user).buildCommonRecords(list, employeeId);
@@ -3305,7 +3325,11 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         queryParam.setOrderRule(orderRule);
 
         SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        //系统人员核算明细
         List<InsuranceAccountDetailPO> list = getInsuranceAccountDetailMapper().list(queryParam);
+        //非系统人员核算明细
+        List<InsuranceAccountDetailPO> extList = getInsuranceAccountDetailMapper().extList(queryParam);
+        list.addAll(extList);
         encryptUtil.decryptList(list, InsuranceAccountDetailPO.class);
         //数据组装
         List<Map<String, Object>> records = getService(user).buildCommonRecords(list, employeeId);
@@ -3343,7 +3367,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                 }
                 value = value.add(addValue);
             }
-            sumRow.put(numKey,value);
+//            sumRow.put(numKey,value);
+            sumRow.put(numKey,String.format("%.2f", value));
+
         }
         return sumRow;
     }
diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
index 43f2052a5..097c2717c 100644
--- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
@@ -659,7 +659,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
 
             //获取所有福利档案基础信息
             List<InsuranceArchivesBaseInfoPO> archiveListDTOS = getInsuranceBaseInfoMapper().listAll();
-            list = archiveListDTOS.stream().filter(dto -> taxAgentIds.contains(dto.getPaymentOrganization()) && !Objects.equals(dto.getEmployeeType(), 1)).collect(Collectors.toList());
+            list = archiveListDTOS.stream().filter(dto -> taxAgentIds.contains(dto.getPaymentOrganization())).collect(Collectors.toList());
 
             Boolean adminEnable = getTaxAgentService(user).isAdminEnable(currentEmployeeId);
             //不是管理员看不到数据，返回空
@@ -668,7 +668,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
             }
 
         } else {
-            list = getInsuranceBaseInfoMapper().listAll().stream().filter(dto -> !Objects.equals(dto.getEmployeeType(), 1)).collect(Collectors.toList());;
+            list = getInsuranceBaseInfoMapper().listAll();
         }
 
 
@@ -676,24 +676,32 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
         long payTotal = 0L;
         long stayDelTotal = 0L;
         long stopTotal = 0L;
+        long extTotal = 0L;
 
         for (InsuranceArchivesBaseInfoPO baseInfoPO : list) {
-            if (baseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_ADD.getValue())) {
-                stayAddTotal += 1;
-            } else if (baseInfoPO.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()) || baseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())) {
-                payTotal += 1;
-                if (baseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())) {
-                    stayDelTotal += 1;
+            Integer employeeType = baseInfoPO.getEmployeeType();
+            if (employeeType == null || employeeType == 0) {
+                if (baseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_ADD.getValue())) {
+                    stayAddTotal += 1;
+                } else if (baseInfoPO.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()) || baseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())) {
+                    payTotal += 1;
+                    if (baseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())) {
+                        stayDelTotal += 1;
+                    }
+                } else if (baseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STOP_PAYMENT_FROM_ADD.getValue()) || baseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STOP_PAYMENT_FROM_DEL.getValue())) {
+                    stopTotal += 1;
                 }
-            } else if (baseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STOP_PAYMENT_FROM_ADD.getValue()) || baseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STOP_PAYMENT_FROM_DEL.getValue())) {
-                stopTotal += 1;
+            } else {
+                extTotal += 1;
             }
+
         }
 
         result.put("stayAdd", stayAddTotal);
         result.put("paying", payTotal);
         result.put("stayDel", stayDelTotal);
         result.put("stopPay", stopTotal);
+        result.put("ext", extTotal);
         return result;
     }
 
diff --git a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
index e237ea7f4..f677966d2 100644
--- a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
@@ -104,6 +104,7 @@ public class SICompensationServiceImpl extends Service implements SICompensation
             partition.forEach(p -> {
                 param.setIds(p);
                 resultData.addAll(getEmployMapper().listHrmInfoByIdAndName(param));
+                resultData.addAll(getEmployMapper().listExtHrmInfoByIdAndName(param));
             });
 
         }
diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java
index e66059a96..adcdbc8f7 100644
--- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java
@@ -158,6 +158,9 @@ public class SIExportServiceImpl extends Service implements SIExportService {
         List<AccountExportPO> accountExportPOS = new ArrayList<>();
         if (paymentStatus.equals(PaymentStatusEnum.RECESSION.getValue())) {
             accountExportPOS = getInsuranceExportMapper().exportRecessionAccount(paymentStatus, param);
+            //非系统人员核算明细
+            List<AccountExportPO> extAccountExportPOS = getInsuranceExportMapper().exportExtAccount(paymentStatus, param);
+            accountExportPOS.addAll(extAccountExportPOS);
             // 分权逻辑
             Boolean needAuth = getTaxAgentService(user).isNeedAuth((long) user.getUID());
             if (needAuth) {
@@ -174,6 +177,9 @@ public class SIExportServiceImpl extends Service implements SIExportService {
             }
         } else {
             accountExportPOS = getInsuranceExportMapper().exportAccount(paymentStatus, param);
+            //非系统人员核算明细
+            List<AccountExportPO> extAccountExportPOS = getInsuranceExportMapper().exportExtAccount(paymentStatus, param);
+            accountExportPOS.addAll(extAccountExportPOS);
         }
 
 //        //过滤出福利档案基础信息表中runStatus为正在缴纳和待减员的人员
diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
index a29848e61..81999f2db 100644
--- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
@@ -1044,7 +1044,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
             }
         }
         //生成福利档案基础信息数据
-        InsuranceArchivesBaseInfoPO insuranceArchivesBaseInfoPO = buildBaseInfoPO(employeeId, singleAccount, paymentNameIdMap, creator, runStatus);
+        InsuranceArchivesBaseInfoPO insuranceArchivesBaseInfoPO = buildBaseInfoPO(employeeId, singleAccount, paymentNameIdMap, creator, runStatus, employees.get(0).isExtEmp());
         if (!isError) {
             insuranceArchivesAccountPO.setSocial(insuranceArchivesSocialSchemePO);
             insuranceArchivesAccountPO.setFund(insuranceArchivesFundSchemePO);
@@ -1127,13 +1127,13 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
             insuranceArchivesSocialSchemePO.setSocialSchemeId(socialSchemeId);
         }
         String socialStartDate = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91319, "社保起始缴纳月")).get(SalaryI18nUtil.getI18nLabel(91319, "社保起始缴纳月"));
-        if (StringUtils.isNotBlank(socialStartDate) && socialStartDate.length() > 7) {
+        if (StringUtils.isNotBlank(socialStartDate) && socialStartDate.length() >= 7) {
             socialStartDate = socialStartDate.substring(0, 7);
             insuranceArchivesSocialSchemePO.setSocialStartTime(socialStartDate);
         }
 
         String socialEndDate = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91320, "社保最后缴纳月")).get(SalaryI18nUtil.getI18nLabel(91320, "社保最后缴纳月"));
-        if (StringUtils.isNotBlank(socialEndDate) && socialEndDate.length() > 7) {
+        if (StringUtils.isNotBlank(socialEndDate) && socialEndDate.length() >= 7) {
             socialEndDate = socialEndDate.substring(0, 7);
             insuranceArchivesSocialSchemePO.setSocialEndTime(socialEndDate);
         }
@@ -1215,13 +1215,13 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
             insuranceArchivesFundSchemePO.setSupplementFundAccount(supplementFundAccount);
         }
         String fundStartDate = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91483, "公积金起始缴纳月")).get(SalaryI18nUtil.getI18nLabel(91483, "公积金起始缴纳月"));
-        if (StringUtils.isNotBlank(fundStartDate) && fundStartDate.length() > 7) {
+        if (StringUtils.isNotBlank(fundStartDate) && fundStartDate.length() >= 7) {
             fundStartDate = fundStartDate.substring(0, 7);
             insuranceArchivesFundSchemePO.setFundStartTime(fundStartDate);
         }
 
         String fundEndDate = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91484, "公积金最后缴纳月")).get(SalaryI18nUtil.getI18nLabel(91484, "公积金最后缴纳月"));
-        if (StringUtils.isNotBlank(fundEndDate) && fundEndDate.length() > 7) {
+        if (StringUtils.isNotBlank(fundEndDate) && fundEndDate.length() >= 7) {
             fundEndDate = fundEndDate.substring(0, 7);
             insuranceArchivesFundSchemePO.setFundEndTime(fundEndDate);
         }
@@ -1291,13 +1291,13 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
             insuranceArchivesOtherSchemePO.setOtherSchemeId(otherSchemeId);
         }
         String otherStartDate = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91490, "其他福利起始缴纳月")).get(SalaryI18nUtil.getI18nLabel(91490, "其他福利起始缴纳月"));
-        if (StringUtils.isNotBlank(otherStartDate) && otherStartDate.length() > 7) {
+        if (StringUtils.isNotBlank(otherStartDate) && otherStartDate.length() >= 7) {
             otherStartDate = otherStartDate.substring(0, 7);
             insuranceArchivesOtherSchemePO.setOtherStartTime(otherStartDate);
         }
 
         String otherEndDate = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91494, "其他福利最后缴纳月")).get(SalaryI18nUtil.getI18nLabel(91494, "其他福利最后缴纳月"));
-        if (StringUtils.isNotBlank(otherEndDate) && otherEndDate.length() > 7) {
+        if (StringUtils.isNotBlank(otherEndDate) && otherEndDate.length() >= 7) {
             otherEndDate = otherEndDate.substring(0, 7);
             insuranceArchivesOtherSchemePO.setOtherEndTime(otherEndDate);
         }
@@ -1332,7 +1332,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
         return insuranceArchivesOtherSchemePO;
     }
 
-    public InsuranceArchivesBaseInfoPO buildBaseInfoPO(Long employeeId, List<Map<String, Object>> singleAccount, Map<String, Long> paymentNameIdMap, Long creator, String runStatus) {
+    public InsuranceArchivesBaseInfoPO buildBaseInfoPO(Long employeeId, List<Map<String, Object>> singleAccount, Map<String, Long> paymentNameIdMap, Long creator, String runStatus, Boolean isExtEmp) {
         if (employeeId == null) {
             return null;
         }
@@ -1346,6 +1346,9 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
         insuranceArchivesBaseInfoPO.setUpdateTime(new Date());
         insuranceArchivesBaseInfoPO.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY);
         insuranceArchivesBaseInfoPO.setPaymentOrganization(paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91497, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(91497, "个税扣缴义务人"))));
+        if (isExtEmp) {
+            insuranceArchivesBaseInfoPO.setEmployeeType(1);
+        }
 
         return insuranceArchivesBaseInfoPO;
     }
diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
index 4486790f7..6e19d15a5 100644
--- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
@@ -485,10 +485,10 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM
 //        //生成档案
         getSalaryArchiveService(user).handleChangeData(1L);
 //        //生成社保福利档案
-//        String welSign = (String) Util_DataCache.getObjVal("welfareChangeSign");
-//        if (welSign == null || "0".equals(welSign)) {
-//            getSIArchivesService(user).handleChangeData(1L);
-//        }
+        String welSign = (String) Util_DataCache.getObjVal("welfareChangeSign");
+        if (welSign == null || "0".equals(welSign)) {
+            getSIArchivesService(user).handleChangeData(1L);
+        }
     }