团队业绩--增加排序

src/main/java/com/ydtech/modules/esm/model/vo/EsmUserPolicyVO.java

@@ -17,10 +17,10 @@ public class EsmUserPolicyVO implements Serializable {
     private String id;//人员id
     @ApiModelProperty(value = "人员名称")
     private String username;//人员名称
-    @ApiModelProperty(value = "核保笔数")
-    private int ordernum;//核保笔数
     @ApiModelProperty(value = "出单笔数")
-    private int policynum;//出单笔数
+    private int ordernum;//出单笔数
+    @ApiModelProperty(value = "核保笔数")
+    private int policynum;//核保笔数
     @ApiModelProperty(value = "签单保费")
     private double sumpremium;//签单保费
 

src/main/java/com/ydtech/modules/esm/service/impl/EsmUserReferrerServiceImpl.java

@@ -288,6 +288,8 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
             userPolicyList0= this.baseMapper.queryOrderCount(userList0,record.getStartdate(),record.getEnddate());
             //汇总数据加工
             EsmTeamPolicyVO esmTeamPolicyVO0=this.baseMapper.queryOrderCountHz(userList0,record.getStartdate(),record.getEnddate());
+            EsmTeamPolicyVO esmTeamPolicyVO1=new EsmTeamPolicyVO();
+            EsmTeamPolicyVO esmTeamPolicyVO2=new EsmTeamPolicyVO();
             if(esmTeamPolicyVO0==null){
                 esmTeamPolicyVO0=new EsmTeamPolicyVO();
                 esmTeamPolicyVO0.setSumpremium(0);
@@ -297,11 +299,9 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
             }
             esmTeamPolicyVO0.setTeamlevel("本人");
             esmTeamPolicyVO0.setTeamnum(1);
-            hzList.add(esmTeamPolicyVO0);
 
             // 一级团队信息
             userList1 = this.baseMapper.getIdDown_1(esmUserReferrer.getId());
-            EsmTeamPolicyVO esmTeamPolicyVO1=new EsmTeamPolicyVO();
             esmTeamPolicyVO1.setTeamlevel("一级团队");
             if(userList1!=null && userList1.size()>0){
                 userPolicyList1=this.baseMapper.queryOrderCount(userList1,record.getStartdate(),record.getEnddate());
@@ -313,7 +313,7 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
                 esmTeamPolicyVO1.setTeamnum(userList1.size());//团队人数
                 // 二级团队信息
                 userList2 = this.baseMapper.getIdDown_2(esmUserReferrer.getId());
-                EsmTeamPolicyVO esmTeamPolicyVO2=new EsmTeamPolicyVO();
+
                 esmTeamPolicyVO2.setTeamlevel("二级团队");
                 if(userList2!=null && userList2.size()>0){
                     userPolicyList2=this.baseMapper.queryOrderCount(userList2,record.getStartdate(),record.getEnddate());
@@ -333,16 +333,15 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
                         hzList.add(esmTeamPolicyVO3);
                     }*/
                 }
-                hzList.add(esmTeamPolicyVO2);
+
             }
-            hzList.add(esmTeamPolicyVO1);
 
             //临时团队
             List<String> registList= this.baseMapper.getIdDown3_regist(record.getId());
             EsmTeamPolicyVO esmTeamPolicyVO9=new EsmTeamPolicyVO();
             esmTeamPolicyVO9.setTeamlevel("临时团队");
             esmTeamPolicyVO9.setTeamnum(registList==null?0:registList.size());
-            hzList.add(esmTeamPolicyVO9);
+
             //汇总
             List<String> userList=new ArrayList<>();
             userList.addAll(userList0);
@@ -359,7 +358,10 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
             esmTeamPolicyVO.setTeamlevel("汇总");
             esmTeamPolicyVO.setTeamnum(userList.size());
             hzList.add(esmTeamPolicyVO);
-
+            hzList.add(esmTeamPolicyVO0);
+            hzList.add(esmTeamPolicyVO1);
+            hzList.add(esmTeamPolicyVO2);
+            hzList.add(esmTeamPolicyVO9);
             esmUserCountVO.setHzList(hzList);
             esmUserCountVO.setUserPolicyList(userPolicyList);
             esmUserCountVO.setUserPolicyList0(userPolicyList0);