dashboard-18

yd-api/src/main/java/com/yd/dal/service/agms/impl/AgmsDashboardDALServiceImpl.java

@@ -20,10 +20,7 @@ import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -199,7 +196,18 @@ public class AgmsDashboardDALServiceImpl implements AgmsDashboardDALService {
 
 
     @Override
     @Override
     public List<Map<String, Object>> queryTeamAllMap() {
     public List<Map<String, Object>> queryTeamAllMap() {
-        return agmsDashboardMapper.queryTeamAllMap();
+        List<Map<String, Object>> memberList = agmsDashboardMapper.queryTeamAllMap();
+
+        Object teamMember = null;
+        String[] arr = null;
+        for (Map<String, Object> map : memberList) {
+            teamMember = map.get("teamMember");
+            if (teamMember != null && StringUtils.isNotBlank((String) teamMember)) {
+                arr = ((String) teamMember).split(",");
+                map.put("teamMember", Arrays.asList(arr));
+            }
+        }
+        return memberList;
     }
     }
 
 
     @Override
     @Override

yd-api/src/main/resources/mapper/agms/AgmsDashboardMapper.xml

@@ -65,7 +65,7 @@
                 where tt.md_drop_option_id = #{dropOptionId,jdbcType=BIGINT}
                 where tt.md_drop_option_id = #{dropOptionId,jdbcType=BIGINT}
                 and a.id = tt.leads_assigned_id)
                 and a.id = tt.leads_assigned_id)
 
 
-                and p.id in (#{item.teamMember})
+                and p.id in <foreach collection="item.teamMember" item="p_id" open="(" separator="," close=")">#{p_id,jdbcType=BIGINT}</foreach>
             </if>
             </if>
         </foreach>
         </foreach>
         order by scoreDay desc ,scoreWeek desc ,scoreMonth desc
         order by scoreDay desc ,scoreWeek desc ,scoreMonth desc
@@ -182,7 +182,7 @@
                 where tt.md_drop_option_id = #{dropOptionId,jdbcType=BIGINT}
                 where tt.md_drop_option_id = #{dropOptionId,jdbcType=BIGINT}
                 and a.id = tt.leads_assigned_id)
                 and a.id = tt.leads_assigned_id)
 
 
-                and p.id in (#{item.teamMember})
+                and p.id in <foreach collection="item.teamMember" item="p_id" open="(" separator="," close=")">#{p_id,jdbcType=BIGINT}</foreach>
             </if>
             </if>
         </foreach>
         </foreach>
         order by predictFYC desc ,predictFYP desc ,pieces desc ,opportunityNum desc
         order by predictFYC desc ,predictFYP desc ,pieces desc ,opportunityNum desc
@@ -302,7 +302,7 @@
                 left join ag_acl_insurer_branch b on b.id = p.insurer_branch_id
                 left join ag_acl_insurer_branch b on b.id = p.insurer_branch_id
                 left join ag_acl_practitioner_subordinate_system s on s.id = p.subordinate_system_id
                 left join ag_acl_practitioner_subordinate_system s on s.id = p.subordinate_system_id
                 where o.status = 3 and o.payment_status=3
                 where o.status = 3 and o.payment_status=3
-                and p.id in (#{item.teamMember})
+                and p.id in <foreach collection="item.teamMember" item="p_id" open="(" separator="," close=")">#{p_id,jdbcType=BIGINT}</foreach>
                 <choose>
                 <choose>
                     <when test="category.equalsIgnoreCase('life')">
                     <when test="category.equalsIgnoreCase('life')">
                         and o.product_category_id in (2,5,8)
                         and o.product_category_id in (2,5,8)
@@ -410,7 +410,7 @@
                 left join ag_acl_practitioner_hiring_approve_records hr on hr.hiring_basic_info_id=p.hiring_basic_info_id
                 left join ag_acl_practitioner_hiring_approve_records hr on hr.hiring_basic_info_id=p.hiring_basic_info_id
                 and hr.approve_step_id=5 and hr.approving_status=1
                 and hr.approve_step_id=5 and hr.approving_status=1
                 WHERE 1=1
                 WHERE 1=1
-                and p.id in (#{item.teamMember})
+                and p.id in <foreach collection="item.teamMember" item="p_id" open="(" separator="," close=")">#{p_id,jdbcType=BIGINT}</foreach>
                 and p.is_active = 1
                 and p.is_active = 1
             </if>
             </if>
         </foreach>
         </foreach>