增加临时团队信息

src/main/java/com/ydtech/modules/esm/controller/EsmUserController.java

@@ -155,10 +155,14 @@ public class EsmUserController extends BaseController {
     public HttpResult queryTeamPolicy(@RequestBody TeamUserQryVO record){
         StringBuffer whereStr = new StringBuffer();
         ArrayList<String> params = new ArrayList<String>();
+        if (StringUtils.isNullOrEmpty(record.getId())) {
+            return HttpResult.error("用户ID不能为空！");
+        }
         if (StringUtils.isNullOrEmpty(record.getStartdate()) || StringUtils.isNullOrEmpty(record.getEnddate())) {
             return HttpResult.error("起止时间不能为空！");
         }
 
+        params.add(record.getId());
         params.add(record.getId());
         params.add(record.getId());
         params.add(record.getStartdate());
@@ -179,13 +183,16 @@ public class EsmUserController extends BaseController {
     public HttpResult countUserPolicy(@RequestBody TeamUserQryVO record){
         StringBuffer whereStr = new StringBuffer();
         ArrayList<String> params = new ArrayList<String>();
-        whereStr.append(" where a.affiliation=? ");
-        params.add(record.getId());
-        if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-            whereStr.append("and a.createtime between ? and ?");
-            params.add(record.getStartdate());
-            params.add(record.getEnddate());
+        if (StringUtils.isNullOrEmpty(record.getId())) {
+            return HttpResult.error("用户ID不能为空！");
+        }
+        if (StringUtils.isNullOrEmpty(record.getStartdate()) || StringUtils.isNullOrEmpty(record.getEnddate())) {
+            return HttpResult.error("起止时间不能为空！");
         }
+
+        params.add(record.getStartdate());
+        params.add(record.getEnddate());
+        params.add(record.getId());
         List<EsmUserPolicyVO> list = esmUserReferrerService.countUserPolicy(whereStr.toString(), params.toArray());
 
         return HttpResult.ok(list);

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

@@ -159,12 +159,15 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
     public List<EsmUserPolicyVO> countUserPolicy(String whereCase, Object[] paramValues){
         List<EsmUserPolicyVO> recordList = new ArrayList<EsmUserPolicyVO>();
 
-        String sql = "select a.`level` teamlevel,b.name username,\n" +
+        String sql = "select b.teamlevel,b.name username,\n" +
                 "sum(case when orderstatus in (1,2,3,4) then 1  else 0 end) ordernum,\n" +
                 "sum(case when orderstatus=3 then 1 else 0 end) policynum,\n" +
                 "sum(case when orderstatus=3 then sumpremium else 0 end) sumpremium\n" +
-                "from v_user_order a left join sys_user b on a.id=b.id " + whereCase;
-        sql += " group by a.`level`,b.name order by a.`level`";
+                "from v_user_referrer b \n" +
+                "left join v_user_order a on b.id=a.id \n" +
+                "and a.createtime between ? and ? \n" +
+                "where b.affiliation=? \n" +
+                "group by b.teamlevel,b.name order by b.teamlevel;";
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 
@@ -202,6 +205,11 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
                 "where a.affiliation=?\n" +
                 "group by a.`level`\n" +
                 "union all \n" +
+                "select 9 teamlevel,count(distinct a.id) teamnum, 0 sumpremium,0 usernum\n" +
+                "from esm_user_referrer a\n" +
+                "left join sys_user b on a.id=b.id\n" +
+                "where a.affiliation=? and b.status=2 " +
+                "union all \n" +
                 "select a.`level` teamlevel,0 teamnum, sum(sumpremium) sumpremium,count(distinct id) usernum\n" +
                 "from v_user_order a\n" +
                 "where a.affiliation=? and a.orderstatus=3\n" +