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

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.
 
     private void disposalPractitionerInfo(PractitionerInfoForAchievement practitionerInfo, Map<Integer, PractitionerBasicInfo> practitionerBasicInfoMap, Integer time, Integer platform) {
         Double fyc = practitionerInfo.getFyc();
-        PractitionerRankInfo practitionerRankInfo = null;
-        Double fycOther;
+//        PractitionerRankInfo practitionerRankInfo = null;
+//        Double fycOther;
         PractitionerBasicInfo practitionerBasicInfoYD = practitionerBasicInfoMap.get(1);
         if (practitionerBasicInfoYD != null) {
             String practitionerIdYD = practitionerBasicInfoYD.getPractitionerId();
             if (!Strings.isNullOrEmpty(practitionerIdYD)) {
                 Long practitionerId = Long.parseLong(practitionerIdYD);
-                practitionerRankInfo = aclPractitionerDALService.getPractitionerRankInfoByPractitionerIdYD(practitionerId, time, platform);
+//                practitionerRankInfo = aclPractitionerDALService.getPractitionerRankInfoByPractitionerIdYD(practitionerId, time, platform);
 //                if (platform == 1) {
 //                    PractitionerBasicInfo practitionerBasicInfoEG = practitionerBasicInfoMap.get(2);
 //                    if (practitionerBasicInfoEG != null) {
@@ -628,10 +628,10 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
 //                } else {
 //                    practitionerRankInfo = aclPractitionerDALService.getPractitionerRankInfoByPractitionerIdYD(practitionerId, time, platform);
 //                }
-                fycOther = practitionerRankInfo != null ? practitionerRankInfo.getFyc() : 0D;
-                Double fycSum = CommonUtil.doubleFormat(fyc + fycOther, 2);
-                if (fycSum != 0) {
-                    Double completeRate = getCompletionRate(practitionerId, null, fycSum, time);
+//                fycOther = practitionerRankInfo != null ? practitionerRankInfo.getFyc() : 0D;
+//                Double fycSum = CommonUtil.doubleFormat(fyc + fycOther, 2);
+                if (fyc != 0) {
+                    Double completeRate = getCompletionRate(practitionerId, null, fyc, time);
                     practitionerInfo.setCompletionRate(completeRate);
                 }
             }

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

@@ -1316,14 +1316,14 @@
         and YEAR(f.order_date) = YEAR(now())
       </otherwise>
     </choose>
-    <choose>
-      <when test="platform == 1">
-        and o.product_category_id != 8 -- o.flag != 'Manual'
-      </when>
-      <otherwise>
-        and o.product_category_id = 8
-      </otherwise>
-    </choose>
+<!--     <choose> -->
+<!--       <when test="platform == 1"> -->
+<!--         and o.product_category_id != 8  -->
+<!--       </when> -->
+<!--       <otherwise> -->
+<!--         and o.product_category_id = 8 -->
+<!--       </otherwise> -->
+<!--     </choose> -->
     group by p.id
     
     ) t WHERE t.count > 0 
@@ -1373,14 +1373,14 @@
         and YEAR(f.order_date) = YEAR(now())
       </otherwise>
     </choose>
-    <choose>
-      <when test="platform == 1">
-        and o.product_category_id != 8 -- o.flag != 'Manual'
-      </when>
-      <otherwise>
-        and o.product_category_id = 8
-      </otherwise>
-    </choose>
+<!--     <choose> -->
+<!--       <when test="platform == 1"> -->
+<!--         and o.product_category_id != 8  -->
+<!--       </when> -->
+<!--       <otherwise> -->
+<!--         and o.product_category_id = 8 -->
+<!--       </otherwise> -->
+<!--     </choose> -->
     group by p.id
   </select>
 
@@ -1645,14 +1645,14 @@
         and YEAR(f.order_date) = YEAR(now())
       </otherwise>
     </choose>
-    <choose>
-      <when test="platform == 1">
-        and o.product_category_id != 8 -- o.flag != 'Manual'
-      </when>
-      <otherwise>
-        and o.product_category_id = 8
-      </otherwise>
-    </choose>
+<!--     <choose> -->
+<!--       <when test="platform == 1"> -->
+<!--         and o.product_category_id != 8  -->
+<!--       </when> -->
+<!--       <otherwise> -->
+<!--         and o.product_category_id = 8 -->
+<!--       </otherwise> -->
+<!--     </choose> -->
     
   </select>
   <select id="findPayScaleByPractitionerEG" resultType="com.yd.api.practitioner.vo.payscale.PayScaleInfo">