Merge branch 'test' into test-dx

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

@@ -13,20 +13,28 @@ public class EsmUserPolicyVO implements Serializable {
 
     private static final long serialVersionUID = 5053893395186078389L;
 
-    private String teamlevel;//团队等级
-    private String id;//人员id
+    @ApiModelProperty("人员id")
+    private String id;
+
+    @ApiModelProperty("团队等级")
+    private String teamlevel;
+
     @ApiModelProperty(value = "人员名称")
-    private String username;//人员名称
+    private String username;
+
     @ApiModelProperty(value = "出单笔数")
-    private int ordernum;//出单笔数
+    private int ordernum;
+
     @ApiModelProperty(value = "核保笔数")
-    private int policynum;//核保笔数
+    private int policynum;
+
     @ApiModelProperty(value = "签单保费")
-    private double sumpremium;//签单保费
+    private double sumpremium;
+
     @ApiModelProperty(value = "报价次数")
-    private int bjpolicynum;//报价次数
-    @ApiModelProperty(value = "报价金额")
-    private double bjsumpremium;//报价金额
+    private int bjpolicynum;
 
+    @ApiModelProperty(value = "报价金额")
+    private double bjsumpremium;
 
 }

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

@@ -34,6 +34,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 @Service
@@ -68,7 +70,7 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
     }
 
     private static void findParentsRecursive(String userId, List<EsmUserReferrer> esmUserReferrers, List<EsmUserReferrer> referrers) {
-        if(esmUserReferrers.isEmpty())
+        if (esmUserReferrers.isEmpty())
             return;
         EsmUserReferrer collect = esmUserReferrers.stream().filter(item -> item.getId().equals(userId)).findFirst()
                 .orElse(null);
@@ -334,6 +336,7 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
         List<EsmUserPolicyVO> userPolicyList1 = new ArrayList<>();
         List<EsmUserPolicyVO> userPolicyList2 = new ArrayList<>();
         List<EsmUserPolicyVO> userPolicyList3 = new ArrayList<>();
+        List<EsmUserPolicyVO> userPolicyList9 = new ArrayList<>();
         EsmUserReferrer esmUserReferrer = getById(record.getId());
         if (esmUserReferrer != null) {
             List<String> userList1 = new ArrayList<>();
@@ -364,7 +367,7 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
             // 一级团队信息
             userList1 = this.baseMapper.getIdDown_1(esmUserReferrer.getId());
             esmTeamPolicyVO1.setTeamlevel("一级会员");
-            if (userList1 != null && userList1.size() > 0) {
+            if (userList1 != null && !userList1.isEmpty()) {
                 userPolicyList1 = this.baseMapper.queryOrderCount(userList1, record.getStartdate(), record.getEnddate());
                 EsmTeamPolicyVO esmTeamPolicyVO1_t = this.baseMapper.queryOrderCountHz(userList1, record.getStartdate(),
                         record.getEnddate());
@@ -377,7 +380,7 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
                 userList2 = this.baseMapper.getIdDown_2(esmUserReferrer.getId());
 
                 esmTeamPolicyVO2.setTeamlevel("二级会员");
-                if (userList2 != null && userList2.size() > 0) {
+                if (userList2 != null && !userList2.isEmpty()) {
                     userPolicyList2 = this.baseMapper.queryOrderCount(userList2, record.getStartdate(), record.getEnddate());
                     EsmTeamPolicyVO esmTeamPolicyVO2_t = this.baseMapper.queryOrderCountHz(userList2, record.getStartdate(),
                             record.getEnddate());
@@ -388,9 +391,9 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
                     esmTeamPolicyVO2.setTeamnum(userList2.size());
                     // 三级团队信息
                     userList3 = this.baseMapper.getIdDown_3(esmUserReferrer.getId());
-                    if(userList3!=null && userList3.size()>0){
-                        userPolicyList3=this.baseMapper.queryOrderCount(userList3,record.getStartdate(), record.getEnddate());
-                        EsmTeamPolicyVO esmTeamPolicyVO3_t=this.baseMapper.queryOrderCountHz(userList3,record.getStartdate(), record.getEnddate());
+                    if (userList3 != null && !userList3.isEmpty()) {
+                        userPolicyList3 = this.baseMapper.queryOrderCount(userList3, record.getStartdate(), record.getEnddate());
+                        EsmTeamPolicyVO esmTeamPolicyVO3_t = this.baseMapper.queryOrderCountHz(userList3, record.getStartdate(), record.getEnddate());
                         esmTeamPolicyVO3.setTeamlevel("三级会员");
                         esmTeamPolicyVO3.setTeamnum(userList3.size());
                         if (esmTeamPolicyVO2_t != null) {
@@ -400,11 +403,14 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
 
                     }
                 }
-
             }
 
             //临时团队
             List<String> registList = this.baseMapper.getIdDown3_regist(record.getId());
+            if (registList != null && !registList.isEmpty()) {
+                userPolicyList9 = this.baseMapper.queryOrderCount(registList, record.getStartdate(), record.getEnddate());
+            }
+
             EsmTeamPolicyVO esmTeamPolicyVO9 = new EsmTeamPolicyVO();
             esmTeamPolicyVO9.setTeamlevel("临时会员");
             esmTeamPolicyVO9.setTeamnum(registList == null ? 0 : registList.size());
@@ -432,11 +438,26 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
             hzList.add(esmTeamPolicyVO3);
             hzList.add(esmTeamPolicyVO9);
             esmUserCountVO.setHzList(hzList);
+
+            // 设置级别
+            Map<String, String> collect1 = userPolicyList1.stream().collect(Collectors.toMap(EsmUserPolicyVO::getId, x -> "1"));
+            Map<String, String> collect2 = userPolicyList2.stream().collect(Collectors.toMap(EsmUserPolicyVO::getId, x -> "2"));
+            Map<String, String> collect3 = userPolicyList3.stream().collect(Collectors.toMap(EsmUserPolicyVO::getId, x -> "3"));
+            Map<String, String> collect = Stream.of(collect1, collect2, collect3)
+                    .flatMap(map -> map.entrySet().stream())
+                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+            userPolicyList.forEach(x -> {
+                String s = collect.get(x.getId());
+                x.setTeamlevel(s);
+            });
+
             esmUserCountVO.setUserPolicyList(userPolicyList);
             esmUserCountVO.setUserPolicyList0(userPolicyList0);
             esmUserCountVO.setUserPolicyList1(userPolicyList1);
             esmUserCountVO.setUserPolicyList2(userPolicyList2);
             esmUserCountVO.setUserPolicyList3(userPolicyList3);
+            esmUserCountVO.setUserPolicyList9(userPolicyList9);
         } else {
             throw new SystemException("内部错误");
         }
@@ -458,14 +479,15 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
         }
         int i = esmUserReferrers.get(0).getLevel() + 3;
         PageHelper.startPage(managementQueryVo.getPageNum(), managementQueryVo.getPageSize());
+        if ("2".equals(managementQueryVo.getAuthenticationStatus())) {
+            managementQueryVo.setAuthenticationStatus("-1");
+        }
         List<SysUserTeamDto> byTeam = baseMapper.getByTeam(managementQueryVo, userId, i);
         PageResult<SysUserTeamDto> sysUserPageResult = new PageResult<>(byTeam);
-        return new BasePageResult<>(managementQueryVo.getPageNum(), managementQueryVo.getPageSize(), sysUserPageResult.getTotalPages(),
-                sysUserPageResult.getPageSize(), sysUserPageResult.getContent());
+        return new BasePageResult<>(managementQueryVo.getPageNum(), managementQueryVo.getPageSize(), sysUserPageResult.getPageSize(),
+                sysUserPageResult.getTotalPages(), sysUserPageResult.getContent());
     }
 
-
-
     /**
      * 人员团队业绩统计--指定业务员查询
      *

src/main/resources/mapper/modules/esm/EsmUserReferrerMapper.xml

@@ -182,9 +182,14 @@
             or u.name = #{managementQueryVo.criteria}
             or u.mobile = #{managementQueryVo.criteria})
         </if>
-        <if test="managementQueryVo.authenticationStatus != null and managementQueryVo.authenticationStatus != ''">
-            AND u.status = #{managementQueryVo.authenticationStatus}
-        </if>
+        <choose>
+            <when test="managementQueryVo.authenticationStatus == '-1' ">
+                AND u.status != 1
+            </when>
+            <when test="managementQueryVo.authenticationStatus != null and managementQueryVo.authenticationStatus != ''">
+                AND u.status = #{managementQueryVo.authenticationStatus}
+            </when>
+        </choose>
     </select>
 
     <select id="employeeIncreaseReportYear" resultType="com.ydtech.modules.admin.model.dto.EmployeeIncreaseReportDto">