Merge remote-tracking branch 'origin/wn' into ywx

sapi/src/main/java/com/xhkjedu/sapi/mapper/notice/NoticeClassMapper.java

@@ -29,6 +29,8 @@ public interface NoticeClassMapper extends TkMapper<TNoticeClass> {
 
     //获取所有需要处理的班级通知
     List<TNoticeClass> listAll();
+    //通知
+    TNoticeUser getNoticeClassInfo(@Param("studentid")Integer studentid);
 
     //获取通知班级学生
     List<TNoticeUser> listClassStudent(@Param("classid") Integer classid);

sapi/src/main/java/com/xhkjedu/sapi/mapper/notice/NoticeMapper.java

@@ -1,8 +1,8 @@
 package com.xhkjedu.sapi.mapper.notice;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sapi.model.system.TSchool;
 import com.xhkjedu.sapi.model.notice.TNotice;
+import com.xhkjedu.sapi.model.system.TSchool;
 import com.xhkjedu.sapi.vo.gradeclass.ClassVo;
 import com.xhkjedu.sapi.vo.notice.NoticeUserVo;
 import com.xhkjedu.sapi.vo.notice.NoticeVo;
@@ -75,4 +75,6 @@ public interface NoticeMapper extends TkMapper<TNotice> {
 
     //通知学校列表
     List<TSchool> listSchool(Integer noticeid);
+
+    int deleteNotice(@Param("noticeid")Integer noticeid);
 }

sapi/src/main/java/com/xhkjedu/sapi/model/notice/TNoticeClass.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /*
 * @Description 班级通知，学生个人通知
@@ -28,4 +29,7 @@ public class TNoticeClass extends BaseBean {
 
     //创建时间
     private Integer createtime;
+
+    @Transient
+    private String noticetitle;
 }

sapi/src/main/java/com/xhkjedu/sapi/service/notice/NoticeService.java

@@ -227,14 +227,28 @@ public class NoticeService {
         //获取需要处理的通知
         List<TNoticeClass> noticeClasses = noticeClassMapper.listAll();
         for (TNoticeClass noticeClass : noticeClasses) {
-            List<TNoticeUser> noticeUsers = noticeClassMapper.listClassStudent(noticeClass.getClassid());
-            if (N_Utils.isListNotEmpty(noticeUsers)) {
-                for (TNoticeUser user : noticeUsers) {
-                    user.setNoticeid(noticeClass.getNoticeid());
-                    user.setReaded(1);
-                    user.setCreatetime(noticeClass.getCreatetime());
+            if(noticeClass.getNoticetitle().contains("作业退回")){
+                //说明是退回的作业
+                //获取用户所在班级信息
+                TNoticeUser noticeUser = noticeClassMapper.getNoticeClassInfo(noticeClass.getClassid());
+                if(noticeUser!=null){
+                    noticeUser.setNoticeid(noticeClass.getNoticeid());
+                    noticeUser.setReaded(1);
+                    noticeUser.setCreatetime(noticeClass.getCreatetime());
+                    noticeUserMapper.insert(noticeUser);
+                }else{
+                    noticeMapper.deleteNotice(noticeClass.getNoticeid());
+                }
+            }else{
+                List<TNoticeUser> noticeUsers = noticeClassMapper.listClassStudent(noticeClass.getClassid());
+                if (N_Utils.isListNotEmpty(noticeUsers)) {
+                    for (TNoticeUser user : noticeUsers) {
+                        user.setNoticeid(noticeClass.getNoticeid());
+                        user.setReaded(1);
+                        user.setCreatetime(noticeClass.getCreatetime());
+                    }
+                    noticeUserMapper.insertList(noticeUsers);
                 }
-                noticeUserMapper.insertList(noticeUsers);
             }
         }
     }

sapi/src/main/resources/mapper/notice/NoticeClassMapper.xml

@@ -16,7 +16,13 @@
 
     <!--获取所有发给班级的通知-->
     <select id="listAll" resultType="com.xhkjedu.sapi.model.notice.TNoticeClass">
-        select * from t_notice_class order by noticeid
+        select nc.*,n.noticetitle from t_notice_class nc left join t_notice n on nc.noticeid=n.noticeid
+        order by n.noticeid
+    </select>
+    <!--通知学生信息-->
+    <select id="getNoticeClassInfo" resultType="com.xhkjedu.sapi.model.notice.TNoticeUser">
+        select c.classid,c.gradeid,s.studentid as userid from t_class_student s left join t_class c on s.classid=c.classid
+        where s.studentid=#{studentid} and c.classtype=1 order by c.classid desc limit 1
     </select>
 
     <!--获取通知班级学生-->

sapi/src/main/resources/mapper/notice/NoticeMapper.xml

@@ -124,4 +124,7 @@
         delete n.* from t_notice n left join t_notice_class nc on n.noticeid = nc.noticeid
         where nc.classid=#{classid}
     </delete>
+    <delete id="deleteNotice">
+        delete from t_notice where noticeid=#{noticeid}
+    </delete>
 </mapper>