作业逻辑删除，操作日志优化

sapi/src/main/java/com/xhkjedu/sapi/aop/WebControllerAop.java

@@ -13,7 +13,6 @@ import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
@@ -187,15 +186,15 @@ public class WebControllerAop {
      * @Param [pjp]
      * @Return java.lang.Object
      **/
-    @Around("handleLog()")
-    public Object arround(ProceedingJoinPoint pjp) {
-        try {
-            return pjp.proceed();
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
+    // @Around("handleLog()")
+    // public Object arround(ProceedingJoinPoint pjp) {
+    //     try {
+    //         return pjp.proceed();
+    //     } catch (Throwable e) {
+    //         e.printStackTrace();
+    //     }
+    //     return null;
+    // }
 
     /**
      * 发送消息

sapi/src/main/resources/mapper/analyze/SchoolSummaryMapper.xml

@@ -25,8 +25,8 @@
         left join t_paper_student ps on ps.paperid=pg.paperid and ps.classid=pg.classid
         left join t_class c on pg.classid=c.classid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and p.paperstate=22 and p.schoolid=#{sparams.schoolid} and pg.schoolid=#{sparams.schoolid}
-        and c.gradeid=#{sparams.gradeid} and p.year=#{sparams.year}
+        where p.deleted=0 and p.paperstate=22 and p.schoolid=#{sparams.schoolid} and pg.schoolid=#{sparams.schoolid}
+        and c.gradeid=#{sparams.gradeid} and p.year=#{sparams.year} and (d.disabled=0 or p.directorid is null)
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and p.subjectid=#{sparams.subjectid}
         </if>

sapi/src/main/resources/mapper/analyze/SchoolTaskMapper.xml

@@ -25,8 +25,8 @@
         LEFT JOIN t_class c ON pg.classid=c.classid
         LEFT JOIN T_USER U ON p.createid=u.userid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and p.paperstate=22 AND p.schoolid=#{sparams.schoolid} AND pg.schoolid=#{sparams.schoolid}
-        AND c.gradeid=#{sparams.gradeid} and p.year=#{sparams.year} AND u.userstate=1
+        where p.deleted=0 and p.paperstate=22 AND p.schoolid=#{sparams.schoolid} AND pg.schoolid=#{sparams.schoolid}
+        AND c.gradeid=#{sparams.gradeid} and p.year=#{sparams.year} AND u.userstate=1 and (d.disabled=0 or p.directorid is null)
         <if test="sparams.starttime!=null and sparams.starttime!=0">
             AND pg.starttime>=#{sparams.starttime}
         </if>
@@ -46,8 +46,8 @@
         left join t_paper_student ps1 on ps1.paperid=pg.paperid and ps1.classid=pg.classid
         left join t_class c on c.classid=pg.classid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and p.schoolid=#{sparams.schoolid} and p.paperstate=22 and pg.schoolid=#{sparams.schoolid}
-        and c.gradeid=#{sparams.gradeid} and p.year=#{sparams.year}
+        where d.deleted=0 and p.schoolid=#{sparams.schoolid} and p.paperstate=22 and pg.schoolid=#{sparams.schoolid}
+        and c.gradeid=#{sparams.gradeid} and p.year=#{sparams.year} and (d.disabled=0 or p.directorid is null)
         <if test="sparams.starttime!=null and sparams.starttime!=0">
             AND pg.starttime>=#{sparams.starttime}
         </if>

sapi/src/main/resources/mapper/region/RPaperAnalyzeMapper.xml

@@ -8,7 +8,8 @@
         LEFT JOIN t_school s on p.schoolid=s.schoolid and pg.schoolid=s.schoolid
         left join t_class c on c.classid=pg.classid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
+        where p.deleted=0 and s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
+        and (d.disabled=0 or p.directorid is null)
         <if test="param.begintime!=null and param.begintime!=0">
             and pg.starttime between #{param.begintime} and #{param.endtime}
         </if>
@@ -73,7 +74,8 @@
         left join t_school s on p.schoolid=s.schoolid and pg.schoolid=s.schoolid
         left join t_class c on c.classid=pg.classid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
+        where p.deleted=0 and s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
+        and (d.disabled=0 or p.directorid is null)
         <if test="param.begintime!=null and param.begintime!=0">
             and pg.starttime between #{param.begintime} and #{param.endtime}
         </if>
@@ -123,7 +125,8 @@
         left join t_paper_student ps on pg.paperid=ps.paperid and pg.classid=ps.classid and ps.psstate in(1,2)
         left join t_class c on c.classid=pg.classid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
+        where p.deleted=0 and s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
+        and (d.disabled=0 or p.directorid is null)
         <if test="param.begintime!=null and param.begintime!=0">
             and pg.starttime between #{param.begintime} and #{param.endtime}
         </if>

sapi/src/main/resources/mapper/region/RegionAnalyzeMapper.xml

@@ -98,7 +98,7 @@
         left join t_paper_student ps on ps.paperid=pg.paperid and ps.classid=pg.classid
         left join t_class c on c.classid=pg.classid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and s.schoolstate=1
+        where p.deleted=0 and s.schoolstate=1 and (d.disabled=0 or p.directorid is null)
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
         </if>
@@ -172,7 +172,7 @@
         and pg.starttime between #{param.begintime} and #{param.endtime}
         left join t_class c on c.classid=pg.classid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and s.schoolstate=1
+        where p.deleted=0 and s.schoolstate=1 and (d.disabled=0 or p.directorid is null)
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
         </if>

sapi/src/main/resources/mapper/region/SAnalyzeMapper.xml

@@ -82,7 +82,8 @@
         left join t_class c on pg.classid=c.classid
         left join t_paper_student ps on ps.paperid=pg.paperid and ps.classid=pg.classid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and c.year=#{param.year} and p.schoolid=#{param.schoolid} and pg.pgstate=22 and pg.schoolid=#{param.schoolid}
+        where p.deleted=0 and c.year=#{param.year} and p.schoolid=#{param.schoolid} and pg.pgstate=22 and pg.schoolid=#{param.schoolid}
+        and (d.disabled=0 or p.directorid is null)
         and pg.starttime between #{param.begintime} and #{param.endtime}
         group by c.gradeid,p.subjectid
     </select>

sclass/src/main/java/com/xhkjedu/sclass/aop/WebControllerAop.java

@@ -13,7 +13,6 @@ import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
@@ -187,15 +186,15 @@ public class WebControllerAop {
      * @Param [pjp]
      * @Return java.lang.Object
      **/
-    @Around("handleLog()")
-    public Object arround(ProceedingJoinPoint pjp) {
-        try {
-            return pjp.proceed();
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
+    // @Around("handleLog()")
+    // public Object arround(ProceedingJoinPoint pjp) {
+    //     try {
+    //         return pjp.proceed();
+    //     } catch (Throwable e) {
+    //         e.printStackTrace();
+    //     }
+    //     return null;
+    // }
 
     /**
      * 发送消息

sexam/src/main/java/com/xhkjedu/sexam/aop/WebControllerAop.java

@@ -13,7 +13,6 @@ import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
@@ -187,15 +186,15 @@ public class WebControllerAop {
      * @Param [pjp]
      * @Return java.lang.Object
      **/
-    @Around("handleLog()")
-    public Object arround(ProceedingJoinPoint pjp) {
-        try {
-            return pjp.proceed();
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
+    // @Around("handleLog()")
+    // public Object arround(ProceedingJoinPoint pjp) {
+    //     try {
+    //         return pjp.proceed();
+    //     } catch (Throwable e) {
+    //         e.printStackTrace();
+    //     }
+    //     return null;
+    // }
 
     /**
      * 发送消息

slive/src/main/java/com/xhkjedu/slive/aop/WebControllerAop.java

@@ -13,7 +13,6 @@ import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
@@ -187,15 +186,15 @@ public class WebControllerAop {
      * @Param [pjp]
      * @Return java.lang.Object
      **/
-    @Around("handleLog()")
-    public Object arround(ProceedingJoinPoint pjp) {
-        try {
-            return pjp.proceed();
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
+    // @Around("handleLog()")
+    // public Object arround(ProceedingJoinPoint pjp) {
+    //     try {
+    //         return pjp.proceed();
+    //     } catch (Throwable e) {
+    //         e.printStackTrace();
+    //     }
+    //     return null;
+    // }
 
     /**
      * 发送消息

sstudy/src/main/java/com/xhkjedu/sstudy/aop/WebControllerAop.java

@@ -13,7 +13,6 @@ import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
@@ -187,15 +186,15 @@ public class WebControllerAop {
      * @Param [pjp]
      * @Return java.lang.Object
      **/
-    @Around("handleLog()")
-    public Object arround(ProceedingJoinPoint pjp) {
-        try {
-            return pjp.proceed();
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
+    // @Around("handleLog()")
+    // public Object arround(ProceedingJoinPoint pjp) {
+    //     try {
+    //         return pjp.proceed();
+    //     } catch (Throwable e) {
+    //         e.printStackTrace();
+    //     }
+    //     return null;
+    // }
 
     /**
      * 发送消息

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paper/PaperController.java

@@ -124,7 +124,7 @@ public class PaperController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("del")
-    @Action("作业管理-删除附件作业")
+    @Action("作业管理-删除作业")
     public ResultVo delPaper(@RequestBody TPaper paper){
         Integer result = paperService.delPaper(paper);
         if(result>0){

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paper/PaperReportController.java

@@ -38,7 +38,7 @@ public class PaperReportController {
      * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("gpr")
-    @Action("作业管理-生产报告")
+    @Action("作业管理-生成报告")
     public ResultVo generatePaperReport(@RequestBody TPaperClass paper) {
         Integer paperid = paper.getPaperid();
         N_Utils.validation(new Object[]{paperid, "作业id", 1});

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paper/PaperMapper.java

@@ -127,6 +127,9 @@ public interface PaperMapper extends TkMapper<TPaper> {
      **/
     Integer delPaper(Integer paperid);
 
+    //修改作业删除状态
+    Integer updatePaperDeleted(@Param("paperid")Integer paperid,@Param("deleted")Integer deleted);
+
     //获取作业原文件保存地址列表
     List<String> listSourcePath(Integer paperid);
 

sstudy/src/main/java/com/xhkjedu/sstudy/model/paper/TPaper.java

@@ -79,11 +79,14 @@ public class TPaper extends BaseBean {
     //发布年份
     private Integer year;
 
+    //是否删除0未删除1已删除
+    private Integer deleted;
+
     //作业附件
     @Transient
     private List<TPaperFile> pfiles = new ArrayList<>();
 
-    //答题卡种试题json对象集合
+    //答题卡中试题json对象集合
     @Transient
     private String questionStr;
 

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperService.java

@@ -193,6 +193,7 @@ public class PaperService {
         paper.setChecktype(0);
         paper.setHasreport(0);
         paper.setTimetype(1);
+        paper.setDeleted(0);
         String directorid = paper.getDirectorid();
         if (directorid != null && (directorid.equals("0") || directorid.equals(""))) {
             paper.setDirectorid(null);
@@ -353,7 +354,7 @@ public class PaperService {
      */
     public Integer delPaper(TPaper paper){
 
-        int result =  paperMapper.delPaper(paper.getPaperid());
+        // int result =  paperMapper.delPaper(paper.getPaperid());
         //2023-06-08新增作业复制功能，因为文件仅复制地址，之前删除文件取消
        /* List<TPaperFile> pfilelist = paperFileService.listObjsByPaperid(paper.getPaperid());//获取作业文件夹
 
@@ -369,7 +370,8 @@ public class PaperService {
             }
             messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
         }*/
-        return result;
+        //2023-11-22作业删除改为逻辑删除
+        return paperMapper.updatePaperDeleted(paper.getPaperid(),1);
     }
 
     /**

sstudy/src/main/resources/mapper/paper/PaperAnalyzeMapper.xml

@@ -296,7 +296,7 @@
         select p.paperid,p.papername,pg.starttime
         from t_paper p left join t_paper_class pg on p.paperid = pg.paperid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and p.createid=#{createid}
+        where p.deleted=0 and p.createid=#{createid} and (d.disabled=0 or p.directorid is null)
         group by p.paperid order by pg.starttime desc limit #{papernum}
     </select>
     <!--获取作业班级列表-->
@@ -381,8 +381,8 @@
         left join t_paper_student ps on ps.paperid=pg.paperid and ps.classid=pg.classid
         left join t_class c on pg.classid=c.classid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and p.paperstate=22 and p.schoolid=#{paper.schoolid} and pg.schoolid=#{paper.schoolid}
-        and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
+        where p.deleted=0 and p.paperstate=22 and p.schoolid=#{paper.schoolid} and pg.schoolid=#{paper.schoolid}
+        and c.gradeid=#{paper.gradeid} and c.year=#{paper.year} and (d.disabled=0 or p.directorid is null)
         <if test="paper.starttime!=null and paper.starttime!=0">
             and pg.starttime>=#{paper.starttime}
         </if>
@@ -404,9 +404,9 @@
     <select id="listPaperStuGrade" resultType="java.util.Map">
         select a.*,ifnull(truncate(a.commitnum*100/a.sdnum,2),0)commitrate
         from(select cs.*
-        ,count(distinct if(p.paperid is not null and (d.disabled=0 or p.directorid is null),ps.psid,null))sdnum
-        ,count(distinct if(ps.psstate in (1,2) and p.paperid is not null and (d.disabled=0 or p.directorid is null),ps.psid,null))commitnum
-        ,ifnull(truncate(sum(if(p.paperid is not null and (d.disabled=0 or p.directorid is null),ps.userscore,0))*100/
+        ,count(distinct if(p.paperid is not null and p.deleted=0 and (d.disabled=0 or p.directorid is null),ps.psid,null))sdnum
+        ,count(distinct if(ps.psstate in (1,2) and p.paperid is not null and p.deleted=0 and (d.disabled=0 or p.directorid is null),ps.psid,null))commitnum
+        ,ifnull(truncate(sum(if(p.paperid is not null and p.deleted=0 and (d.disabled=0 or p.directorid is null),ps.userscore,0))*100/
         sum(if(p.paperid is not null and (d.disabled=0 or p.directorid is null),ps.paperscore,0)),2),0)scorerate
         from (select cs2.studentid,u.username studentname
         from t_class_student cs2,t_class c,t_user u
@@ -422,7 +422,7 @@
         group by cs2.studentid)cs
         left join t_paper_student ps on ps.studentid=cs.studentid
         left join t_paper_class pg on pg.paperid=ps.paperid and pg.classid=ps.classid
-        left join t_paper p on ps.paperid=p.paperid and p.paperstate=22
+        left join t_paper p on ps.paperid=p.paperid and p.paperstate=22 and p.deleted=0
         <if test="paper.starttime!=null and paper.starttime!=0">
             and pg.starttime>=#{paper.starttime}
         </if>
@@ -454,8 +454,8 @@
         left join t_paper p on ps.paperid=p.paperid
         left join t_subject s on p.subjectid=s.subjectid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and ps.studentid=#{paper.studentid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year} and
-        p.paperstate=22
+        where p.deleted=0 and ps.studentid=#{paper.studentid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year} and
+        p.paperstate=22  and (d.disabled=0 or p.directorid is null)
         <if test="paper.starttime!=null and paper.starttime!=0">
             and pg.starttime>=#{paper.starttime}
         </if>
@@ -480,7 +480,8 @@
         left join t_paper_class pg on pg.paperid=ps.paperid and pg.classid=ps.classid
         left join t_paper p on ps.paperid=p.paperid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and ps.studentid=#{paper.studentid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year} and p.paperstate=22
+        where p.deleted=0 and ps.studentid=#{paper.studentid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year} and p.paperstate=22
+        and (d.disabled=0 or p.directorid is null)
         <if test="paper.starttime!=null and paper.starttime!=0">
             and pg.starttime>=#{paper.starttime}
         </if>
@@ -505,7 +506,8 @@
         left join t_paper_class pg on ps.paperid=pg.paperid and ps.classid=pg.classid
         left join t_paper p on pg.paperid=p.paperid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and c.schoolid=#{paper.schoolid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year} and p.paperstate=22
+        where p.deleted=0 and c.schoolid=#{paper.schoolid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year} and p.paperstate=22
+        and (d.disabled=0 or p.directorid is null)
         <if test="paper.starttime!=null and paper.starttime!=0">
             and pg.starttime>=#{paper.starttime}
         </if>

sstudy/src/main/resources/mapper/paper/PaperMapper.xml

@@ -198,7 +198,7 @@
         from t_paper p left join t_user u on p.createid=u.userid
         left join t_paper_class pg on p.paperid=pg.paperid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and p.lsbid=#{paper.lsbid}
+        where p.deleted=0 and p.lsbid=#{paper.lsbid} and (d.disabled=0 or p.directorid is null)
         <if test="userVo.usertype!=null and userVo.usertype==0">
             and p.schoolid=#{userVo.schoolid}
         </if>
@@ -233,7 +233,7 @@
         select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.createid,p.hasreport,p.schoolid
         ,(select u.username from t_user u where u.userid=p.createid)createname
         from t_paper p left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and p.lsbid=#{paper.lsbid} and p.paperstate=21
+        where p.deleted=0 and p.lsbid=#{paper.lsbid} and p.paperstate=21 and (d.disabled=0 or p.directorid is null)
         <if test="userVo.usertype!=null and userVo.usertype==0">
             and p.schoolid=#{userVo.schoolid}
         </if>
@@ -277,7 +277,7 @@
         left join t_paper_class pg on p.paperid=pg.paperid
         left join t_paper_student ps on p.paperid=ps.paperid and pg.classid=ps.classid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null)
+        where p.deleted=0 and (d.disabled=0 or p.directorid is null)
         and (p.createid=#{checkid} or ps.checkid=#{checkid}) and ps.psstate in (1,2) and ps.pschecked!=1
         group by p.paperid order by p.createtime desc
     </select>
@@ -332,8 +332,8 @@
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         left join t_class c on pg.classid=c.classid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and p.createid=#{paper.createid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
-        and pg.schoolid=#{paper.schoolid}
+        where p.deleted=0 and p.createid=#{paper.createid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
+        and pg.schoolid=#{paper.schoolid} and (d.disabled=0 or p.directorid is null)
         <if test="paper.starttime!=null and paper.starttime!=0">
             and pg.starttime>=#{paper.starttime}
         </if>
@@ -360,6 +360,12 @@
         LEFT JOIN t_question_student qs ON p.paperid=qs.paperid
         WHERE p.paperid=#{paperid}
     </delete>
+
+    <!--修改作业删除状态-->
+    <update id="updatePaperDeleted">
+        update t_paper set deleted=#{deleted} where paperid=#{paperid}
+    </update>
+
     <!--获取作业原文件保存地址列表-->
     <select id="listSourcePath" resultType="java.lang.String">
         select distinct sourcepath from t_paper_file where paperid=#{paperid} and fileclass=1

sstudy/src/main/resources/mapper/paper/PaperTeaAppMapper.xml

@@ -33,7 +33,7 @@
         ,(select u.username from t_user u where u.userid=p.createid)createname
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and (p.createid=#{paper.teacherid} or pg.checkid=#{paper.teacherid} or
+        where p.deleted=0 and (d.disabled=0 or p.directorid is null) and (p.createid=#{paper.teacherid} or pg.checkid=#{paper.teacherid} or
         (p.hashb=1 and p.schoolid=#{paper.schoolid} and pg.classid in (${paper.classids})) or
         (pg.classid in (${paper.bxclassids})))
         <if test="paper.lsbid!=null and paper.lsbid!='0'.toString() and paper.lsbid!=''">
@@ -55,7 +55,7 @@
         ,p.subjectid,p.paperscore,p.schoolid
         ,(select u.username from t_user u where u.userid=p.createid)createname
         from t_paper p left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and p.createid=#{paper.teacherid} and p.paperstate=#{paper.psstate}
+        where p.deleted=0 and p.createid=#{paper.teacherid} and p.paperstate=#{paper.psstate} and (d.disabled=0 or p.directorid is null)
         order by p.createtime desc,p.paperid desc
     </select>
     <!--作业情况-->

sstudy/src/main/resources/mapper/paperstudent/PaperStudentMapper.xml

@@ -18,7 +18,7 @@
         left join t_paper_class pg on ps.paperid = pg.paperid and ps.classid=pg.classid
         left join t_user u on p.createid = u.userid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and ps.studentid = #{ps.studentid} and pg.starttime<=#{ps.nowtime}
+        where p.deleted=0 and ps.studentid = #{ps.studentid} and (d.disabled=0 or p.directorid is null) and pg.starttime<=#{ps.nowtime}
         <if test="ps.subjectid!=null and ps.subjectid!='0'.toString() and ps.subjectid!=''">
             and p.subjectid=#{ps.subjectid}
         </if>
@@ -48,7 +48,7 @@
         left join t_user u on p.createid = u.userid
         left join t_subject s on p.subjectid = s.subjectid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and ps.checkid=#{ps.checkid} and ps.psstate in (1,2) and ps.pschecked!=1
+        where p.deleted=0 and ps.checkid=#{ps.checkid} and (d.disabled=0 or p.directorid is null) and ps.psstate in (1,2) and ps.pschecked!=1
         ORDER BY ps.stoptime desc LIMIT #{ps.page},#{ps.pageSize}
     </select>
     <!--作业说明-->
@@ -200,7 +200,7 @@
         left join t_paper_class pg on ps.paperid = pg.paperid and ps.classid=pg.classid
         left join t_user u on p.createid = u.userid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and ps.studentid = #{ps.studentid} and pg.starttime&lt;=#{ps.nowtime}
+        where p.deleted=0 and ps.studentid = #{ps.studentid} and (d.disabled=0 or p.directorid is null) and pg.starttime&lt;=#{ps.nowtime}
         <if test="ps.subjectid!=null and ps.subjectid!='0'.toString() and ps.subjectid!=''">
             and p.subjectid=#{ps.subjectid}
         </if>

suser/src/main/java/com/xhkjedu/suser/aop/WebControllerAop.java

@@ -13,7 +13,6 @@ import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
@@ -187,15 +186,15 @@ public class WebControllerAop {
      * @Param [pjp]
      * @Return java.lang.Object
      **/
-    @Around("handleLog()")
-    public Object arround(ProceedingJoinPoint pjp) {
-        try {
-            return pjp.proceed();
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
+    // @Around("handleLog()")
+    // public Object arround(ProceedingJoinPoint pjp) {
+    //     try {
+    //         return pjp.proceed();
+    //     } catch (Throwable e) {
+    //         e.printStackTrace();
+    //     }
+    //     return null;
+    // }
 
     /**
      * 发送消息