Skip to content

Y
yd-backend
Commit c71076f9 by wenyang
Options

龙虎榜与经纪人首页销售统计数据,把寿险与线上保单统一3

parent 90a6cbbc
Showing with 31 additions and 31 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
...@@ -608,14 +608,14 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -608,14 +608,14 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
private void disposalPractitionerInfo(PractitionerInfoForAchievement practitionerInfo, Map<Integer, PractitionerBasicInfo> practitionerBasicInfoMap, Integer time, Integer platform) { private void disposalPractitionerInfo(PractitionerInfoForAchievement practitionerInfo, Map<Integer, PractitionerBasicInfo> practitionerBasicInfoMap, Integer time, Integer platform) {
Double fyc = practitionerInfo.getFyc(); Double fyc = practitionerInfo.getFyc();
PractitionerRankInfo practitionerRankInfo = null; // PractitionerRankInfo practitionerRankInfo = null;
Double fycOther; // Double fycOther;
PractitionerBasicInfo practitionerBasicInfoYD = practitionerBasicInfoMap.get(1); PractitionerBasicInfo practitionerBasicInfoYD = practitionerBasicInfoMap.get(1);
if (practitionerBasicInfoYD != null) { if (practitionerBasicInfoYD != null) {
String practitionerIdYD = practitionerBasicInfoYD.getPractitionerId(); String practitionerIdYD = practitionerBasicInfoYD.getPractitionerId();
if (!Strings.isNullOrEmpty(practitionerIdYD)) { if (!Strings.isNullOrEmpty(practitionerIdYD)) {
Long practitionerId = Long.parseLong(practitionerIdYD); Long practitionerId = Long.parseLong(practitionerIdYD);
practitionerRankInfo = aclPractitionerDALService.getPractitionerRankInfoByPractitionerIdYD(practitionerId, time, platform); // practitionerRankInfo = aclPractitionerDALService.getPractitionerRankInfoByPractitionerIdYD(practitionerId, time, platform);
// if (platform == 1) { // if (platform == 1) {
// PractitionerBasicInfo practitionerBasicInfoEG = practitionerBasicInfoMap.get(2); // PractitionerBasicInfo practitionerBasicInfoEG = practitionerBasicInfoMap.get(2);
// if (practitionerBasicInfoEG != null) { // if (practitionerBasicInfoEG != null) {
...@@ -628,10 +628,10 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -628,10 +628,10 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
// } else { // } else {
// practitionerRankInfo = aclPractitionerDALService.getPractitionerRankInfoByPractitionerIdYD(practitionerId, time, platform); // practitionerRankInfo = aclPractitionerDALService.getPractitionerRankInfoByPractitionerIdYD(practitionerId, time, platform);
// } // }
fycOther = practitionerRankInfo != null ? practitionerRankInfo.getFyc() : 0D; // fycOther = practitionerRankInfo != null ? practitionerRankInfo.getFyc() : 0D;
Double fycSum = CommonUtil.doubleFormat(fyc + fycOther, 2); // Double fycSum = CommonUtil.doubleFormat(fyc + fycOther, 2);
if (fycSum != 0) { if (fyc != 0) {
Double completeRate = getCompletionRate(practitionerId, null, fycSum, time); Double completeRate = getCompletionRate(practitionerId, null, fyc, time);
practitionerInfo.setCompletionRate(completeRate); practitionerInfo.setCompletionRate(completeRate);
} }
} }
......
yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml
...@@ -1316,14 +1316,14 @@ ...@@ -1316,14 +1316,14 @@
and YEAR(f.order_date) = YEAR(now()) and YEAR(f.order_date) = YEAR(now())
</otherwise> </otherwise>
</choose> </choose>
<choose> <!-- <choose> -->
<when test="platform == 1"> <!-- <when test="platform == 1"> -->
and o.product_category_id != 8 -- o.flag != 'Manual' <!-- and o.product_category_id != 8 -->
</when> <!-- </when> -->
<otherwise> <!-- <otherwise> -->
and o.product_category_id = 8 <!-- and o.product_category_id = 8 -->
</otherwise> <!-- </otherwise> -->
</choose> <!-- </choose> -->
group by p.id group by p.id
) t WHERE t.count > 0 ) t WHERE t.count > 0
...@@ -1373,14 +1373,14 @@ ...@@ -1373,14 +1373,14 @@
and YEAR(f.order_date) = YEAR(now()) and YEAR(f.order_date) = YEAR(now())
</otherwise> </otherwise>
</choose> </choose>
<choose> <!-- <choose> -->
<when test="platform == 1"> <!-- <when test="platform == 1"> -->
and o.product_category_id != 8 -- o.flag != 'Manual' <!-- and o.product_category_id != 8 -->
</when> <!-- </when> -->
<otherwise> <!-- <otherwise> -->
and o.product_category_id = 8 <!-- and o.product_category_id = 8 -->
</otherwise> <!-- </otherwise> -->
</choose> <!-- </choose> -->
group by p.id group by p.id
</select> </select>
...@@ -1645,14 +1645,14 @@ ...@@ -1645,14 +1645,14 @@
and YEAR(f.order_date) = YEAR(now()) and YEAR(f.order_date) = YEAR(now())
</otherwise> </otherwise>
</choose> </choose>
<choose> <!-- <choose> -->
<when test="platform == 1"> <!-- <when test="platform == 1"> -->
and o.product_category_id != 8 -- o.flag != 'Manual' <!-- and o.product_category_id != 8 -->
</when> <!-- </when> -->
<otherwise> <!-- <otherwise> -->
and o.product_category_id = 8 <!-- and o.product_category_id = 8 -->
</otherwise> <!-- </otherwise> -->
</choose> <!-- </choose> -->
</select> </select>
<select id="findPayScaleByPractitionerEG" resultType="com.yd.api.practitioner.vo.payscale.PayScaleInfo"> <select id="findPayScaleByPractitionerEG" resultType="com.yd.api.practitioner.vo.payscale.PayScaleInfo">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment