【线上来佣比对】导出加组织体系

yd-api/src/main/java/com/yd/dal/entity/customer/AclInsurerBranch.java

 package com.yd.dal.entity.customer;
 
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
     * 保险公司分公司/营业部
     */
 @Data
-public class AclInsurerBranch {
+public class AclInsurerBranch implements Serializable {
+    private static final long serialVersionUID = 1L;
     /**
     * serial id
     */

yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitioner.java

@@ -254,4 +254,8 @@ public class AclPractitioner {
      * 育成人id
      */
     private Long raiseId;
+
+    private Long s1Id;
+    private Long s2Id;
+    private Long s3Id;
 }

yd-api/src/main/java/com/yd/dal/mapper/customer/AclInsurerBranchMapper.java

 package com.yd.dal.mapper.customer;
 
 import com.yd.dal.entity.customer.AclInsurerBranch;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface AclInsurerBranchMapper {
     int deleteByPrimaryKey(Long id);
 
@@ -22,4 +23,6 @@ public interface AclInsurerBranchMapper {
     int updateBatchSelective(List<AclInsurerBranch> list);
 
     int batchInsert(@Param("list") List<AclInsurerBranch> list);
+
+    List<AclInsurerBranch> findAll();
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerSubordinateSystemMapper.java

@@ -40,4 +40,6 @@ public interface AclPractitionerSubordinateSystemMapper {
     List<AclPractitionerSubordinateSystem> findDeptIdAndInsureBranchIdNull(Long  insurerId);
 
     List<AclPractitionerSubordinateSystem> findDeptIdNotNull(Long insurerId);
+
+    List<AclPractitionerSubordinateSystem> findAll();
 }

yd-api/src/main/java/com/yd/dal/service/customer/AclInsurerBranchDALService.java

@@ -2,9 +2,13 @@ package com.yd.dal.service.customer;
 
 import com.yd.dal.entity.customer.AclInsurerBranch;
 
+import java.util.List;
+
 /**
  * @author xxy
  */
 public interface AclInsurerBranchDALService {
     void update(AclInsurerBranch branch);
+
+    List<AclInsurerBranch> findAll();
 }

yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerSubordinateSystemDALService.java

@@ -48,4 +48,5 @@ public interface AclPractitionerSubordinateSystemDALService {
      */
     public void orgRecursion(List<AclPractitionerSubordinateSystem> childOrg, List<AclPractitionerSubordinateSystem> allList, Long pid);
 
+    List<AclPractitionerSubordinateSystem> findAll();
 }

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclInsurerBranchDALServiceImpl.java

@@ -6,6 +6,7 @@ import com.yd.dal.service.customer.AclInsurerBranchDALService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @author xxy
@@ -19,4 +20,9 @@ public class AclInsurerBranchDALServiceImpl implements AclInsurerBranchDALServic
     public void update(AclInsurerBranch branch) {
         mapper.updateByPrimaryKeySelective(branch);
     }
+
+    @Override
+    public List<AclInsurerBranch> findAll() {
+        return mapper.findAll();
+    }
 }

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerSubordinateSystemDALServiceImpl.java

@@ -155,4 +155,9 @@ public class AclPractitionerSubordinateSystemDALServiceImpl implements AclPracti
             }
         }
     }
+
+    @Override
+    public List<AclPractitionerSubordinateSystem> findAll() {
+        return aclPractitionerSubordinateSystemMapper.findAll();
+    }
 }

yd-api/src/main/java/com/yd/rmi/cache/SystemConfigService.java

 package com.yd.rmi.cache;
 
+import com.yd.dal.entity.customer.AclInsurerBranch;
 import com.yd.dal.entity.meta.*;
+import com.yd.dal.service.customer.AclInsurerBranchDALService;
 import com.yd.dal.service.meta.*;
 import com.yd.rmi.ali.ossinterf.service.AliOssInterfService;
 import com.yd.util.CommonUtil;
@@ -10,10 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -35,6 +34,8 @@ public class SystemConfigService implements CommandLineRunner{
 	private MdIncometaxRateDALService mdIncometaxRateDALService;
 	@Autowired
 	private MdDropOptionsDALService mdDropOptionsDALService;
+	@Autowired
+	private AclInsurerBranchDALService aclInsurerBranchDALService;
 
 	/**
 	 * 保存cache
@@ -308,4 +309,23 @@ public class SystemConfigService implements CommandLineRunner{
 		}
 		return hiringApproveSteps;
 	}
+
+    public Map<Long, AclInsurerBranch> getAclInsurerBranchMap() {
+        Map<Long, AclInsurerBranch> map = null;
+        Element element = systemConfigCache.get("aclInsurerBranchMap");
+        if (element != null && element.getObjectValue() != null) {
+            map = (Map<Long, AclInsurerBranch>) element.getObjectValue();
+        } else {
+            List<AclInsurerBranch> list = aclInsurerBranchDALService.findAll();
+            if (list != null && list.size() > 0) {
+                map = new HashMap<Long, AclInsurerBranch>();
+                for (AclInsurerBranch item : list) {
+                    map.put(item.getId(), item);
+                }
+            }
+            element = new Element("aclInsurerBranchMap", map);
+            systemConfigCache.put(element);
+        }
+        return map;
+    }
 }

yd-api/src/main/resources/mapper/customer/AclInsurerBranchMapper.xml

@@ -463,4 +463,12 @@
         #{item.updatedBy,jdbcType=BIGINT})
     </foreach>
   </insert>
+
+  <select id="findAll" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select
+    <include refid="Base_Column_List" />
+    from ag_acl_insurer_branch
+  </select>
+
 </mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml

@@ -50,6 +50,10 @@
     <result column="can_login_dyd" jdbcType="BIGINT" property="canLoginDyd" />
     <result column="can_see_salary_list" jdbcType="BIGINT" property="canSeeSalaryList" />
     <result column="raise_id" jdbcType="BIGINT" property="raiseId" />
+
+    <result column="s1_id" jdbcType="BIGINT" property="s1Id" />
+    <result column="s2_id" jdbcType="BIGINT" property="s2Id" />
+    <result column="s3_id" jdbcType="BIGINT" property="s3Id" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
@@ -60,7 +64,7 @@
     province_id, province_name, city_id, city_name, cert_list, bio_intro, wechat_id,
     qq_id, is_profile_show, is_name_show, is_mobile_show, education_level, graduated_university,
     mentor_id, introducer_id, gender, contract_oss_path, hiring_basic_info_id, can_login_dyd,
-    can_see_salary_list,raise_id
+    can_see_salary_list,raise_id,s1_id,s2_id,s3_id
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->

yd-api/src/main/resources/mapper/customer/AclPractitionerSubordinateSystemMapper.xml

@@ -350,6 +350,11 @@
     SELECT t.* FROM ag_acl_practitioner_subordinate_system t WHERE t.insurer_branch_id is  null and t.dept_id  is not null and t.is_active = 1 and t.insurer_id=  #{insurerId,jdbcType=BIGINT}
   </select>
 
+  <select id="findAll" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ag_acl_practitioner_subordinate_system
+  </select>