Merge branch 'dev' of http://192.168.1.245:11111/jinjilong/onlineEducation-fwd into dev

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

@@ -64,6 +64,16 @@ public class NoticeController {
         return CommonResult.data(noticeService.page(noticePageParam));
     }
 
+
+
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("获取notice分页")
+    @GetMapping("/disk/notice/readPage")
+    public CommonResult<Page<NoticeVo>> readPage(NoticePageParam noticePageParam) {
+        return CommonResult.data(noticeService.readPage(noticePageParam));
+    }
+
     /**
      * 添加notice
      *

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/NoticeMapper.java

@@ -38,4 +38,6 @@ public interface NoticeMapper extends BaseMapper<Notice> {
     void publish(NoticeIdParam noticeIdParam);
 
     void cancel(NoticeIdParam noticeIdParam);
+
+    Page<NoticeVo> readPage(@Param("page") Page<Object> objectPage, @Param("noticePageParam")  NoticePageParam noticePageParam, @Param("typelist") List<String> typelist);
 }

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

@@ -16,7 +16,8 @@
             a.NOTICE_STATUS noticeStatus,
             b.name publishUserName
         FROM
-            ONLINEEDU."notice" a  LEFT JOIN sys_user b ON  a.PUBLISH_USER = b.id
+            ONLINEEDU."notice" a
+        LEFT JOIN sys_user b ON  a.PUBLISH_USER = b.id
         <where>
             <if test="noticePageParam.title!=null">
                 a.TITLE like concat('%',#{noticePageParam.title},'%')
@@ -35,6 +36,43 @@
         order by a.MODIFY_TIME desc
     </select>
 
+    <select id="readPage" resultType="vip.xiaonuo.disk.vo.notice.NoticeVo">
+        SELECT
+        a.NOTICE_ID noticeId,
+        a.CONTENT content,
+        a.CREATE_TIME createTime,
+        a.CREATE_USER_ID createUserId,
+        a.MODIFY_TIME modifyTime,
+        a.MODIFY_USER_ID modifyUserId,
+        a.PLATFORM platform,
+        a.TITLE title,
+        a.PUBLISH_USER publishUser,
+        a.PUBLISH_TIME publishTime,
+        a.NOTICE_STATUS noticeStatus,
+        b.name publishUserName,
+        CASE
+          WHEN (SELECT count(1) FROM USER_READ c WHERE a.NOTICE_ID = c.MAIN_ID AND c.USER_ID = #{noticePageParam.userId}) > 0
+        THEN true  ELSE false  END AS isRead
+        FROM
+        ONLINEEDU."notice" a
+        LEFT JOIN sys_user b ON  a.PUBLISH_USER = b.id
+        <where>
+            <if test="noticePageParam.title!=null">
+                a.TITLE like concat('%',#{noticePageParam.title},'%')
+            </if>
+            <if test="typelist!=null">
+                and a.PLATFORM in
+                <foreach collection="typelist" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            and  a.DELETE_FLAG='NOT_DELETE' and  a.NOTICE_STATUS=1
+        </where>
+        order by a.MODIFY_TIME desc
+    </select>
+
+
+
     <select id="detail" resultType="vip.xiaonuo.disk.vo.notice.NoticeVo">
         SELECT
             a.NOTICE_ID noticeId,

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/NoticeService.java

@@ -83,4 +83,6 @@ public interface NoticeService extends IService<Notice> {
     void publish(@Valid NoticeIdParam noticeIdParam);
 
     void cancel(@Valid NoticeIdParam noticeIdParam);
+
+    Page<NoticeVo> readPage(NoticePageParam noticePageParam);
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/NoticeServiceImpl.java

@@ -50,19 +50,26 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
     @Override
     public Page<NoticeVo> page(NoticePageParam noticePageParam) {
         List<String> typelist = null;
+        noticePageParam.setUserId(StpLoginUserUtil.getLoginUser().getId());
         if("0".equals(StpLoginUserUtil.getLoginUser().getEduIdentity())){
             typelist=Arrays.asList("3");
         }
         if("1".equals(StpLoginUserUtil.getLoginUser().getEduIdentity())){
-            typelist= Arrays.asList("1","2","3");
-            noticePageParam.setUserId(StpLoginUserUtil.getLoginUser().getId());
-        }
-        if("2".equals(StpLoginUserUtil.getLoginUser().getEduIdentity())){
-            typelist= Arrays.asList("1","2","3");
+            typelist= Arrays.asList("1","2");
         }
         return noticeMapper.page(CommonPageRequest.defaultPage(), noticePageParam,typelist);
     }
 
+    @Override
+    public Page<NoticeVo> readPage(NoticePageParam noticePageParam) {
+        List<String> typelist = Arrays.asList("1","2","3");
+        noticePageParam.setUserId(StpLoginUserUtil.getLoginUser().getId());
+        return noticeMapper.readPage(CommonPageRequest.defaultPage(), noticePageParam,typelist);
+    }
+
+
+
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(NoticeAddParam noticeAddParam) {
@@ -122,4 +129,6 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
          noticeMapper.cancel(noticeIdParam);
     }
 
+
+
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/vo/notice/NoticeVo.java

@@ -83,5 +83,6 @@ public class NoticeVo {
     @ApiModelProperty(value = "状态(0未发布  1已发布)", position = 15)
     private Integer noticeStatus;
 
-
+    @ApiModelProperty(value = "是否已读 true 已读  false  未读", position = 15)
+    private boolean isRead;
 }

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/mapper/mapping/TExamMapper.xml

@@ -122,6 +122,7 @@
             te.item_order itemOrder,
             te.question_id questionId,
             tt."content" content,
+            te.question_type questionType,
             CASE
                 WHEN te.question_type = 5 THEN CONCAT('["',LISTAGG(te.answer, '","'),'"]')
                 ELSE LISTAGG(te.answer, ',')

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/vo/TExamPaperStastic.java

@@ -7,16 +7,14 @@ import lombok.Setter;
 @Getter
 public class TExamPaperStastic implements java.io.Serializable{
 
-  private String itemOrder;
-
+    private String itemOrder;
 
     private String questionId;
 
-
-
     private String content;
 
-
     private String answerList;
 
+    private Integer questionType;
+
 }