test

.gitignore

@@ -4,4 +4,5 @@ opt/
 yd-api/.idea/
 yd-api/.idea/
 yd-api/target/
 yd-api/target/
 yd-api/yd-api.iml
 yd-api/yd-api.iml
-yd-api/src/main/resources/logback-spring.xml
+yd-api/src/main/resources/logback-spring.xml
\ No newline at end of file
+/yd-api/src/main/java/com/test/

yd-api/pom.xml

@@ -144,6 +144,13 @@
             <artifactId>commons-collections</artifactId>
             <artifactId>commons-collections</artifactId>
             <version>3.2.2</version>
             <version>3.2.2</version>
         </dependency>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.jsoup/jsoup -->
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.13.1</version>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java

@@ -449,10 +449,10 @@ public class PractitionerController {
      * @param requestVO 请求信息
      * @param requestVO 请求信息
      * @return PolicyInfoQueryResponseVO
      * @return PolicyInfoQueryResponseVO
      */
      */
-    @RequestMapping("/payScaleQuery")
-    public Object payScaleQuery(@RequestBody PayScaleQueryRequestVO requestVO){
+    @RequestMapping("/payScaleListQuery")
+    public Object payScaleListQuery(@RequestBody PayScaleQueryRequestVO requestVO){
         JsonResult result = new JsonResult();
         JsonResult result = new JsonResult();
-        PayScaleQueryResponseVO responseVO = practitionerBasicInfoService.payScaleQuery(requestVO);
+        PayScaleQueryResponseVO responseVO = practitionerBasicInfoService.payScaleListQuery(requestVO);
         result.setData(responseVO);
         result.setData(responseVO);
         result.addResult(responseVO);
         result.addResult(responseVO);
         return result;
         return result;

yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerBasicInfoService.java

 package com.yd.api.practitioner.service;
 package com.yd.api.practitioner.service;
 
 
+import com.yd.api.practitioner.vo.payscale.PayScaleQueryRequestVO;
+import com.yd.api.practitioner.vo.payscale.PayScaleQueryResponseVO;
 import com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO;
 import com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO;
 import com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO;
 import com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO;
 import com.yd.api.practitioner.vo.policy.policyinfoquery.PolicyInfoQueryRequestVO;
 import com.yd.api.practitioner.vo.policy.policyinfoquery.PolicyInfoQueryRequestVO;
@@ -21,4 +23,11 @@ public interface PractitionerBasicInfoService {
      * @return PolicyInfoQueryResponseVO
      * @return PolicyInfoQueryResponseVO
      */
      */
     PolicyInfoQueryResponseVO policyInfoQuery(PolicyInfoQueryRequestVO requestVO);
     PolicyInfoQueryResponseVO policyInfoQuery(PolicyInfoQueryRequestVO requestVO);
+
+    /**
+     * eGolden -- 经纪人薪资表查询
+     * @param requestVO 请求信息
+     * @return 相应
+     */
+    PayScaleQueryResponseVO payScaleListQuery(PayScaleQueryRequestVO requestVO);
 }
 }

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

@@ -2,6 +2,9 @@ package com.yd.api.practitioner.service.impl;
 
 
 import com.google.common.base.Strings;
 import com.google.common.base.Strings;
 import com.yd.api.practitioner.service.PractitionerBasicInfoService;
 import com.yd.api.practitioner.service.PractitionerBasicInfoService;
+import com.yd.api.practitioner.vo.payscale.PayScaleInfo;
+import com.yd.api.practitioner.vo.payscale.PayScaleQueryRequestVO;
+import com.yd.api.practitioner.vo.payscale.PayScaleQueryResponseVO;
 import com.yd.api.practitioner.vo.policy.PolicyInfo;
 import com.yd.api.practitioner.vo.policy.PolicyInfo;
 import com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO;
 import com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO;
 import com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO;
 import com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO;
@@ -41,6 +44,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
     private ProductDALService productDALService;
     private ProductDALService productDALService;
     @Autowired
     @Autowired
     private MdDropOptionsDALService mdDropOptionsDALService;
     private MdDropOptionsDALService mdDropOptionsDALService;
+
     @Override
     @Override
     public PolicyListQueryResponseVO policyListQuery(PolicyListQueryRequestVO requestVO) {
     public PolicyListQueryResponseVO policyListQuery(PolicyListQueryRequestVO requestVO) {
         PolicyListQueryResponseVO responseVO = new PolicyListQueryResponseVO();
         PolicyListQueryResponseVO responseVO = new PolicyListQueryResponseVO();
@@ -94,6 +98,34 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         return responseVO;
         return responseVO;
     }
     }
 
 
+    @Override
+    public PayScaleQueryResponseVO payScaleListQuery(PayScaleQueryRequestVO requestVO) {
+        PayScaleQueryResponseVO responseVO = new PayScaleQueryResponseVO();
+        String practitionerIdEG = requestVO.getPractitionerIdEG();
+        if(!Strings.isNullOrEmpty(practitionerIdEG)){
+            List<PayScaleInfo> payScaleInfoList =  aclPractitionerDALService.findPayScaleByPractitionerEG(practitionerIdEG);
+            if(!payScaleInfoList.isEmpty()){
+                Map<String,String> dtlTypeMap = new HashMap<>();
+                Map<String,String> titleMap = new HashMap<>();
+                List<OptionsEGolden> optionsEGoldenList = mdDropOptionsDALService.findByMasterIdsE(Collections.singletonList(101));
+                optionsEGoldenList.forEach(i->dtlTypeMap.put(i.getOptAttr(),i.getOptName()));
+                List<OptionsEGolden> titleList = mdDropOptionsDALService.findAllTitleEG();
+                titleList.forEach(i->titleMap.put(i.getTitleCode(),i.getTitleName()));
+                for(PayScaleInfo item : payScaleInfoList){
+                    item.setDrpTitleCode(titleMap.get(item.getDrpTitleCode()));
+                    item.setMonDtlType(dtlTypeMap.get(item.getMonDtlType()));
+                    item.setMonDtlItem(getCommissionType(item.getMonDtlItem()));
+                }
+                responseVO.setPayScaleInfos(payScaleInfoList);
+            }
+            responseVO.setCommonResult(new CommonResult(true,ZHBErrorConfig.getErrorInfo("800000")));
+        }else{
+            String[] params = {"practitionerIdEG"};
+            responseVO.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("610002", params)));
+        }
+        return responseVO;
+    }
+
     private String getOrderNoE(String policyNo) {
     private String getOrderNoE(String policyNo) {
         String orderNo = null;
         String orderNo = null;
         if(!Strings.isNullOrEmpty(policyNo)){
         if(!Strings.isNullOrEmpty(policyNo)){

yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScaleInfo.java

+package com.yd.api.practitioner.vo.payscale;
+
+public class PayScaleInfo {
+    private Integer monShId;
+    private String spcBusId;
+    private String spcDivId;
+    private String salMstId;
+    private String drpTitleCode;
+    private String monDtlType;
+    private String monDtlItem;
+    private String monDtlPeriod;
+    private Integer monDtlAmount;
+    private String monDtlRAmount;
+    private String createDate;
+    private String createUser;
+    private String modifyDate;
+    private String modifyUser;
+    private Integer dtlFun;
+    private String uploadPath;
+    private String uploadTime;
+    private String payScaleUrl;
+    private String payScaleData;
+
+    public Integer getMonShId() {
+        return monShId;
+    }
+
+    public void setMonShId(Integer monShId) {
+        this.monShId = monShId;
+    }
+
+    public String getSpcBusId() {
+        return spcBusId;
+    }
+
+    public void setSpcBusId(String spcBusId) {
+        this.spcBusId = spcBusId;
+    }
+
+    public String getSpcDivId() {
+        return spcDivId;
+    }
+
+    public void setSpcDivId(String spcDivId) {
+        this.spcDivId = spcDivId;
+    }
+
+    public String getSalMstId() {
+        return salMstId;
+    }
+
+    public void setSalMstId(String salMstId) {
+        this.salMstId = salMstId;
+    }
+
+    public String getDrpTitleCode() {
+        return drpTitleCode;
+    }
+
+    public void setDrpTitleCode(String drpTitleCode) {
+        this.drpTitleCode = drpTitleCode;
+    }
+
+    public String getMonDtlType() {
+        return monDtlType;
+    }
+
+    public void setMonDtlType(String monDtlType) {
+        this.monDtlType = monDtlType;
+    }
+
+    public String getMonDtlItem() {
+        return monDtlItem;
+    }
+
+    public void setMonDtlItem(String monDtlItem) {
+        this.monDtlItem = monDtlItem;
+    }
+
+    public Integer getMonDtlAmount() {
+        return monDtlAmount;
+    }
+
+    public void setMonDtlAmount(Integer monDtlAmount) {
+        this.monDtlAmount = monDtlAmount;
+    }
+
+    public String getMonDtlRAmount() {
+        return monDtlRAmount;
+    }
+
+    public void setMonDtlRAmount(String monDtlRAmount) {
+        this.monDtlRAmount = monDtlRAmount;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public String getModifyDate() {
+        return modifyDate;
+    }
+
+    public void setModifyDate(String modifyDate) {
+        this.modifyDate = modifyDate;
+    }
+
+    public String getModifyUser() {
+        return modifyUser;
+    }
+
+    public void setModifyUser(String modifyUser) {
+        this.modifyUser = modifyUser;
+    }
+
+    public Integer getDtlFun() {
+        return dtlFun;
+    }
+
+    public void setDtlFun(Integer dtlFun) {
+        this.dtlFun = dtlFun;
+    }
+
+    public String getUploadPath() {
+        return uploadPath;
+    }
+
+    public void setUploadPath(String uploadPath) {
+        this.uploadPath = uploadPath;
+    }
+
+    public String getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(String uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    public String getPayScaleUrl() {
+        return payScaleUrl;
+    }
+
+    public void setPayScaleUrl(String payScaleUrl) {
+        this.payScaleUrl = payScaleUrl;
+    }
+
+    public String getPayScaleData() {
+        return payScaleData;
+    }
+
+    public void setPayScaleData(String payScaleData) {
+        this.payScaleData = payScaleData;
+    }
+
+    public String getMonDtlPeriod() {
+        return monDtlPeriod;
+    }
+
+    public void setMonDtlPeriod(String monDtlPeriod) {
+        this.monDtlPeriod = monDtlPeriod;
+    }
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScaleQueryResponseVO.java

 package com.yd.api.practitioner.vo.payscale;
 package com.yd.api.practitioner.vo.payscale;
 
 
+import com.yd.api.result.CommonResult;
+
+import java.util.List;
+
 public class PayScaleQueryResponseVO {
 public class PayScaleQueryResponseVO {
+    private List<PayScaleInfo> payScaleInfos;
+    private CommonResult commonResult;
+
+    public List<PayScaleInfo> getPayScaleInfos() {
+        return payScaleInfos;
+    }
+
+    public void setPayScaleInfos(List<PayScaleInfo> payScaleInfos) {
+        this.payScaleInfos = payScaleInfos;
+    }
+
+    public CommonResult getCommonResult() {
+        return commonResult;
+    }
 
 
+    public void setCommonResult(CommonResult commonResult) {
+        this.commonResult = commonResult;
+    }
 }
 }

yd-api/src/main/java/com/yd/dal/entity/meta/OptionsEGolden.java

@@ -6,6 +6,9 @@ public class OptionsEGolden {
     private String optName;
     private String optName;
     private String optAttr;
     private String optAttr;
     private String optOrder;
     private String optOrder;
+    private String titleCode;
+    private String titleName;
+    private String titleLevel;
 
 
     public Integer getOptId() {
     public Integer getOptId() {
         return optId;
         return optId;
@@ -46,4 +49,28 @@ public class OptionsEGolden {
     public void setOptOrder(String optOrder) {
     public void setOptOrder(String optOrder) {
         this.optOrder = optOrder;
         this.optOrder = optOrder;
     }
     }
+
+    public String getTitleCode() {
+        return titleCode;
+    }
+
+    public void setTitleCode(String titleCode) {
+        this.titleCode = titleCode;
+    }
+
+    public String getTitleName() {
+        return titleName;
+    }
+
+    public void setTitleName(String titleName) {
+        this.titleName = titleName;
+    }
+
+    public String getTitleLevel() {
+        return titleLevel;
+    }
+
+    public void setTitleLevel(String titleLevel) {
+        this.titleLevel = titleLevel;
+    }
 }
 }

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

 package com.yd.dal.mapper.customer;
 package com.yd.dal.mapper.customer;
 
 
+import com.yd.api.practitioner.vo.payscale.PayScaleInfo;
 import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;
 import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;
 import com.yd.dal.entity.customer.AclPractitioner;
 import com.yd.dal.entity.customer.AclPractitioner;
 import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;
 import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;
@@ -54,4 +55,6 @@ public interface AclPractitionerMapper {
     PractitionerRankInfo getPractitionerRankInfoByPractitionerIdEG(@Param("practitionerIdEG") String practitionerIdEG, @Param("time") Integer time);
     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);
 }
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/meta/MdDropOptionsMapper.java

@@ -31,4 +31,6 @@ public interface MdDropOptionsMapper {
     List<MdDropOptions> findByMasterCodeAndOptionsCode(@Param("masterCode")String masterCode, @Param("optionsCode")String optionsCode);
     List<MdDropOptions> findByMasterCodeAndOptionsCode(@Param("masterCode")String masterCode, @Param("optionsCode")String optionsCode);
 
 
     List<OptionsEGolden> findByMasterIdsE(@Param("materIds")List<Integer> materIds);
     List<OptionsEGolden> findByMasterIdsE(@Param("materIds")List<Integer> materIds);
+
+    List<OptionsEGolden> findAllTitleEG();
 }
 }
\ No newline at end of file

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

 package com.yd.dal.service.customer;
 package com.yd.dal.service.customer;
 
 
+import com.yd.api.practitioner.vo.payscale.PayScaleInfo;
 import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;
 import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;
 import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
 import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
 import com.yd.dal.entity.customer.AclPractitioner;
 import com.yd.dal.entity.customer.AclPractitioner;
@@ -139,4 +140,11 @@ public interface AclPractitionerDALService {
      * @return 返回结果
      * @return 返回结果
      */
      */
     PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(Long practitionerId, Integer time);
     PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(Long practitionerId, Integer time);
+
+    /**
+     * eGolden -- 根据经纪人id获取薪资表列表
+     * @param practitionerIdEG 经纪人id
+     * @return 结果
+     */
+    List<PayScaleInfo> findPayScaleByPractitionerEG(String practitionerIdEG);
 }
 }

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

 package com.yd.dal.service.customer.impl;
 package com.yd.dal.service.customer.impl;
 
 
 import com.google.common.base.Strings;
 import com.google.common.base.Strings;
+import com.yd.api.practitioner.vo.payscale.PayScaleInfo;
 import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;
 import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;
 import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
 import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
 import com.yd.dal.entity.customer.AclPractitioner;
 import com.yd.dal.entity.customer.AclPractitioner;
@@ -135,4 +136,10 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
     public PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(Long practitionerId, Integer time) {
     public PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(Long practitionerId, Integer time) {
         return aclPractitionerMapper.getPractitionerRankInfoByPractitionerIdYD(practitionerId,time);
         return aclPractitionerMapper.getPractitionerRankInfoByPractitionerIdYD(practitionerId,time);
     }
     }
+
+    @Override
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_EGOLDEN)
+    public List<PayScaleInfo> findPayScaleByPractitionerEG(String practitionerIdEG) {
+        return aclPractitionerMapper.findPayScaleByPractitionerEG(practitionerIdEG);
+    }
 }
 }

yd-api/src/main/java/com/yd/dal/service/meta/MdDropOptionsDALService.java

@@ -21,4 +21,6 @@ public interface MdDropOptionsDALService {
     List<MdDropOptions> findByMasterCodeAndOptionsCode(String team_building_track, String s);
     List<MdDropOptions> findByMasterCodeAndOptionsCode(String team_building_track, String s);
 
 
     List<OptionsEGolden> findByMasterIdsE(List<Integer> materIds);
     List<OptionsEGolden> findByMasterIdsE(List<Integer> materIds);
+
+    List<OptionsEGolden> findAllTitleEG();
 }
 }

yd-api/src/main/java/com/yd/dal/service/meta/impl/MdDropOptionsDALServiceImpl.java

@@ -61,4 +61,10 @@ public class MdDropOptionsDALServiceImpl implements MdDropOptionsDALService {
     public List<OptionsEGolden> findByMasterIdsE(List<Integer> materIds) {
     public List<OptionsEGolden> findByMasterIdsE(List<Integer> materIds) {
         return mdDropOptionsMapper.findByMasterIdsE(materIds);
         return mdDropOptionsMapper.findByMasterIdsE(materIds);
     }
     }
+
+    @Override
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_EGOLDEN)
+    public List<OptionsEGolden> findAllTitleEG() {
+        return mdDropOptionsMapper.findAllTitleEG();
+    }
 }
 }

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

