1.获取用户-业务用分页列表接口

2.问答加入记录时间以及类型

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseInfoController.java

@@ -482,8 +482,8 @@ public class CourseInfoController {
         //查询当前老师自己所有课程下所有人员
         List<Map<String,Object>> openCourseUserList=courseInfoService.getOpenCourseUserList(param);
         List<String> userIdList= openCourseUserList.stream().map(map -> (String) map.get("studentId")).collect(Collectors.toList());
-        String subject="课程："+courseInfo.getCourseName()+"-章节："+chapter.getName()+"-课时："+classHour.getName()+"下存在章节测验，请及时参与";
-        String content="课程："+courseInfo.getCourseName()+"-章节："+chapter.getName()+"-课时："+classHour.getName()+"下存在章节测验，请及时参与";
+        String subject="课程："+courseInfo.getCourseName()+"-章节："+chapter.getName()+"-课时："+classHour.getName()+"下，存在章节测验，请及时参与";
+        String content="课程："+courseInfo.getCourseName()+"-章节："+chapter.getName()+"-课时："+classHour.getName()+"下，存在章节测验，请及时参与";
         DevMessageSendParam devMessageSendParam=new DevMessageSendParam();
         devMessageSendParam.setSubject(subject);
         devMessageSendParam.setContent(content);

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/QuestionAnswer.java

@@ -56,6 +56,14 @@ public class QuestionAnswer {
     @ApiModelProperty(value = "点赞数量", position = 6)
     private Long giveNum;
 
+    /** 记录时间 */
+    @ApiModelProperty(value = "记录时间", position = 5)
+    private String recordTime;
+
+    /** 问答类型 */
+    @ApiModelProperty(value = "问答类型", position = 5)
+    private String infoType;
+
     /** 删除标记(NOT_DELETE-未删除) */
     @ApiModelProperty(value = "删除标记(NOT_DELETE-未删除)", position = 7)
     @TableLogic

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/QuestionAnswerMapper.xml

@@ -44,6 +44,9 @@
             IFNULL(cqa.GIVE_NUM ,'') AS giveNum,
             IFNULL(cqa.COURSE_ID,'') AS courseId,
             IFNULL(ci.COURSE_NAME,'') AS courseIdName,
+            IFNULL(cqa.RECORD_TIME,'') AS recordTime,
+            IFNULL(cqa.INFO_TYPE,'') AS infoType,
+            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='ANSWER_INFO_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(cqa.INFO_TYPE) ),'') AS infoTypeName,
             IFNULL(cqa.USER_ID,'') AS userId,
             IFNULL(su.NAME,'') AS userIdName,
             IFNULL(cr.MAIN_ID ,'') AS hourId,

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/QuestionAnswerAddParam.java

@@ -55,4 +55,12 @@ public class QuestionAnswerAddParam {
     @NotBlank(message = "课时id不能为空")
     private String hourId;
 
+    /** 记录时间 */
+    @ApiModelProperty(value = "记录时间", position = 5)
+    private String recordTime;
+
+    /** 问答类型 */
+    @ApiModelProperty(value = "问答类型", position = 5)
+    private String infoType;
+
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/QuestionAnswerEditParam.java

@@ -58,7 +58,14 @@ public class QuestionAnswerEditParam {
     @ApiModelProperty(value = "课时id", position = 3)
     private String hourId;
 
-    private  String chapterId;
+    /** 记录时间 */
+    @ApiModelProperty(value = "记录时间", position = 5)
+    private String recordTime;
+
+    /** 问答类型 */
+    @ApiModelProperty(value = "问答类型", position = 5)
+    private String infoType;
+
 
 
 

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java

@@ -88,6 +88,21 @@ public class SysUserController {
         return CommonResult.data(sysUserService.queryAllList(sysUserPageParam));
     }
 
+    /**
+     * 获取用户-业务用分页列表
+     *
+     * @author xuyuxiang
+     * @date 2022/4/24 20:00
+     */
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("获取用户-业务用分页列表")
+    @GetMapping("/bus/user/busPageList")
+    public CommonResult<Page<SysUser>> busPageList(SysUserPageParam sysUserPageParam) {
+        //默认不查出资源库特殊账号
+        if(StringUtils.isEmpty(sysUserPageParam.getIsResourceaccount()))sysUserPageParam.setIsResourceaccount("0");
+        return CommonResult.data(sysUserService.busPageList(sysUserPageParam));
+    }
+
     /**
      * 添加用户
      *

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java

@@ -86,6 +86,14 @@ public interface SysUserService extends IService<SysUser> {
      */
     List<SysUser> queryAllList(SysUserPageParam sysUserPageParam);
 
+    /**
+     * 获取用户-业务用分页列表
+     *
+     * @author xuyuxiang
+     * @date 2022/4/24 20:08
+     */
+    Page<SysUser> busPageList(SysUserPageParam sysUserPageParam);
+
     /**
      * 添加用户
      *

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java

@@ -326,6 +326,44 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return jsonList;
     }
 
+    /**
+     * 获取用户-业务用分页列表
+     *
+     * @author xuyuxiang
+     * @date 2022/4/24 20:08
+     */
+    @Override
+    public Page<SysUser> busPageList(SysUserPageParam sysUserPageParam)
+    {
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(sysUserPageParam.getSearchKey())) {
+            queryWrapper.lambda().and(q -> q.like(SysUser::getAccount, sysUserPageParam.getSearchKey()).or()
+                    .like(SysUser::getName, sysUserPageParam.getSearchKey()));
+        }
+        if (ObjectUtil.isNotEmpty(sysUserPageParam.getOrgId())) {
+            queryWrapper.lambda().eq(SysUser::getOrgId, sysUserPageParam.getOrgId());
+        }
+        if (ObjectUtil.isNotEmpty(sysUserPageParam.getUserStatus())) {
+            queryWrapper.lambda().eq(SysUser::getUserStatus, sysUserPageParam.getUserStatus());
+        }
+        if (ObjectUtil.isNotEmpty(sysUserPageParam.getAccount())) {
+            queryWrapper.lambda().eq(SysUser::getAccount, sysUserPageParam.getAccount());
+        }
+        if (ObjectUtil.isNotEmpty(sysUserPageParam.getName())) {
+            queryWrapper.lambda().like(SysUser::getName, sysUserPageParam.getName());
+        }
+        if (ObjectUtil.isNotEmpty(sysUserPageParam.getIsResourceaccount())) {
+            queryWrapper.lambda().eq(SysUser::getIsResourceaccount, sysUserPageParam.getIsResourceaccount());
+        }
+        if (ObjectUtil.isNotEmpty(sysUserPageParam.getEducation())) {
+            queryWrapper.lambda().eq(SysUser::getEducation, sysUserPageParam.getEducation());
+        }
+
+        queryWrapper.lambda().orderByAsc(SysUser::getSortCode);
+        Page<SysUser> jsonList =  this.page(CommonPageRequest.defaultPage(),queryWrapper);
+        return jsonList;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(SysUserAddParam sysUserAddParam) {