团队查询 sql 修改 增员服务消息添加

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.constants.SysConstants;
+import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
@@ -29,6 +30,8 @@ import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.model.vo.EsmUserImageQueryVo;
 import com.ydtech.modules.esm.service.EsmUserImageService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
+import com.ydtech.modules.message.constants.MessageTypeConstants;
+import com.ydtech.modules.message.service.MessageSecretaryService;
 import com.ydtech.modules.order.entity.po.InsUploadFiles;
 import com.ydtech.modules.order.service.InsUploadFilesService;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
@@ -86,6 +89,8 @@ public class SysUserController extends BaseController {
 
     private final SysUserIsDialService sysUserIsDialService;
 
+    private final MessageSecretaryService messageSecretaryService;
+
 
     //    @PreAuthorize("hasAuthority('sys:user:delete')")
     @ApiOperation(value = "逻辑删除")
@@ -649,6 +654,11 @@ public class SysUserController extends BaseController {
         userRole.setRoleId(dto.getFlag().equals("1") ? 20L : 19L);
         sysUserRoleService.save(userRole);
 
+        //添加增员服务消息
+        //添加订单消息
+        messageSecretaryService.addMessage(MessageTypeConstants.M_6, dto.getReferrerId(),
+                dto.getMobile() + "(" + dto.getName() + ")" + "进行注册,请立即审核.");
+
         if (dto.getFlag().equals("1")) {
             esmUserReferrerService.addReferrer(dto.getReferrerId(), nextPK);
         }

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

@@ -24,60 +24,64 @@
 
         SELECT
         su.id,
-        su.NAME as username,
-        count( iac.id ) AS policynum,
-        sum( iac.sumpremium ) AS sumpremium
+        su.NAME AS username,
+        COALESCE ( count( iac.id ), 0 ) AS policynum,
+        COALESCE ( sum( iac.sumpremium ), 0 ) AS sumpremium
         FROM
-        ins_orders io
+        sys_user su
+        LEFT JOIN ins_orders io ON io.userid = su.id
+        AND io.createtime BETWEEN #{startDate} AND #{endDate}
         LEFT JOIN ins_area_company iac ON io.orderno = iac.orderno
-        LEFT JOIN sys_user su ON io.userid = su.id
+        AND iac.orderstatus = 3
         WHERE
-        iac.orderstatus = 3
-        AND io.createtime BETWEEN #{startDate} AND #{endDate}
-        AND io.userid in
+        su.id IN
         <foreach item="item" index="index" collection="userList" open="(" separator="," close=")">
             #{item}
         </foreach>
         GROUP BY
-        io.userid
+        su.id,
+        su.NAME
         ) a,
-        (SELECT
+        (
+        SELECT
         su.id,
-        su.NAME as username,
-        count( iac.id ) AS policynum,
-        sum( iac.sumpremium ) AS sumpremium
+        su.NAME AS username,
+        COALESCE ( count( iac.id ), 0 ) AS policynum,
+        COALESCE ( sum( iac.sumpremium ), 0 ) AS sumpremium
         FROM
-        ins_orders io
+        sys_user su
+        LEFT JOIN ins_orders io ON io.userid = su.id
+        AND io.createtime BETWEEN #{startDate} AND #{endDate}
         LEFT JOIN ins_area_company iac ON io.orderno = iac.orderno
-        LEFT JOIN sys_user su ON io.userid = su.id
         WHERE
-
-        io.createtime BETWEEN #{startDate} AND #{endDate}
-        AND io.userid in
+        su.id IN
         <foreach item="item" index="index" collection="userList" open="(" separator="," close=")">
             #{item}
         </foreach>
         GROUP BY
-        io.userid
+        su.id,
+        su.NAME
         )b,
-        (SELECT
+        (
+        SELECT
         su.id,
-        su.NAME as username,
-        count( iac.id ) AS policynum,
-        sum( iac.sumpremium ) AS sumpremium
+        su.NAME AS username,
+        COALESCE ( count( iac.id ), 0 ) AS policynum,
+        COALESCE ( sum( iac.sumpremium ), 0 ) AS sumpremium
         FROM
-        ins_orders io
+        sys_user su
+        LEFT JOIN ins_orders io ON io.userid = su.id
+        AND io.createtime BETWEEN #{startDate} AND #{endDate}
         LEFT JOIN ins_area_company iac ON io.orderno = iac.orderno
-        LEFT JOIN sys_user su ON io.userid = su.id
+        AND iac.orderstatus = 2
         WHERE
-        iac.orderstatus = 2 AND
-        io.createtime BETWEEN #{startDate} AND #{endDate}
-        AND io.userid in
+        su.id IN
         <foreach item="item" index="index" collection="userList" open="(" separator="," close=")">
             #{item}
         </foreach>
         GROUP BY
-        io.userid
+        su.id,
+        su.NAME
         )c
         where a.id = b.id and b.id = c.id
     </select>