微信表单推送、负责人重构

src/main/java/com/qs/serve/modules/biz/controller/BizCommentController.java

@@ -46,7 +46,7 @@ public class BizCommentController {
      * @return
      */
     @GetMapping("/page")
-    public R<PageVo<BizComment>> getPage(BizCommentSo param){
+    public R<PageVo<BizComment>> getPage(@Valid BizCommentSo param){
         BizComment entity = CopierUtil.copy(param,new BizComment());
         LambdaQueryWrapper<BizComment> lqw = new LambdaQueryWrapper<>(entity);
         PageUtil.startPage();

src/main/java/com/qs/serve/modules/biz/entity/so/BizCommentSo.java

@@ -29,9 +29,11 @@ public class BizCommentSo implements Serializable {
     private Long id;
 
     /** 目标类型 */
+    @NotNull(message = "targetType is not null")
     private String targetType;
 
     /** 目标id */
+    @NotNull(message = "targetId is not null")
     private String targetId;
 
     /** 用户id */

src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java

@@ -105,10 +105,11 @@ public class BmsChannelPointMyController {
         List<String> userIds = sysUserSalesService.listByChildIds(loginUserId);
         param.setUserIdList(userIds);
         LambdaQueryWrapper<BmsRegionUser> rulqw = new LambdaQueryWrapper<>();
-        rulqw.select(BmsRegionUser::getPathIds);
+        //rulqw.select(BmsRegionUser::getPathIds);
         rulqw.eq(BmsRegionUser::getUserId,loginUserId);
         List<BmsRegionUser> regionUserList = bmsRegionUserService.list(rulqw);
-        List<String> regionPaths = regionUserList.stream().map(BmsRegionUser::getPathIds).collect(Collectors.toList());
+        List<String> regionPaths = regionUserList.stream().filter(a->StringUtils.hasText(a.getPathIds()))
+                .map(BmsRegionUser::getPathIds).collect(Collectors.toList());
         param.setSourceIdsList(regionPaths);
         PageUtil.startPage();
         param.setTenantId(AuthContextUtils.getTenant());

src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java

@@ -85,6 +85,7 @@ public class BmsChannelPointServiceImpl extends ServiceImpl<BmsChannelPointMappe
             masterUser.setUserId(sysUser.getSyUserId());
             masterUser.setUserName(sysUser.getName());
             masterUser.setUserCode(sysUser.getCode());
+            bmsMasterUserMapper.insert(masterUser);
             //更新底层的关联表
             //hisUserChannelPointService.initSetupByPointId(channelPoint.getId());
         }else {

src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java

@@ -46,13 +46,15 @@ public class WxSvcUserApi {
      */
     @GetMapping("/info")
     public R<?> info(){
-        LoginUser loginUser = AuthContextUtils.getLoginUser();
         WxUser wxUser = wxUserService.getCurrentWxUser(true);
-        SysUser sysUser = sysUserService.getById(loginUser.getUserId());
+        LoginUser loginUser = AuthContextUtils.getLoginUser();
-        sysUser.setAuthorIds(loginUser.getAuthorIds());
+        if(loginUser!=null){
-        sysUser.setAuthorList(loginUser.getAuthorList());
+            SysUser sysUser = sysUserService.getById(loginUser.getUserId());
-        SysUserVo sysUserVo = sysUser.toSysUserVo(false);
+            sysUser.setAuthorIds(loginUser.getAuthorIds());
-        wxUser.setSysUserInfo(sysUserVo);
+            sysUser.setAuthorList(loginUser.getAuthorList());
+            SysUserVo sysUserVo = sysUser.toSysUserVo(false);
+            wxUser.setSysUserInfo(sysUserVo);
+        }
         return R.ok(wxUser);
     }
 

src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java

@@ -6,9 +6,11 @@ import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.modules.baz.entity.BazVisitInstance;
 import com.qs.serve.modules.wx.entity.WxFormPush;
 import com.qs.serve.modules.wx.entity.WxFormPushUser;
 import com.qs.serve.modules.wx.entity.bo.WxFormPushBo;
@@ -21,7 +23,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 微信 表单推送(我的)
@@ -44,9 +48,10 @@ public class WxFormPushMyController {
      * @return
      */
     @GetMapping("/page")
-    public R<List<WxFormPush>> getList(WxFormPushUser param){
+    public R<PageVo<WxFormPush>> getList(WxFormPushUser param){
         LambdaQueryWrapper<WxFormPushUser> lqw = new LambdaQueryWrapper<>(param);
         PageUtil.startPage();
+        lqw.eq(WxFormPushUser::getUserId,AuthContextUtils.getSysUserId());
         List<WxFormPushUser> list = wxFormPushUserService.list(lqw);
         List<WxFormPush> result = new ArrayList<>();
         for (WxFormPushUser pushUser : list) {
@@ -54,7 +59,41 @@ public class WxFormPushMyController {
             formPush.setReadFlag(pushUser.getReadFlag());
             result.add(formPush);
         }
-        return R.ok(result);
+        return R.byPageHelperList(result);
+    }
+
+    /**
+     * 小红点统计(未读数量)
+     * @return
+     */
+    @GetMapping("/getCounter")
+    public R<?> getPage(){
+        LambdaQueryWrapper<WxFormPushUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(WxFormPushUser::getUserId, AuthContextUtils.getSysUserId());
+        lqw.eq(WxFormPushUser::getReadFlag,0);
+        long unFinished = wxFormPushUserService.count(lqw);
+        Map<String,Object> map = new HashMap<>();
+        map.put("unFinished",unFinished);
+        return R.ok(map,"ok");
+    }
+
+    /**
+     * ID查询
+     * @param id
+     * @return
+     */
+    @GetMapping("/getById/{id}")
+    @SysLog(module = SystemModule.Verification, title = "表单推送", biz = BizType.QUERY)
+    public R<WxFormPush> getById(@PathVariable("id") String id){
+        LambdaQueryWrapper<WxFormPushUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(WxFormPushUser::getFormPushId,id);
+        lqw.eq(WxFormPushUser::getUserId, AuthContextUtils.getSysUserId());
+        lqw.ne(WxFormPushUser::getReadFlag,1);
+        WxFormPushUser pushUser = new WxFormPushUser();
+        pushUser.setReadFlag(1);
+        wxFormPushUserService.update(pushUser,lqw);
+        WxFormPush wxFormPush = wxFormPushService.getById(id);
+        return R.ok(wxFormPush);
     }
 
 }

src/main/resources/mapper/bms/BmsChannelPointMapper.xml

@@ -186,10 +186,12 @@
         FROM (
          SELECT DISTINCT mu.point_id target_id
          FROM `his_user_channel_point` mu
-         WHERE `his_user_channel_point`.del_flag = 0
+         WHERE
+         1=1
+        <if test="(query.userIdList!=null and query.userIdList.size > 0) or (query.sourceIdsList!=null and query.sourceIdsList.size > 0)">
          AND (
             <if test="query.userIdList!=null and query.userIdList.size > 0">
-                 `his_user_channel_point`.user_id in
+                 `mu`.user_id in
                 <foreach collection="query.userIdList" item="selectId" index="i" open="(" close=")" separator=",">
                     #{selectId}
                 </foreach>
@@ -199,11 +201,11 @@
                     or
                 </if>
                 <foreach collection="query.sourceIdsList" item="selectId" index="i" open="(" close=")" separator="or">
-                    `his_user_channel_point`.`source_ids` like concat(#{selectId},"_")
+                    `mu`.`source_ids` like concat(#{selectId},"_")
                 </foreach>
             </if>
          )
-         AND `his_user_channel_point`.tenant_id = #{query.tenantId}
+        </if>
         ) pmu
         LEFT JOIN `bms_channel_point` `bms_channel_point` ON `bms_channel_point`.id = pmu.target_id
         <if test="query.supplierId!=null and query.supplierId!=''">

src/main/resources/mapper/his/HisUserChannelPointMapper.xml

@@ -58,7 +58,7 @@
                     <if test="idx!=0">
                         or
                     </if>
-                    `his_user_channel_point`.`source_ids` like concat(#{selectId},"_")
+                    `his_user_channel_point`.`source_ids` like concat(#{selectId},'_%')
                 </foreach>
             </if>
             <if test="query.userIdList!=null and query.userIdList.size > 0">