Переглянути джерело

app im发送任务添加发送标题搜索条件

xgb 2 тижнів тому
батько
коміт
5acfe366b8

+ 7 - 6
fs-company-app/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -327,7 +327,7 @@ public class FsUserCourseVideoController extends AppBaseController {
             return handleWechatError(e);
         }
     }
-    
+
     /**
      * 统一处理微信错误
      */
@@ -339,13 +339,13 @@ public class FsUserCourseVideoController extends AppBaseController {
             Integer errcode = wxError.getError().getErrorCode();
             String errmsg = wxError.getError().getErrorMsg();
             log.error("微信API异常,错误码:{},错误信息:{}", errcode, errmsg);
-            
+
             String friendlyMsg = WechatErrorUtil.getFriendlyMessage(errcode);
             Map<String, Object> extData = new HashMap<>();
             extData.put("wechatErrorCode", errcode);
             return new ResponseResult<>(500, friendlyMsg, null, extData);
         }
-        
+
         // 2. 检查是否是微信错误(格式:微信错误:errcode|errmsg)
         String errorMsg = e.getMessage();
         if (errorMsg != null && errorMsg.startsWith("微信错误:")) {
@@ -356,7 +356,7 @@ public class FsUserCourseVideoController extends AppBaseController {
                     Integer errcode = Integer.parseInt(parts[0]);
                     String errmsg = parts[1];
                     log.error("微信返回错误,错误码:{},错误信息:{}", errcode, errmsg);
-                    
+
                     String friendlyMsg = WechatErrorUtil.getFriendlyMessage(errcode);
                     Map<String, Object> extData = new HashMap<>();
                     extData.put("wechatErrorCode", errcode);
@@ -366,7 +366,7 @@ public class FsUserCourseVideoController extends AppBaseController {
                 }
             }
         }
-        
+
         // 3. 其他错误,返回通用错误信息
         return ResponseResult.fail(500, "获取微信小程序链接失败:" + errorMsg);
     }
@@ -458,10 +458,11 @@ public class FsUserCourseVideoController extends AppBaseController {
     @ApiOperation("任务列表")
     @GetMapping("/im/sendLog")
     public ResponseResult<PageInfo<FsImSendLogVO>> imSendLog(@RequestParam(defaultValue = "1") Integer pageNum,
-                                                             @RequestParam(defaultValue = "10") Integer pageSize) {
+                                                             @RequestParam(defaultValue = "10") Integer pageSize,@RequestParam String keyword) {
         Map<String, Object> params = new HashMap<>();
         params.put("companyId", getCompanyId());
         params.put("companyUserId", Long.parseLong(getUserId()));
+        params.put("keyword", keyword);
 
         PageHelper.startPage(pageNum, pageSize);
         List<FsImSendLogVO> list = imMsgSendLogService.selectFsImSendLogList(params);

+ 3 - 0
fs-service/src/main/java/com/fs/course/vo/newfs/FsImSendLogVO.java

@@ -23,6 +23,9 @@ public class FsImSendLogVO implements Serializable {
     @ApiModelProperty(value = "视频标题")
     private String videoName;
 
+    @ApiModelProperty(value = "视频标题")
+    private String sendTitle;
+
     @ApiModelProperty(value = "计划发课时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date planSendTime;

+ 3 - 0
fs-service/src/main/resources/mapper/im/FsImMsgSendLogMapper.xml

@@ -190,6 +190,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             log.msg_type = 1
             AND log.company_user_id = #{params.companyUserId}
             AND log.company_id = #{params.companyId}
+            <if test="params.keyword != null and params.keyword !='' ">
+                AND log.send_title like  concat('%',#{params.keyword},'%')
+            </if>
         GROUP BY
             log.log_id
         ORDER BY