@@ -870,4 +870,24 @@
       </otherwise>
       </otherwise>
     </choose>
     </choose>
   </select>
   </select>
+  <select id="findPayScaleByPractitionerEG" resultType="com.yd.api.practitioner.vo.payscale.PayScaleInfo">
+    select
+      t.MON_SH_ID as monShId,
+      t.FK_SPC_BUS_ID as spcBusId,
+      t.FK_SPC_DIV_ID as spcDivId,
+      t.FK_SAL_MST_ID as salMstId,
+      t.FK_DRP_TITLE_CODE as drpTitleCode,
+      t.MON_DTL_TYPE as monDtlType,
+      t.MON_DTL_ITEM as monDtlItem,
+      t.MON_DTL_PERIOD as monDtlAmount,
+      t.MON_DTL_RAMOUNT as monDtlRAmount,
+      date_format(t.CREATE_DATE, '%Y-%m-%d %H:%i:%s') as createDate,
+      t.CREATE_USER as createUser,
+      t.MON_DTL_FUN as dtlFun,
+      t.UPLOAD_PATH as uploadPath,
+      t.MODIFY_USER as modifyUser,
+      date_format(t.MODIFY_DATE, '%Y-%m-%d %H:%i:%s') as modifyDate,
+      date_format(t.UPLOAD_TIME, '%Y-%m-%d %H:%i:%s') as uploadTime
+    from mon011 t where FK_SAL_MST_ID = #{practitionerIdEG,jdbcType=VARCHAR};
+  </select>
 </mapper>
 </mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/meta/MdDropOptionsMapper.xml

@@ -254,4 +254,11 @@
         #{item}
         #{item}
       </foreach>
       </foreach>
     </select>
     </select>
+    <select id="findAllTitleEG" resultType="com.yd.dal.entity.meta.OptionsEGolden">
+      select
+        t.DRP_TITLE_CODE as titleCode,
+        t.DRP_TITLE_NAME as titleName,
+        t.DRP_TITLE_LEVEL as titleLevel
+      from drp003 t
+    </select>
 </mapper>
 </mapper>
\ No newline at end of file