1.ydLife被邀请人基本信息手机号和证件号被加密

2.ydLife查询接添加被邀请人被拒绝后后已修改的状态&面试意见输入项&审批状态筛选 3.已审批结果添加审批人职位和头像

1.ydLife被邀请人基本信息手机号和证件号被加密
2.ydLife查询接添加被邀请人被拒绝后后已修改的状态&面试意见输入项&审批状态筛选 3.已审批结果添加审批人职位和头像
a5384511 · jianan · f42c92fe · a5384511 · a5384511 · a5384511
Commit a5384511 authored Jan 13, 2021 by jianan
15 changed files
--- a/yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java
@@ -148,6 +148,8 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
        //查询此人的审批流程
        PractitionerHiringMemberShip practitionerHiringMemberShip = agmsHiringDalService.findPractitionerHiringMemberShip(hiringBasicInfoId);
        List<MdPractitionerHiringApproveSteps> hiringApproveStepsList = systemConfigService.findHiringApproveStepsByPractitionerLevel(practitionerHiringMemberShip.getPractitionerLevelId());
        //保存审批结果
        saveRecords(loginPractitionerId,user.getMobileNo(), hiringApproveStepsList, requestVO, responseVO);
        if (responseVO.getCommonResult().isSuccess()){
@@ -175,6 +177,10 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
                             PractitionerHiringApproveResponseVO responseVO) {
        BeanPropertyValueEqualsPredicate predicate = new BeanPropertyValueEqualsPredicate("stepSeq",requestVO.getHiringApproveStepsSeq());
        List<MdPractitionerHiringApproveSteps> steps = (List<MdPractitionerHiringApproveSteps>) CollectionUtils.select(hiringApproveStepsList,predicate);
+        System.out.println("看看审批操作中处理后的步骤是不是每次都只有一个");
+        System.out.println(steps);
        if (steps.size() != 1){
            responseVO.setHiringBasicInfoId(requestVO.getHiringBasicInfoId());
            responseVO.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("830025")));

--- a/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java
@@ -5,9 +5,12 @@ import com.yd.api.practitioner.vo.hiring.*;
 import com.yd.api.result.CommonResult;
 import com.yd.dal.entity.agms.hiring.PractitionerHiringWorkingExperience;
 import com.yd.dal.entity.customer.*;
+import com.yd.dal.entity.customer.practitioner.PractitionerInfo;
 import com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps;
 import com.yd.dal.entity.practitioner.hiring.*;
 import com.yd.dal.mapper.customer.*;
+import com.yd.dal.service.customer.AclFileUploadDALService;
+import com.yd.dal.service.customer.AclPractitionerDALService;
 import com.yd.dal.service.customer.AclPractitionerHiringApproveRecordsDALService;
 import com.yd.dal.service.practitioner.PractitionerHiringDALService;
 import com.yd.rmi.ali.oss.service.OssService;
