增加-判断经纪人是否可以登入ydLife,是否可以看到新增单

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

@@ -216,6 +216,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
                 responseVO.setPractitionerTypeId(practitionerType);
                 responseVO.setPractitionerBasicInfo(basicInfo);
                 responseVO.setLoginTimes(logTimes);
+                responseVO.setCanSeeSalaryList(practitionerInfo.getCanLoginDyd());
                 responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
 //            }
         }else{

yd-api/src/main/java/com/yd/api/practitioner/vo/login/PractitionerLoginResponseVO.java

@@ -10,6 +10,7 @@ public class PractitionerLoginResponseVO {
     private String practitionerIdEG;
     private Integer loginTimes;
     private String getOpenIdUrl;
+    private Long canSeeSalaryList;
     private PractitionerLoginBasicInfo practitionerBasicInfo;
     private CommonResult commonResult;
 
@@ -76,4 +77,12 @@ public class PractitionerLoginResponseVO {
     public void setPractitionerTypeId(Long practitionerTypeId) {
         this.practitionerTypeId = practitionerTypeId;
     }
+
+    public Long getCanSeeSalaryList() {
+        return this.canSeeSalaryList;
+    }
+
+    public void setCanSeeSalaryList(Long canSeeSalaryList) {
+        this.canSeeSalaryList = canSeeSalaryList;
+    }
 }

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

 package com.yd.dal.entity.customer;
 
-import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
 
 /**
- * ag_acl_practitioner
- * @author 
+ * 从业人员执业证信息表
  */
 @Data
-public class AclPractitioner implements Serializable {
+public class AclPractitioner {
+    private static final long serialVersionUID = 1L;
     /**
      * serial id
      */
@@ -106,6 +105,11 @@ public class AclPractitioner implements Serializable {
     private String employeeNo;
 
     /**
+     * 员工合同编号
+     */
+    private String contractNo;
+
+    /**
      * 0=No, 1=Yes
      */
     private Integer isActive;
@@ -188,6 +192,11 @@ public class AclPractitioner implements Serializable {
     private String educationLevel;
 
     /**
+     * 毕业学校
+     */
+    private String graduatedUniversity;
+
+    /**
      * FK ag_acl_practitioner.id 辅导人
      */
     private Long mentorId;
@@ -203,19 +212,22 @@ public class AclPractitioner implements Serializable {
     private Integer gender;
 
     /**
-     * 经纪人合同号
+     * 经纪人通过最后一步审批后生成的电子合同
      */
-    private String contractNo;
+    private String contractOssPath;
 
     /**
-     * 经纪人PDF合同地址
+     * FK ag_acl_practitioner_hiring_basic_info.id
      */
-    private String contractOssPath;
+    private Long hiringBasicInfoId;
 
     /**
-     * 经纪人报聘信息表id
+     * 能够登录dyd
      */
-    private Long hiringBasicInfoId;
+    private Long canLoginDyd;
 
-    private static final long serialVersionUID = 1L;
+    /**
+     * 能够查看薪资表
+     */
+    private Long canSeeSalaryList;
 }
\ No newline at end of file

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

@@ -13,6 +13,7 @@ public class PractitionerInfo {
     private String weChatId;
     private String qqId;
     private String practitionerRegNo;
+    private Long canLoginDyd;
 
     public Long getCustomerId() {
         return customerId;
@@ -109,4 +110,12 @@ public class PractitionerInfo {
     public void setGender(Integer gender) {
         this.gender = gender;
     }
+
+    public Long getCanLoginDyd() {
+        return canLoginDyd;
+    }
+
+    public void setCanLoginDyd(Long canLoginDyd) {
+        this.canLoginDyd = canLoginDyd;
+    }
 }

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

 package com.yd.dal.mapper.customer;
 
-import com.yd.api.practitioner.vo.payscale.PayScaleInfo;
-import com.yd.api.practitioner.vo.subordinate.TeamMemberDetail;
-import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;
-import com.yd.dal.entity.customer.AclPractitioner;
-import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;
-import com.yd.dal.entity.customer.practitioner.PractitionerInfo;
-import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo;
-import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
-import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;
-import org.apache.ibatis.annotations.Param;
-
+import com.yd.api.practitioner.vo.payscale.PayScaleInfo;import com.yd.api.practitioner.vo.subordinate.TeamMemberDetail;import com.yd.dal.entity.customer.AclPractitioner;
 import java.util.List;
+import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;import com.yd.dal.entity.customer.practitioner.PractitionerInfo;import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo;import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;import org.apache.ibatis.annotations.Param;
 
 public interface AclPractitionerMapper {
     int deleteByPrimaryKey(Long id);
@@ -26,43 +17,49 @@ public interface AclPractitionerMapper {
 
     int updateByPrimaryKey(AclPractitioner record);
 
+    int updateBatch(List<AclPractitioner> list);
+
+    int updateBatchSelective(List<AclPractitioner> list);
+
+    int batchInsert(@Param("list") List<AclPractitioner> list);
+
     PractitionerBasicInfo getPractitionerInfoByMobileNoForOffline(String mobileNo);
 
     List<PractitionerRankInfo> getPractitionerRankInfoForOffline(@Param("time") Integer time);
 
     PractitionerBasicInfo getPractitionerInfoByMobileNoForOnline(String mobileNo);
 
-    List<PractitionerRankInfo> getPractitionerRankInfoForOnline(@Param("time")Integer time,@Param("practitionerTypeId")Long practitionerTypeId);
+    List<PractitionerRankInfo> getPractitionerRankInfoForOnline(@Param("time") Integer time, @Param("practitionerTypeId") Long practitionerTypeId);
 
-    List<PractitionerRankInfo> getPractitionerRankInfoForSpecials(@Param("mobileSpecials") List<String> mobileSpecials, @Param("time")Integer time);
+    List<PractitionerRankInfo> getPractitionerRankInfoForSpecials(@Param("mobileSpecials") List<String> mobileSpecials, @Param("time") Integer time);
 
-    PractitionerInfo findPractitionerInfoByLogin(@Param("mobileNo")String mobileNo);
+    PractitionerInfo findPractitionerInfoByLogin(@Param("mobileNo") String mobileNo);
 
-    AclPractitioner findByCustomerIdIsActive(@Param("customerId") Long customerId, @Param("isActive")int isActive);
+    AclPractitioner findByCustomerIdIsActive(@Param("customerId") Long customerId, @Param("isActive") int isActive);
 
-    List<OwnOpportunityInfo> ownOpportunityQuery(@Param("practitionerId")Long practitionerId);
+    List<OwnOpportunityInfo> ownOpportunityQuery(@Param("practitionerId") Long practitionerId);
 
     List<AclPractitioner> findByIds(@Param("practitionerIdList") List<Long> practitionerIdList);
 
     List<AclPractitioner> findForSubordinateIdByPractitionerId(Long practitionerId);
 
-    List<PlayerSalesActivityInfo> playerSalesActivityQuery(@Param("practitionerId") Long practitionerId,@Param("optionsId") Long optionsId);
+    List<PlayerSalesActivityInfo> playerSalesActivityQuery(@Param("practitionerId") Long practitionerId, @Param("optionsId") Long optionsId);
 
-    List<AclPractitioner> findBySubordinateSystemId(@Param("subordinateSystemId")Long subordinateSystemId);
+    List<AclPractitioner> findBySubordinateSystemId(@Param("subordinateSystemId") Long subordinateSystemId);
 
-    String findMobileNoByPractitionerId(@Param("practitionerId")Long practitionerId);
+    String findMobileNoByPractitionerId(@Param("practitionerId") Long practitionerId);
 
-    PractitionerBasicInfo findByMobileNoE(@Param("mobileNo")String mobileNo);
+    PractitionerBasicInfo findByMobileNoE(@Param("mobileNo") String mobileNo);
 
     PractitionerRankInfo getPractitionerRankInfoByPractitionerIdEG(@Param("practitionerIdEG") String practitionerIdEG, @Param("time") Integer time);
 
-    PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(@Param("practitionerId")Long practitionerId, @Param("time")Integer time);
+    PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(@Param("practitionerId") Long practitionerId, @Param("time") Integer time);
 
-    List<PayScaleInfo> findPayScaleByPractitionerEG(@Param("practitionerIdEG")String practitionerIdEG);
+    List<PayScaleInfo> findPayScaleByPractitionerEG(@Param("practitionerIdEG") String practitionerIdEG);
 
-    PayScaleBasicInfo findFilePathByMonShId(@Param("monShId")Integer monShId);
+    PayScaleBasicInfo findFilePathByMonShId(@Param("monShId") Integer monShId);
 
-    PractitionerBasicInfo findByIdEG(@Param("practitionerIdEG")String practitionerIdEG);
+    PractitionerBasicInfo findByIdEG(@Param("practitionerIdEG") String practitionerIdEG);
 
     AclPractitioner findPractitionerByLeadsAssignedId(Long leadsAssignedId);
 
@@ -79,5 +76,4 @@ public interface AclPractitionerMapper {
     AclPractitioner selectByMobileNo(String mobileNo);
 
     List<TeamMemberDetail> queryTeamMemberDetailList(List<Long> practitionerIdList);
-
 }
\ No newline at end of file