【电子报聘】报聘经纪人所属体系规则优化4

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java

@@ -990,7 +990,9 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
             }
             }
         }
         }
         systemConfigService.putIntoListOfSubsystemOwner(approvedBy, hiringBasicInfoId);
         systemConfigService.putIntoListOfSubsystemOwner(approvedBy, hiringBasicInfoId);
-
+        // 保存审批的负责人
+        hiringMemberShip.setApprovedBy(approvedBy);
+        membershipMapper.updateByPrimaryKeySelective(hiringMemberShip);
     }
     }
 
 
     private String handleApproveStatus(AclPractitionerHiringMembership hiringMemberShip) {
     private String handleApproveStatus(AclPractitionerHiringMembership hiringMemberShip) {

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

@@ -101,6 +101,8 @@ public class AclPractitionerHiringMembership {
 
 
     private Long updatedBy;
     private Long updatedBy;
 
 
+    private Long approvedBy;
+
     /**
     /**
      * 辅导人的组织架构信息
      * 辅导人的组织架构信息
      */
      */

yd-api/src/main/java/com/yd/dal/mapper/practitioner/PractitionerHiringMapper.java

@@ -13,42 +13,55 @@ import java.util.Map;
 public interface PractitionerHiringMapper {
 public interface PractitionerHiringMapper {
     /**
     /**
      * 通过经纪人id查询此人审批的报聘经纪人
      * 通过经纪人id查询此人审批的报聘经纪人
+     *
      * @param practitionerId 经纪人id
      * @param practitionerId 经纪人id
      * @return 返回结果
      * @return 返回结果
      */
      */
-    List<HiringListInfo> findHiringList(@Param("practitionerId")Long practitionerId, @Param("approvingStatus")Long approvingStatus);
+    List<HiringListInfo> findHiringList(@Param("practitionerId") Long practitionerId, @Param("approvingStatus") Long approvingStatus);
+
     /**
     /**
      * 经纪人审批基本信息
      * 经纪人审批基本信息
+     *
      * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      * @return 查询结果
      * @return 查询结果
      */
      */
     HiringBasicInfo findHiringBasicInfo(Long hiringBasicInfoId);
     HiringBasicInfo findHiringBasicInfo(Long hiringBasicInfoId);
+
     /**
     /**
      * 审批经纪人关系
      * 审批经纪人关系
+     *
      * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      * @return 查询结果
      * @return 查询结果
      */
      */
     HiringMemberShip findHiringMemberShip(Long hiringBasicInfoId);
     HiringMemberShip findHiringMemberShip(Long hiringBasicInfoId);
+
     /**
     /**
      * 审批经纪人工作经历
      * 审批经纪人工作经历
+     *
      * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      * @return 查询结果
      * @return 查询结果
      */
      */
     List<HiringWorkingExperience> findHiringWorkingExperienceList(Long hiringBasicInfoId);
     List<HiringWorkingExperience> findHiringWorkingExperienceList(Long hiringBasicInfoId);
+
     /**
     /**
      * 经纪人申请名目
      * 经纪人申请名目
+     *
      * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      * @return 查询结果
      * @return 查询结果
      */
      */
     List<HiringPersonalStatements> findHiringPersonalStatementsList(Long hiringBasicInfoId);
     List<HiringPersonalStatements> findHiringPersonalStatementsList(Long hiringBasicInfoId);
+
     /**
     /**
      * 经纪人合同条款是否同意
      * 经纪人合同条款是否同意
+     *
      * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      * @return 查询结果
      * @return 查询结果
      */
      */
     List<HiringContractTermsConfirms> findHiringContractTermsConfirmsList(Long hiringBasicInfoId);
     List<HiringContractTermsConfirms> findHiringContractTermsConfirmsList(Long hiringBasicInfoId);
+
     /**
     /**
      * 已审批结果
      * 已审批结果
+     *
      * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      * @return 查询结果
      * @return 查询结果
      */
      */
@@ -58,15 +71,16 @@ public interface PractitionerHiringMapper {
 
 
     /**
     /**
      * ydLife查询当前经纪人已通过或拒绝的报聘记录
      * ydLife查询当前经纪人已通过或拒绝的报聘记录
+     *
      * @param practitionerId
      * @param practitionerId
      * @param approvingStatus
      * @param approvingStatus
      * @return
      * @return
      */
      */
-    List<HiringListInfo> queryHandledList(@Param("practitionerId")Long practitionerId, @Param("approvingStatus")int approvingStatus);
+    List<HiringListInfo> queryHandledList(@Param("practitionerId") Long practitionerId, @Param("approvingStatus") int approvingStatus);
 
 
     List<HiringListInfo> queryMentorUnhandledList(Long practitionerId);
     List<HiringListInfo> queryMentorUnhandledList(Long practitionerId);
 
 
-    List<HiringListInfo> querySystemOwnerUnhandledList(List<Long> list);
+    List<HiringListInfo> querySystemOwnerUnhandledList(@Param("list") List<Long> list, @Param("practitionerId") Long practitionerId);
 
 
     String getNextContractNo();
     String getNextContractNo();
 
 

yd-api/src/main/java/com/yd/dal/service/practitioner/impl/PractitionerHiringDALServiceImpl.java

@@ -231,7 +231,7 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
             listOfSubsystemOwner = this.queryBasicInfoIdList(listOfSubsystemOwner);
             listOfSubsystemOwner = this.queryBasicInfoIdList(listOfSubsystemOwner);
         }
         }
         if (CollectionUtils.isNotEmpty(listOfSubsystemOwner)) {
         if (CollectionUtils.isNotEmpty(listOfSubsystemOwner)) {
-            resultList = practitionerHiringMapper.querySystemOwnerUnhandledList(listOfSubsystemOwner);
+            resultList = practitionerHiringMapper.querySystemOwnerUnhandledList(listOfSubsystemOwner, practitionerId);
         }
         }
         return resultList;
         return resultList;
     }
     }

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

@@ -23,13 +23,14 @@
     <result column="created_by" jdbcType="BIGINT" property="createdBy" />
     <result column="created_by" jdbcType="BIGINT" property="createdBy" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
     <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
+    <result column="approved_by" jdbcType="BIGINT" property="approvedBy" />
   </resultMap>
   </resultMap>
   <sql id="Base_Column_List">
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     <!--@mbg.generated-->
     id, hiring_basic_info_id, md_drop_option_id, md_drop_option_name, mentor_practitioner_id, 
     id, hiring_basic_info_id, md_drop_option_id, md_drop_option_name, mentor_practitioner_id, 
     mentor, introducer_practitioner_id, introducer, subsystem_id, subsystem, subsystem_owner_id, 
     mentor, introducer_practitioner_id, introducer, subsystem_id, subsystem, subsystem_owner_id, 
     subsystem_owner, branch_id, branch, is_active, created_at, created_by, 
     subsystem_owner, branch_id, branch, is_active, created_at, created_by, 
-    updated_at, updated_by
+    updated_at, updated_by, approved_by
   </sql>
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
     <!--@mbg.generated-->
@@ -243,6 +244,9 @@
       <if test="updatedBy != null">
       <if test="updatedBy != null">
         updated_by = #{updatedBy,jdbcType=BIGINT},
         updated_by = #{updatedBy,jdbcType=BIGINT},
       </if>
       </if>
+      <if test="approvedBy != null">
+        approved_by = #{approvedBy,jdbcType=BIGINT},
+      </if>
     </set>
     </set>
     where id = #{id,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
   </update>

yd-api/src/main/resources/mapper/practitioner/PractitionerHiringMapper.xml

@@ -129,7 +129,7 @@
                mentor              mentor,
                mentor              mentor,
                introducer          introducer,
                introducer          introducer,
                subsystem           subsystem,
                subsystem           subsystem,
-               subsystem_owner     subsystemOwner,
+               (select name from ag_acl_practitioner where id = approved_by)     subsystemOwner,
                branch              branch
                branch              branch
         from ag_acl_practitioner_hiring_membership
         from ag_acl_practitioner_hiring_membership
         where hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
         where hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}