@@ -33,7 +36,6 @@ import java.util.*;
 @Service
 public class PractitionerHiringServiceImpl implements PractitionerHiringService {
    @Autowired
    private OssService ossService;
    @Autowired
@@ -46,6 +48,10 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService 
    private AclPractitionerHiringPersonalStatementsMapper personalStatementsMapper;
    @Autowired
    private AclPractitionerHiringContractTermsConfirmsMapper contractTermsConfirmsMapper;
+    @Autowired
+    private AclPractitionerDALService aclPractitionerDALService;
+    @Autowired
+    private AclFileUploadDALService aclFileUploadDALService;
    private PractitionerHiringDALService practitionerHiringDalService;
    private SystemConfigService systemConfigService;
@@ -381,7 +387,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService 
    public HiringListQueryResponseVO listQuery(HiringListQueryRequestVO requestVO) {
        HiringListQueryResponseVO responseVO = new HiringListQueryResponseVO();
        Long practitionerId = requestVO.getPractitionerId();
-        List<HiringListInfo>  hiringListInfoList = practitionerHiringDalService.findHiringList(practitionerId);
+        Long approvingStatus = requestVO.getApprovingStatus();
+        List<HiringListInfo>  hiringListInfoList = practitionerHiringDalService.findHiringList(practitionerId, approvingStatus);
        responseVO.setHiringListInfoList(hiringListInfoList);
        responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
        return responseVO;
@@ -417,8 +424,17 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService 
        List<HiringContractTermsConfirms> hiringContractTermsConfirmsList = practitionerHiringDalService.findHiringContractTermsConfirmsList(hiringBasicInfoId);
        //已审批结果
        List<HiringApproveRecords> hiringApproveRecordsList = practitionerHiringDalService.findHiringApproveRecordsList(hiringBasicInfoId);
        //查询是否可进行审批操作 0.不可审批(未到)  1.可审批  2.已审批 4.已驳回
        HiringApproveSteps hiringApproveSteps = getHiringApproveStatus(practitionerId, approvalIdentity, hiringApproveRecordsList);
+        PractitionerInfo practitionerInfo = aclPractitionerDALService.findPractitionerInfoByPractitionerId(practitionerId);
+        //获取头像
+        CustomerFileUpload fileUpload = aclFileUploadDALService.findFilePathInfo(1,1,practitionerId);
+        String imagePath = (fileUpload != null) ? fileUpload.getFilePath() : null;
+        responseVO.setLevelName(practitionerInfo.getLevelName());
+        responseVO.setHeadImagePath(imagePath);
        responseVO.setHiringBasicInfoId(hiringBasicInfoId);
        responseVO.setHiringApproveSteps(hiringApproveSteps);
        responseVO.setHiringBasicInfo(hiringBasicInfo);
@@ -628,6 +644,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService 
        records.setApproveStepName(step.getStepName());
        records.setApprovingPractitionerId(requestVO.getPractitionerId());
        records.setApprovingStatus(requestVO.getApprovingStatus());
+        records.setInterviewAssessment(requestVO.getInterviewAssessment());
        records.setRejectNote(requestVO.getRejectNote());
        records.setIsActive(1);
        records.setCreatedAt(new Date());

--- a/yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/HiringApproveRequestVO.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/HiringApproveRequestVO.java
@@ -25,6 +25,10 @@ public class HiringApproveRequestVO {
     */
    private Long approvingStatus;
    /**
+     * 面试评价
+     */
+    private String interviewAssessment;
+    /**
     * 备注，驳回原因
     */
    private String rejectNote;
@@ -149,4 +153,12 @@ public class HiringApproveRequestVO {
                ", rejectNote='" + rejectNote + '\'' +
                '}';
    }
+    public String getInterviewAssessment() {
+        return interviewAssessment;
+    }
+    public void setInterviewAssessment(String interviewAssessment) {
+        this.interviewAssessment = interviewAssessment;
+    }
 }
--- a/yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/HiringDetailQueryResponseVO.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/HiringDetailQueryResponseVO.java
@@ -14,6 +14,14 @@ public class HiringDetailQueryResponseVO {
     */
    private Long hiringBasicInfoId;
    /**
+     * 头像
+     */
+    private String headImagePath;
+    /**
+     * 级别
+     */
+    private String levelName;
+    /**
     * 经纪人审批步骤/状态
     */
    private HiringApproveSteps hiringApproveSteps;
@@ -221,4 +229,20 @@ public class HiringDetailQueryResponseVO {
                ", commonResult=" + commonResult +
                '}';
    }
+    public void setHeadImagePath(String headImagePath) {
+        this.headImagePath = headImagePath;
+    }
+    public String getHeadImagePath() {
+        return headImagePath;
+    }
+    public String getLevelName() {
+        return levelName;
+    }
+    public void setLevelName(String levelName) {
+        this.levelName = levelName;
+    }
 }
--- a/yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/HiringListQueryRequestVO.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/HiringListQueryRequestVO.java
@@ -8,6 +8,10 @@ public class HiringListQueryRequestVO {
     * 经纪人id
     */
    private Long practitionerId;
+    /**
+     * 0：待审批 1：通过 2：拒绝
+     */
+    private Long approvingStatus;
    /**
@@ -28,10 +32,11 @@ public class HiringListQueryRequestVO {
        this.practitionerId = practitionerId;
    }
-    @Override
+    public Long getApprovingStatus() {
-    public String toString() {
+        return approvingStatus;
-        return "HiringListQueryRequestVO{" +
+    }
-                "practitionerId=" + practitionerId +
-                '}';
+    public void setApprovingStatus(Long approvingStatus) {
+        this.approvingStatus = approvingStatus;
    }
 }
--- a/yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerMapper.java
+++ b/yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerMapper.java
@@ -72,4 +72,6 @@ public interface AclPractitionerMapper {
    List<Long> queryTeamAllPractitionerId(Long practitionerId);
    List<Long> queryMentoredByPractitionerId(Long practitionerId);
+    PractitionerInfo findPractitionerInfoByPractitionerId(Long practitionerId);
 }
\ No newline at end of file
--- a/yd-api/src/main/java/com/yd/dal/mapper/practitioner/PractitionerHiringMapper.java
+++ b/yd-api/src/main/java/com/yd/dal/mapper/practitioner/PractitionerHiringMapper.java
@@ -2,6 +2,7 @@ package com.yd.dal.mapper.practitioner;
 import com.yd.api.practitioner.vo.hiring.PractitionerHiringContractTerms;
 import com.yd.dal.entity.practitioner.hiring.*;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -14,7 +15,7 @@ public interface PractitionerHiringMapper {
     * @param practitionerId 经纪人id
     * @return 返回结果
     */
-    List<HiringListInfo> findHiringList(Long practitionerId);
+    List<HiringListInfo> findHiringList(@Param("practitionerId")Long practitionerId, @Param("approvingStatus")Long approvingStatus);
    /**
     * 经纪人审批基本信息
     * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id

--- a/yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerDALService.java
+++ b/yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerDALService.java
@@ -183,4 +183,6 @@ public interface AclPractitionerDALService {
    List<Long> queryMentoredByPractitionerId(Long practitionerId);
    void save(AclPractitioner practitioner);
+    PractitionerInfo findPractitionerInfoByPractitionerId(Long practitionerId);
 }
--- a/yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerDALServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerDALServiceImpl.java
@@ -185,4 +185,9 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService 
    public void save(AclPractitioner practitioner) {
        aclPractitionerMapper.insert(practitioner);
    }
+    @Override
+    public PractitionerInfo findPractitionerInfoByPractitionerId(Long practitionerId) {
+        return aclPractitionerMapper.findPractitionerInfoByPractitionerId(practitionerId);
+    }
 }
--- a/yd-api/src/main/java/com/yd/dal/service/practitioner/PractitionerHiringDALService.java
+++ b/yd-api/src/main/java/com/yd/dal/service/practitioner/PractitionerHiringDALService.java
@@ -12,12 +12,12 @@ import java.util.List;
 */
 public interface PractitionerHiringDALService {
    /**
-     * 通过经纪人id查询此人审批的报聘经纪人
+     * 通过经纪人id和审批状态查询此人审批的报聘经纪人
-     *
+     * @param practitionerId
-     * @param practitionerId 经纪人id
+     * @param approvingStatus
-     * @return 返回结果
+     * @return
     */
-    List<HiringListInfo> findHiringList(Long practitionerId);
+    List<HiringListInfo> findHiringList(Long practitionerId, Long approvingStatus);
    /**
     * 经纪人审批基本信息

--- a/yd-api/src/main/java/com/yd/dal/service/practitioner/impl/PractitionerHiringDALServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/dal/service/practitioner/impl/PractitionerHiringDALServiceImpl.java
@@ -19,8 +19,8 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
    private PractitionerHiringMapper practitionerHiringMapper;
    @Override
-    public List<HiringListInfo> findHiringList(Long practitionerId) {
+    public List<HiringListInfo> findHiringList(Long practitionerId, Long approvingStatus) {
-        return practitionerHiringMapper.findHiringList(practitionerId);
+        return practitionerHiringMapper.findHiringList(practitionerId, approvingStatus);
    }
    @Override

--- a/yd-api/src/main/resources/mapper/customer/AclPractitionerHiringApproveRecordsMapper.xml
+++ b/yd-api/src/main/resources/mapper/customer/AclPractitionerHiringApproveRecordsMapper.xml
@@ -335,13 +335,13 @@
    <!--@mbg.generated-->
    insert into ag_acl_practitioner_hiring_approve_records
    (hiring_basic_info_id, approve_step_id, approve_step_name, approving_practitioner_id, 
-      approving_status, reject_note, is_active, created_at, created_by, updated_at, updated_by
+      approving_status, interview_assessment, reject_note, is_active, created_at, created_by, updated_at, updated_by
      )
    values
    <foreach collection="list" item="item" separator=",">
      (#{item.hiringBasicInfoId,jdbcType=BIGINT}, #{item.approveStepId,jdbcType=VARCHAR}, 
        #{item.approveStepName,jdbcType=VARCHAR}, #{item.approvingPractitionerId,jdbcType=BIGINT}, 
-        #{item.approvingStatus,jdbcType=BIGINT}, #{item.rejectNote,jdbcType=VARCHAR}, #{item.isActive,jdbcType=INTEGER}, 
+        #{item.approvingStatus,jdbcType=BIGINT}, #{item.interviewAssessment,jdbcType=VARCHAR}, #{item.rejectNote,jdbcType=VARCHAR}, #{item.isActive,jdbcType=INTEGER},
        #{item.createdAt,jdbcType=TIMESTAMP}, #{item.createdBy,jdbcType=BIGINT}, #{item.updatedAt,jdbcType=TIMESTAMP}, 
        #{item.updatedBy,jdbcType=BIGINT})
    </foreach>

--- a/yd-api/src/main/resources/mapper/customer/AclPractitionerHiringBasicInfoMapper.xml
+++ b/yd-api/src/main/resources/mapper/customer/AclPractitionerHiringBasicInfoMapper.xml
@@ -8,10 +8,10 @@
    <result column="practitioner_potential_id" jdbcType="BIGINT" property="practitionerPotentialId" />
    <result column="invitee_practitioner_id" jdbcType="BIGINT" property="inviteePractitionerId" />
    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="mobile_no" jdbcType="VARCHAR" property="mobileNo" />
+    <result column="mobile_no" jdbcType="VARCHAR" property="mobileNo" typeHandler="com.yd.util.deshandler.DESTypeHandler"/>
    <result column="id_type_id" jdbcType="BIGINT" property="idTypeId" />
    <result column="id_type" jdbcType="VARCHAR" property="idType" />
-    <result column="id_no" jdbcType="VARCHAR" property="idNo" />
+    <result column="id_no" jdbcType="VARCHAR" property="idNo" typeHandler="com.yd.util.deshandler.DESTypeHandler"/>
    <result column="gender" jdbcType="INTEGER" property="gender" />
    <result column="practitioner_birthdate" jdbcType="DATE" property="practitionerBirthdate" />
    <result column="province_id" jdbcType="BIGINT" property="provinceId" />

--- a/yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml
+++ b/yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml
@@ -945,4 +945,25 @@
          (select subordinate_system_id from ag_acl_practitioner where id = #{practitionerId,jdbcType=BIGINT})
  </select>
+  <select id="findPractitionerInfoByPractitionerId" resultMap="practitioner_info_map">
+    select
+      p.customer_id as customerId,
+      p.id as practitionerId,
+      p.name as name,
+      p.gender as gender,
+      s.practitioner_type_id as practitionerType,
+      o.drop_option_code as levelCode,
+      o.drop_option_name as levelName,
+      b.branch_name as insurerBranchName,
+      p.subordinate_system_id as subordinateId,
+      p.wechat_id as weChatId,
+      p.qq_id as qqId,
+      p.practitioner_reg_no as practitionerRegNo
+    from ag_acl_customer c inner join ag_acl_practitioner p on c.id = p.customer_id
+                           left join ag_acl_insurer_branch b on p.insurer_branch_id = b.id
+                           left join ag_acl_practitioner_setting s on p.id = s.practitioner_id
+                           left join ag_md_drop_options o on s.practitioner_level = o.id
+    where p.id = #{practitionerId}
+  </select>
 </mapper>
\ No newline at end of file
--- a/yd-api/src/main/resources/mapper/practitioner/PractitionerHiringMapper.xml
+++ b/yd-api/src/main/resources/mapper/practitioner/PractitionerHiringMapper.xml
@@ -23,8 +23,26 @@
                  if(m.mentor_practitioner_id = #{practitionerId,jdbcType=BIGINT}, 1, 2)) approvalIdentity
        from ag_acl_practitioner_hiring_basic_info b
        left join ag_acl_practitioner_hiring_membership m on b.id = m.hiring_basic_info_id
+        left join
+                 (
+                    select
+                    a.hiring_basic_info_id, a.approving_status, a.created_at
+                    from
+                    ag_acl_practitioner_hiring_approve_records a
+                    left join
+                    (
+                    select
+                    hiring_basic_info_id, max(created_at) created_at
+                    from
+                    ag_acl_practitioner_hiring_approve_records
+                    group by hiring_basic_info_id
+                    ) b
+                    on a.hiring_basic_info_id=b.hiring_basic_info_id and a.created_at=b.created_at
+                 ) r
+                 on b.id = r.hiring_basic_info_id
        where (m.mentor_practitioner_id = #{practitionerId,jdbcType=BIGINT} or
               m.subsystem_owner_id = #{practitionerId,jdbcType=BIGINT})
+          and r.approving_status = #{approvingStatus,jdbcType=BIGINT}
          and m.md_drop_option_id != (select id
                                      from ag_md_drop_options
                                      where drop_option_code = 'S2'