作业补交

scommons/src/main/java/com/xhkjedu/constant/PlatformConstant.java

@@ -1,5 +1,7 @@
 package com.xhkjedu.constant;
 
+import com.xhkjedu.vo.ResultVo;
+
 /*
  * @Description:项目常量
  * @Author: WN
@@ -25,4 +27,10 @@ public final class PlatformConstant {
     //请求头内容——版本号
     public static final String XH_VERSION = "Xh-Version";
 
+    public static final ResultVo AFTER_COMMIT = new ResultVo(3, "作业已过截止时间！");
+
+    public static final ResultVo PAPER_COMMIT = new ResultVo(3, "作业已提交！");
+
+    public static final ResultVo COMMIT_SUCCESS = new ResultVo(0, "提交成功！");
+
 }

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

@@ -213,11 +213,10 @@ public class PaperController {
     //作业列表
     @PostMapping("/list")
     public ResultVo list(@RequestBody PaperSearchVo paper) {
-        String lsbid = paper.getLsbid();
         Integer createid = paper.getCreateid();
         Integer page = paper.getPage();
         Integer pageSize = paper.getPageSize();
-        N_Utils.validation(new Object[]{lsbid,"教材关联关系id",2,createid,"教师id",1,page,"显示页码",1,pageSize,"显示条数",1});
+        N_Utils.validation(new Object[]{createid,"教师id",1,page,"显示页码",1,pageSize,"显示条数",1});
         UserVo userVo = userMapper.getUserInfoForHandleLog(createid);
         if (userVo != null && !userVo.getUsertype().equals(0)) {
             //获取当前教师权限班级
@@ -234,11 +233,10 @@ public class PaperController {
 
     @PostMapping("/list_my")
     public ResultVo listMy(@RequestBody PaperSearchVo paper) {
-        String lsbid = paper.getLsbid();
         Integer createid = paper.getCreateid();
         Integer page = paper.getPage();
         Integer pageSize = paper.getPageSize();
-        N_Utils.validation(new Object[]{lsbid,"教材关联关系id",2,createid,"教师id",1,page,"显示页码",1,pageSize,"显示条数",1});
+        N_Utils.validation(new Object[]{createid,"教师id",1,page,"显示页码",1,pageSize,"显示条数",1});
         UserVo userVo = userMapper.getUserInfoForHandleLog(createid);
         // if (userVo != null && !userVo.getUsertype().equals(0)) {
         //     //获取当前教师权限班级
@@ -385,4 +383,18 @@ public class PaperController {
         return new ResultVo(0, "成功获取作业教师和学生", rtnMap);
     }
 
+    /**
+     * @Description 修改补交状态
+     * @Date 2024/4/1 12:45
+     * @Author YWX
+     * @Param [paper]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/update_ac")
+    public ResultVo updateAfterCommit(@RequestBody TPaper paper) {
+        N_Utils.validation(new Object[]{paper.getPaperid(), "作业id", 1});
+        paperService.updateAfterCommit(paper);
+        return new ResultVo(0, "修改成功！");
+    }
+
 }

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paperstudent/PaperStudentController.java

@@ -13,9 +13,9 @@ import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentScantronVo;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -28,7 +28,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/ps")
 public class PaperStudentController {
-    @Autowired
+    @Resource
     private PaperStudentService paperStudentService;
 
     /**
@@ -56,6 +56,8 @@ public class PaperStudentController {
     public ResultVo startPaper(@RequestBody TPaperStudent paperStudent) {
         Integer psid = paperStudent.getPsid();
         N_Utils.validation(new Object[]{psid,"试卷学生id",1});
+        ResultVo vo = paperStudentService.checkPsStateByPsId(psid);
+        if (vo != null) return vo;
         List<PaperStudentQuestionVo> paperQuestionBeans = paperStudentService.startPaper(psid);
         return new ResultVo(0,"开始成功！",paperQuestionBeans);
     }
@@ -101,14 +103,7 @@ public class PaperStudentController {
     @PostMapping("/submit_question")
     public ResultVo submitQuestion(@RequestBody TPaperStudentQuestion psq) {
         N_Utils.validation(new Object[]{psq.getPsqid(),"试卷学生试题id",1});
-        int result = 0;
-        try {
-            result = paperStudentService.submitQuestion(psq);
-        } catch (Exception e) {
-            new ResultVo(1, "提交失败！");
-        }
-        if (result >= 0) return new ResultVo(0, "提交成功！");
-        else return new ResultVo(1, "提交失败！");
+        return paperStudentService.submitQuestion(psq);
     }
 
     /**
@@ -120,14 +115,7 @@ public class PaperStudentController {
     @Action("作业管理-提交题库作业")
     public ResultVo submitPaper(@RequestBody TPaperStudent ps) {
         N_Utils.validation(new Object[]{ps.getPsid(),"试卷学生id",1});
-        int result = 0;
-        try {
-            result = paperStudentService.submitPaper(ps.getPsid());
-        } catch (Exception e) {
-            return new ResultVo(1, "提交失败！");
-        }
-        if (result >= 0) return new ResultVo(0, "提交成功！");
-        else return new ResultVo(1, "提交失败！");
+        return paperStudentService.submitPaper(ps.getPsid());
     }
 
     /**
@@ -262,6 +250,8 @@ public class PaperStudentController {
     public ResultVo scantronStartPaper(@RequestBody TPaperStudent paperStudent) {
         Integer psid = paperStudent.getPsid();
         N_Utils.validation(new Object[]{psid,"试卷学生id",1});
+        ResultVo vo = paperStudentService.checkPsStateByPsId(psid);
+        if (vo != null) return vo;
         List<Map> psscanlst = paperStudentService.scantronStartPaper(psid);
         return new ResultVo(0,"开始成功！",psscanlst);
     }
@@ -300,14 +290,7 @@ public class PaperStudentController {
     @PostMapping("/ssubmit_question")
     public ResultVo scantronSubmitQuestion(@RequestBody TPaperStudentScantron pss) {
         N_Utils.validation(new Object[]{pss.getPssid(),"试卷学生试题id",1});
-        int result = 0;
-        try {
-            result = paperStudentService.scantronSubmitQuestion(pss);
-        } catch (Exception e) {
-            return new ResultVo(1, "提交失败！");
-        }
-        if (result >= 0) return new ResultVo(0, "提交成功！");
-        else return new ResultVo(1, "提交失败！");
+        return paperStudentService.scantronSubmitQuestion(pss);
     }
     /**
      *功能描述 图片作业--提交作业
@@ -318,14 +301,7 @@ public class PaperStudentController {
     @Action("作业管理-提交附件作业")
     public ResultVo scantronSubmitPaper(@RequestBody TPaperStudent ps) {
         N_Utils.validation(new Object[]{ps.getPsid(),"试卷学生id",1});
-        int result = 0;
-        try {
-            result = paperStudentService.scantronSubmitPaper(ps.getPsid());
-        } catch (Exception e) {
-            return new ResultVo(1, "提交失败！");
-        }
-        if (result >= 0) return new ResultVo(0, "提交成功！");
-        else return new ResultVo(1, "提交失败！");
+        return paperStudentService.scantronSubmitPaper(ps.getPsid());
     }
 
     /**

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paperstudent/PaperStudentWebController.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperStudent;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperStudentQuestion;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperStudentScantron;
+import com.xhkjedu.sstudy.service.paperstudent.PaperStudentService;
 import com.xhkjedu.sstudy.service.paperstudent.PaperStudentWebService;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
@@ -14,12 +15,12 @@ import com.xhkjedu.sstudy.vo.paperstudent.PaperSearchVo;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentVo;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentWebVo;
 import com.xhkjedu.sstudy.vo.paperstudent.StudentPaperVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -31,8 +32,10 @@ import java.util.List;
 @RestController
 @RequestMapping("/psw")
 public class PaperStudentWebController {
-    @Autowired
+    @Resource
     private PaperStudentWebService paperStudentWebService;
+    @Resource
+    private PaperStudentService paperStudentService;
 
     /**
      * 学生作业列表
@@ -64,6 +67,8 @@ public class PaperStudentWebController {
     public ResultVo startPaper(@RequestBody TPaperStudent paperStudent) {
         Integer psid = paperStudent.getPsid();
         N_Utils.validation(new Object[]{psid,"试卷学生id",1});
+        ResultVo vo = paperStudentService.checkPsStateByPsId(psid);
+        if (vo != null) return vo;
         StudentPaperVo paper = paperStudentWebService.startPaper(psid);
         return new ResultVo(0,"开始成功！",paper);
     }
@@ -79,6 +84,8 @@ public class PaperStudentWebController {
     public ResultVo scantronStartPaper(@RequestBody TPaperStudent paperStudent) {
         Integer psid = paperStudent.getPsid();
         N_Utils.validation(new Object[]{psid,"试卷学生id",1});
+        ResultVo vo = paperStudentService.checkPsStateByPsId(psid);
+        if (vo != null) return vo;
         StudentPaperVo paper = paperStudentWebService.scantronStartPaper(psid);
         return new ResultVo(0,"开始成功！",paper);
     }
@@ -96,12 +103,7 @@ public class PaperStudentWebController {
         if (N_Utils.isListEmpty(psqs)){
             return new ResultVo(1, "作答详情不能为空");
         }
-        try {
-            paperStudentWebService.submitPaper(paper);
-            return new ResultVo(0, "提交成功！");
-        } catch (Exception e) {
-            return new ResultVo(1, "提交失败！");
-        }
+        return paperStudentWebService.submitPaper(paper);
     }
 
     @PostMapping("/ssubmit_paper")
@@ -110,12 +112,7 @@ public class PaperStudentWebController {
         if (N_Utils.isListEmpty(pss)){
             return new ResultVo(1, "作答详情不能为空");
         }
-        try {
-            paperStudentWebService.scantronSubmitPaper(paper);
-            return new ResultVo(0, "提交成功！");
-        } catch (Exception e) {
-            return new ResultVo(1, "提交失败！");
-        }
+        return paperStudentWebService.scantronSubmitPaper(paper);
     }
 
     //学生作业详情——答题卡作业

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

@@ -176,4 +176,7 @@ public interface PaperMapper extends TkMapper<TPaper> {
 
     //获取所有作业，处理学生试题关联关系
     List<TPaper> listPapersForAllFb();
+
+    //修改补交状态
+    void updateAfterCommit(@Param("paper") TPaper paper);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paperstudent/PaperStudentMapper.java

@@ -147,6 +147,15 @@ public interface PaperStudentMapper extends TkMapper<TPaperStudent> {
      */
     void updateShowanswer(@Param("stoptime") int stoptime);
 
+    /**
+     * @Description 作业自动收卷
+     * @Date 2024/4/1 14:38
+     * @Author YWX
+     * @Param [stoptime]
+     * @Return void
+     **/
+    void updatePaperRollUp(@Param("stoptime") int stoptime);
+
 
     //////////////////////////////////////////////学生WEB端//////////////////////////////////////////////
     //获取作业列表
@@ -224,4 +233,7 @@ public interface PaperStudentMapper extends TkMapper<TPaperStudent> {
 
     //批阅学生列表
     List<Map> listCorrectStu(@Param("ps") TPaperStudent ps);
+
+    //根据学生作业id获取提交状态
+    Integer getPsStateByPsId(@Param("psid") Integer psid);
 }

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

@@ -73,6 +73,9 @@ public class TPaper extends BaseBean {
     //时间类型：1统一布置2分班布置
     private Integer timetype;
 
+    //补交：0不允许 1允许
+    private Integer aftercommit;
+
     //作业附件：0没有1有
     private Integer hasfile;
 

sstudy/src/main/java/com/xhkjedu/sstudy/model/paperstudent/TPaperStudent.java

@@ -88,4 +88,8 @@ public class TPaperStudent extends BaseBean {
     //退回原因
     private String comm;
 
+    @Transient
+    //补交：0不允许 1允许
+    private Integer aftercommit;
+
 }

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

@@ -3,7 +3,6 @@ package com.xhkjedu.sstudy.service.paper;
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.constant.PlatformConstant;
 import com.xhkjedu.exception.MissingParametersException;
-import com.xhkjedu.sstudy.listener.MessageSender;
 import com.xhkjedu.sstudy.mapper.gradeclass.ClassMapper;
 import com.xhkjedu.sstudy.mapper.paper.*;
 import com.xhkjedu.sstudy.mapper.paperstudent.PaperClassMapper;
@@ -22,7 +21,6 @@ import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -41,13 +39,13 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 public class PaperService {
-    @Autowired
+    @Resource
     private PaperMapper paperMapper;
-    @Autowired
+    @Resource
     private PaperFileService paperFileService;
-    @Autowired
+    @Resource
     private PaperScantronQtypeMapper paperScantronQtypeMapper;
-    @Autowired
+    @Resource
     private PaperScantronMapper paperScantronMapper;
     @Resource
     private PaperQtypeMapper paperQtypeMapper;
@@ -57,8 +55,6 @@ public class PaperService {
     private PaperAnalyzeMapper paperAnalyzeMapper;
     @Resource
     private PaperStudentMapper paperStudentMapper;
-    @Autowired
-    private MessageSender messageSender;
     @Resource
     private ClassMapper classMapper;
     @Resource
@@ -1452,4 +1448,14 @@ public class PaperService {
         return rtnMap;
     }
 
+    /**
+     * @Description 修改补交状态
+     * @Date 2024/4/1 12:45
+     * @Author YWX
+     * @Param [paper]
+     * @Return void
+     **/
+    public void updateAfterCommit(TPaper paper) {
+        paperMapper.updateAfterCommit(paper);
+    }
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperStudentService.java

@@ -1,6 +1,8 @@
 package com.xhkjedu.sstudy.service.paperstudent;
 
 import com.alibaba.fastjson.JSON;
+import com.xhkjedu.constant.PlatformConstant;
+import com.xhkjedu.exception.MissingParametersException;
 import com.xhkjedu.sstudy.mapper.paper.PaperMapper;
 import com.xhkjedu.sstudy.mapper.paper.PaperScantronMapper;
 import com.xhkjedu.sstudy.mapper.paperstudent.*;
@@ -10,8 +12,7 @@ import com.xhkjedu.sstudy.model.paper.TPaperScantron;
 import com.xhkjedu.sstudy.model.paperstudent.*;
 import com.xhkjedu.sstudy.model.question.TQuestion;
 import com.xhkjedu.sstudy.service.system.NoticeService;
-import com.xhkjedu.sstudy.utils.ArithUtil;
-import com.xhkjedu.sstudy.utils.ConvertUtil;
+import com.xhkjedu.sstudy.utils.*;
 import com.xhkjedu.sstudy.vo.paperreport.PaperRQuestionVo;
 import com.xhkjedu.sstudy.vo.paperstudent.*;
 import com.xhkjedu.utils.N_Utils;
@@ -187,11 +188,14 @@ public class PaperStudentService {
         return paperStudentMapper.updateState(psstate, pschecked, psid, operate,timestamp);
     }
 
-    public int submitQuestion(TPaperStudentQuestion psq) throws Exception {
+    public ResultVo submitQuestion(TPaperStudentQuestion psq) {
         try {
             //获取作业学生试题详情
             TPaperStudentQuestion psq1 = paperStudentQuestionService.findById(psq.getPsqid());
-            //获取试题详情
+            if (psq1 == null) throw new Exception("该学生作业不存在");
+            ResultVo vo = checkPsStateByPsId(psq1.getPsid());//根据学生作业id校验提交状态
+            if (vo != null) return vo;
+//获取试题详情
             TQuestion questionBean = questionMapper.selectByPrimaryKey(psq1.getQuestionid());
             psq.setChecked(0);
             psq.setAnswertime(N_Utils.getSecondTimestamp());
@@ -305,12 +309,13 @@ public class PaperStudentService {
             if (costtime == null) costtime = 0;
             psq.setCosttime(psq.getCosttime() + costtime);
             psq.setConverted(converted);
-            return paperStudentQuestionService.update(psq);
+            paperStudentQuestionService.update(psq);
 //            return updateStuScore(psq1.getPsid());//自动批改单题提交时修改学生总得分
         } catch (Exception e) {
             log.error("提交试题失败："+e.getMessage());
-            throw new Exception("提交试题失败");
+            return new ResultVo(1, "提交失败！");
         }
+        return new ResultVo(0, "提交成功！");
     }
 
     /**
@@ -331,12 +336,12 @@ public class PaperStudentService {
      * @Date 2020/6/11 10:44
      * @return int
      **/
-    public int submitPaper(Integer psid) throws Exception {
+    public ResultVo submitPaper(Integer psid) {
         try {
             TPaperStudent ps = findById(psid);
             //如果学生作业不存在或是已提交，直接返回1提交成功
-            Integer psstate = ps.getPsstate();
-            if (ps == null || (psstate != 0 && psstate != 3)) return 1;
+            ResultVo vo = StudyUtil.checkPsState(ps);//校验学生作业提交状态
+            if (vo != null) return vo;
             Integer paperid = ps.getPaperid();
             Integer classid = ps.getClassid();
             TPaperStudent paperStudentBean = new TPaperStudent();
@@ -369,12 +374,20 @@ public class PaperStudentService {
                 }
             }
 
-            return result;
         } catch (Exception e) {
             log.error("提交作业失败："+e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            throw new RuntimeException("提交失败");
+            return new ResultVo(1, "提交失败！");
         }
+        return new ResultVo(0, "提交成功！");
+    }
+
+    //根据学生作业id校验提交状态
+    public ResultVo checkPsStateByPsId(Integer psid) {
+        Integer psstate = paperStudentMapper.getPsStateByPsId(psid);
+        if (psstate == null || psstate.equals(1) || psstate.equals(2)) return PlatformConstant.PAPER_COMMIT;
+        if (psstate.equals(4)) return PlatformConstant.AFTER_COMMIT;
+        return null;
     }
 
     /**
@@ -571,11 +584,13 @@ public class PaperStudentService {
      * @param  * @param pss
      * @return int
      */
-    public int scantronSubmitQuestion(TPaperStudentScantron pss) throws Exception {
+    public ResultVo scantronSubmitQuestion(TPaperStudentScantron pss) {
         try {
             //学生作业试题
             TPaperStudentScantron pss1 = paperStudentScantronService.getObjById(pss.getPssid());
             if (pss1 == null) throw new Exception("该学生作业不存在");
+            ResultVo vo = checkPsStateByPsId(pss1.getPsid());//根据学生作业id校验提交状态
+            if (vo != null) return vo;
             //获取原试题情况
             TPaperScantron scantronBean = paperScantronMapper.findById(pss1.getPscaid());
             pss.setChecked(0);
@@ -691,12 +706,13 @@ public class PaperStudentService {
             if (costtime == null) costtime = 0;
             pss.setCosttime(pss.getCosttime() + costtime);
             pss.setConverted(converted);
-            return paperStudentScantronService.updateStudentScantron(pss);
+            paperStudentScantronService.updateStudentScantron(pss);
 //            updateScantronStuScore(pss1.getPsid());//自动批改单题提交时修改学生总得分
         } catch (Exception e) {
             log.error("图片作业提交单题失败："+e.getMessage());
-            throw new Exception("提交失败");
+            return new ResultVo(1, "提交失败！");
         }
+        return new ResultVo(0, "提交成功！");
     }
 
     /**
@@ -706,12 +722,11 @@ public class PaperStudentService {
      * @param  * @param psid
      * @return int
      */
-    public int scantronSubmitPaper(Integer psid) throws Exception {
+    public ResultVo scantronSubmitPaper(Integer psid) {
         try {
             TPaperStudent ps = findById(psid);
-            //如果学生作业不存在或是已提交，直接返回1提交成功
-            Integer psstate = ps.getPsstate();
-            if (ps == null || (psstate != 0 && psstate != 3)) return 1;
+            ResultVo vo = StudyUtil.checkPsState(ps);//校验学生作业提交状态
+            if (vo != null) return vo;
             Integer paperid = ps.getPaperid();
             Integer classid = ps.getClassid();
             TPaperStudent paperStudentBean = new TPaperStudent();
@@ -730,7 +745,7 @@ public class PaperStudentService {
                 showanswer = 1;
             }
             paperStudentBean.setShowanswer(showanswer);
-            Integer result = updateSPaper(psid, paperStudentBean, pg);
+            updateSPaper(psid, paperStudentBean, pg);
             //获取未合并的学生答案
             List<TPaperStudentScantron> list = paperStudentScantronService.listNoMergeUserAnswer(psid);
             if (N_Utils.isListNotEmpty(list)) {
@@ -741,11 +756,11 @@ public class PaperStudentService {
                     }
                 }
             }
-            return result;
         } catch (Exception e) {
             log.error("图片作业提交作业失败："+e.getMessage());
-            throw new Exception("提交失败");
+            return new ResultVo(1, "提交失败！");
         }
+        return new ResultVo(0, "提交成功！");
     }
 
     /**
@@ -864,6 +879,18 @@ public class PaperStudentService {
         paperStudentMapper.updateShowanswer(timestamp);
     }
 
+    /**
+     * @Description 作业自动收卷
+     * @Date 2024/4/1 14:39
+     * @Author YWX
+     * @Param []
+     * @Return void
+     **/
+    public void updatePaperRollUp(){
+        int timestamp = N_Utils.getSecondTimestamp();
+        paperStudentMapper.updatePaperRollUp(timestamp);
+    }
+
 
 
     //////////////////////////////////////////////图片作业 end//////////////////////////////////////////////////////////////////////

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperStudentWebService.java

@@ -1,6 +1,8 @@
 package com.xhkjedu.sstudy.service.paperstudent;
 
 import com.alibaba.fastjson.JSON;
+import com.xhkjedu.constant.PlatformConstant;
+import com.xhkjedu.exception.MissingParametersException;
 import com.xhkjedu.sstudy.mapper.paper.PaperAnalyzeMapper;
 import com.xhkjedu.sstudy.mapper.paper.PaperMapper;
 import com.xhkjedu.sstudy.mapper.paper.PaperQtypeQuestionMapper;
@@ -21,6 +23,7 @@ import com.xhkjedu.sstudy.utils.ConvertUtil;
 import com.xhkjedu.sstudy.utils.StudyUtil;
 import com.xhkjedu.sstudy.vo.paperstudent.*;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -146,7 +149,7 @@ public class PaperStudentWebService {
      * @return void
      **/
     @Transactional(rollbackFor = Exception.class)
-    public void submitPaper(PaperStudentWebVo paper) throws Exception {
+    public ResultVo submitPaper(PaperStudentWebVo paper) {
         try {
             List<TPaperStudentQuestion> psqs = paper.getPsqs();
             TPaperStudentQuestion psq = psqs.get(0);
@@ -156,8 +159,8 @@ public class PaperStudentWebService {
             Integer psid = psq.getPsid();
             TPaperStudent ps2 = paperStudentMapper.findById(psid);
             //学生作业不存在或是已提交不处理
-            Integer psstate = ps2.getPsstate();
-            if (ps2 == null || (psstate != 0 && psstate != 3)) return;
+            ResultVo vo = StudyUtil.checkPsState(ps2);//校验学生作业提交状态
+            if (vo != null) return vo;
             Integer paperid = psq.getPaperid();
             Integer classid = paper.getClassid();
             int nowTime = N_Utils.getSecondTimestamp();
@@ -319,8 +322,9 @@ public class PaperStudentWebService {
         } catch (Exception e) {
             log.error("提交试卷失败："+e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            throw new RuntimeException("提交试卷失败");
+            return new ResultVo(1, "提交失败！");
         }
+        return new ResultVo(0, "提交成功！");
     }
 
     /**
@@ -331,7 +335,7 @@ public class PaperStudentWebService {
      * @return void
      **/
     @Transactional(rollbackFor = Exception.class)
-    public void scantronSubmitPaper(PaperStudentWebVo paper) throws Exception {
+    public ResultVo scantronSubmitPaper(PaperStudentWebVo paper) {
         try {
             List<TPaperStudentScantron> psqs = paper.getPss();
             TPaperStudentScantron pss = psqs.get(0);
@@ -340,9 +344,8 @@ public class PaperStudentWebService {
             Integer checknum = 0;
             Integer psid = pss.getPsid();
             TPaperStudent ps2 = paperStudentMapper.findById(psid);
-            //学生作业不存在或是已提交不处理
-            Integer psstate = ps2.getPsstate();
-            if (ps2 == null || (psstate != 0 && psstate != 3)) return;
+            ResultVo vo = StudyUtil.checkPsState(ps2);//校验学生作业提交状态
+            if (vo != null) return vo;
             Integer paperid = pss.getPaperid();
             Integer classid = paper.getClassid();
             int nowTime = N_Utils.getSecondTimestamp();
@@ -505,8 +508,9 @@ public class PaperStudentWebService {
         } catch (Exception e) {
             log.error("图片作业提交失败："+e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            throw new RuntimeException("图片作业提交失败");
+            return new ResultVo(1, "提交失败！");
         }
+        return new ResultVo(0, "提交成功！");
     }
 
     /**

sstudy/src/main/java/com/xhkjedu/sstudy/task/PaperStudentTask.java

@@ -26,6 +26,19 @@ public class PaperStudentTask {
         paperStudentService.updateShowanswer();
     }
 
+    /**
+     * @Description 作业自动收卷
+     * @Date 2024/4/1 14:39
+     * @Author YWX
+     * @Param []
+     * @Return void
+     **/
+    @Async("threadPoolTaskScheduler")
+    @Scheduled(cron = "${cron.updatePaperStuShowanswer}")
+    public void updatePaperRollUp() {
+        paperStudentService.updatePaperRollUp();
+    }
+
     /**
      * 合并学生答案-题库作业
      *

sstudy/src/main/java/com/xhkjedu/sstudy/utils/StudyUtil.java

@@ -1,12 +1,16 @@
 package com.xhkjedu.sstudy.utils;
 
+import com.xhkjedu.constant.PlatformConstant;
+import com.xhkjedu.exception.MissingParametersException;
 import com.xhkjedu.sstudy.config.ConfigKey;
 import com.xhkjedu.sstudy.mapper.paper.PaperAnalyzeMapper;
+import com.xhkjedu.sstudy.model.paperstudent.TPaperStudent;
 import com.xhkjedu.sstudy.vo.paper.PaperClassVo;
 import com.xhkjedu.sstudy.vo.paper.PaperListVo;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo;
 import com.xhkjedu.sstudy.vo.paperstudent.StudentPaperTypeVo;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpEntity;
@@ -269,4 +273,14 @@ public class StudyUtil {
         rtnmap.put("bxclassids",bxclassids);
         return rtnmap;
     }
+
+    //校验学生作业提交状态
+    public static ResultVo checkPsState(TPaperStudent ps) {
+        //如果学生作业不存在或是已提交，直接返回提交成功
+        if (ps == null) return PlatformConstant.COMMIT_SUCCESS;
+        Integer psstate = ps.getPsstate();
+        if (psstate.equals(1) || psstate.equals(2)) return PlatformConstant.COMMIT_SUCCESS;
+        if (psstate.equals(4)) return PlatformConstant.AFTER_COMMIT;
+        return null;
+    }
 }

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paper/PaperListVo.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sstudy.vo.paper;
 
 import lombok.Data;
 
+import javax.persistence.Transient;
 import java.util.List;
 import java.util.Map;
 
@@ -77,4 +78,8 @@ public class PaperListVo {
 
     //是否有伙伴学校：0没有1有
     private Integer hashb;
+
+    @Transient
+    //补交：0不允许 1允许
+    private Integer aftercommit;
 }

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paper/PaperTeacherAppVo.java

@@ -77,4 +77,7 @@ public class PaperTeacherAppVo {
 
     //是否有伙伴学校：0没有1有
     private Integer hashb;
+
+    //补交：0不允许 1允许
+    private Integer aftercommit;
 }

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paperstudent/PaperGroupParam.java

@@ -56,4 +56,6 @@ public class PaperGroupParam {
     //发布年份
     private Integer year;
 
+    //补交：0不允许 1允许
+    private Integer aftercommit;
 }

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

@@ -40,6 +40,7 @@
     <!-- 修改作业状态 -->
     <update id="updatePaperState">
         UPDATE t_paper SET paperstate=#{pg.paperstate},hashb=#{pg.hashb},committype=#{pg.committype},timetype=#{pg.timetype}
+        ,aftercommit=#{pg.aftercommit}
         <if test="ctypecount==0">,checktype=4</if>
         WHERE paperid= #{pg.paperid}
     </update>
@@ -88,6 +89,7 @@
         <result property="ytjnum" column="ytjnum"/>
         <result property="ypgnum" column="ypgnum"/>
         <result property="hashb" column="hashb"/>
+        <result property="aftercommit" column="aftercommit"/>
         <collection property="schools" ofType="java.util.Map" javaType="java.util.List"
                     select="listClass" column="{paperid=paperid,createid=createid,checkid=checkid,checktype=checktype,logschoolid=logschoolid,classids=classids}">
         </collection>
@@ -199,11 +201,11 @@
     <select id="listAll" resultMap="paperResult">
         select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.schoolid,p.hasreport,p.timetype,p.hashb,
         #{paper.schoolid} logschoolid,u.username createname,pg.starttime,pg.stoptime,pg.showtype,p.papernum,p.createid,#{paper.createid} as checkid
-        ,group_concat(pg.classid) classids
+        ,group_concat(pg.classid) classids,p.aftercommit
         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 p.deleted=0 and p.lsbid=#{paper.lsbid} and (d.disabled=0 or p.directorid is null)
+        where p.deleted=0 and (d.disabled=0 or p.directorid is null)
         <if test="userVo.usertype!=null and userVo.usertype==0">
             and p.schoolid=#{userVo.schoolid}
         </if>
@@ -212,6 +214,9 @@
             (p.hashb=1 and p.schoolid=#{paper.schoolid} and pg.classid in (${paper.classids})) or
             (pg.classid in (${paper.bxclassids})))
         </if>
+        <if test="paper.lsbid!=null and paper.lsbid!='0'.toString() and paper.lsbid!=''">
+            and p.lsbid=#{paper.lsbid}
+        </if>
         <if test="paper.directorid!=null and paper.directorid!='0'.toString() and paper.directorid!=''">
             and p.directorid=#{paper.directorid}
         </if>
@@ -236,11 +241,14 @@
     <select id="listAllMy" resultMap="paperResult">
         select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.schoolid,p.hasreport,p.timetype,p.hashb,
         #{paper.schoolid} logschoolid,u.username createname,pg.starttime,pg.stoptime,pg.showtype,p.papernum,p.createid,#{paper.createid} as checkid
-        ,group_concat(pg.classid) classids
+        ,group_concat(pg.classid) classids,p.aftercommit
         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 p.deleted=0 and p.lsbid=#{paper.lsbid} and p.createid=#{paper.createid} and (d.disabled=0 or p.directorid is null)
+        where p.deleted=0 and p.createid=#{paper.createid} and (d.disabled=0 or p.directorid is null)
+        <if test="paper.lsbid!=null and paper.lsbid!='0'.toString() and paper.lsbid!=''">
+            and p.lsbid=#{paper.lsbid}
+        </if>
         <if test="paper.directorid!=null and paper.directorid!='0'.toString() and paper.directorid!=''">
             and p.directorid=#{paper.directorid}
         </if>
@@ -266,14 +274,18 @@
     <select id="listWfbPapers" resultType="com.xhkjedu.sstudy.vo.paper.PaperListVo">
         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
+        ,p.aftercommit
         from t_paper p left join t_director d on p.directorid=d.directorid
-        where p.deleted=0 and p.lsbid=#{paper.lsbid} and p.paperstate=21 and (d.disabled=0 or p.directorid is null)
+        where p.deleted=0 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>
         <if test="userVo.usertype!=0">
             and p.createid=#{paper.createid}
         </if>
+        <if test="paper.lsbid!=null and paper.lsbid!='0'.toString() and paper.lsbid!=''">
+            and p.lsbid=#{paper.lsbid}
+        </if>
         <if test="paper.directorid!=null and paper.directorid!='0'.toString() and paper.directorid!=''">
             and p.directorid=#{paper.directorid}
         </if>
@@ -306,7 +318,7 @@
     <select id="correctList" resultMap="paperResult">
         select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.schoolid,p.hasreport,p.timetype,p.hashb
         ,#{schoolid} as logschoolid,u.username createname,pg.starttime,pg.stoptime,pg.showtype,p.papernum,p.createid,#{checkid} as checkid
-        ,group_concat(pg.classid) classids
+        ,group_concat(pg.classid) classids,p.aftercommit
         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_paper_student ps on p.paperid=ps.paperid and pg.classid=ps.classid
@@ -361,7 +373,7 @@
     <select id="listPaper" resultMap="paperResult">
         select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.timetype
         ,pg.starttime,pg.stoptime,p.papernum,p.createid,#{paper.teacherid} as checkid,p.schoolid,#{paper.schoolid} as logschoolid
-        ,pg.showtype,p.hasreport,p.hashb,group_concat(pg.classid) classids
+        ,pg.showtype,p.hasreport,p.hashb,group_concat(pg.classid) classids,p.aftercommit
         ,(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_class c on pg.classid=c.classid
@@ -399,6 +411,10 @@
     <update id="updatePaperDeleted">
         update t_paper set deleted=#{deleted} where paperid=#{paperid}
     </update>
+    <!--修改补交状态-->
+    <update id="updateAfterCommit">
+        update t_paper set aftercommit=#{paper.aftercommit} where paperid=#{paper.paperid}
+    </update>
 
     <!--获取作业原文件保存地址列表-->
     <select id="listSourcePath" resultType="java.lang.String">

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

@@ -14,6 +14,7 @@
         <result property="logschoolid" column="logschoolid"/>
         <result property="createname" column="createname"/>
         <result property="hashb" column="hashb"/>
+        <result property="aftercommit" column="aftercommit"/>
         <collection property="students" ofType="com.xhkjedu.sstudy.vo.paperstudent.StudentVo"
                     select="listPaperStu" column="{paperid=paperid,createid=createid,checkid=checkid,logschoolid=logschoolid,classids=classids}">
         </collection>
@@ -29,7 +30,7 @@
     <select id="listTeacherApp" resultMap="paperResult">
         select p.paperid,p.papername,p.papernum,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createid,#{paper.teacherid} as checkid
         ,min(pg.starttime) as starttime,min(pg.stoptime) as stoptime,pg.checked,p.subjectid,p.paperscore,p.schoolid,#{paper.schoolid} logschoolid
-        ,group_concat(pg.classid) classids,p.hashb
+        ,group_concat(pg.classid) classids,p.hashb,p.aftercommit
         ,(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
@@ -54,7 +55,7 @@
     <select id="listMyTeacherApp" resultMap="paperResult">
         select p.paperid,p.papername,p.papernum,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createid,#{paper.teacherid} as checkid
         ,min(pg.starttime) as starttime,min(pg.stoptime) as stoptime,pg.checked,p.subjectid,p.paperscore,p.schoolid,#{paper.schoolid} logschoolid
-        ,group_concat(pg.classid) classids,p.hashb
+        ,group_concat(pg.classid) classids,p.hashb,p.aftercommit
         ,(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
@@ -75,7 +76,7 @@
     <!--未布置作业列表-->
     <select id="listWbz" resultType="com.xhkjedu.sstudy.vo.paper.PaperTeacherAppVo">
         select p.paperid,p.papername,p.papernum,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createid
-        ,p.subjectid,p.paperscore,p.schoolid
+        ,p.subjectid,p.paperscore,p.schoolid,p.aftercommit
         ,(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 p.deleted=0 and p.createid=#{paper.teacherid} and p.paperstate=#{paper.psstate} and (d.disabled=0 or p.directorid is null)

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

@@ -192,6 +192,15 @@
         update t_paper_student ps left join t_paper_class pg on ps.paperid=pg.paperid and ps.classid=pg.classid
         set ps.showanswer=1 where pg.pgstate=22 AND pg.showtype=1 and ps.showanswer=0 and pg.stoptime <![CDATA[ <= ]]> #{stoptime}
     </update>
+    <!--作业自动收卷-->
+    <update id="updatePaperRollUp">
+        update t_paper p left join t_paper_class pg on p.paperid=pg.paperid
+        left join t_paper_student ps on ps.paperid=pg.paperid and ps.classid=pg.classid
+        set ps.psstate=4,ps.stoptime=#{stoptime},pg.rollup=1
+        ,ps.userscore=if(p.papertype=2,(select sum(q.stuscore) from t_paper_student_scantron q where q.psid=ps.psid)
+            ,(select sum(q.stuscore) from t_paper_student_question q where q.psid=ps.psid))
+        where p.aftercommit=0 and pg.pgstate=22 and pg.rollup=0 and ps.psstate=0 and pg.stoptime <![CDATA[ <= ]]> #{stoptime}
+    </update>
 
 
 
@@ -418,4 +427,8 @@
         <if test="ps.psstate!=null and ps.psstate==2">and ps.psstate in(1,2)</if>
         order by field(ps.psstate,1,2,0,3)
     </select>
+    <!--根据学生作业id获取提交状态-->
+    <select id="getPsStateByPsId" resultType="java.lang.Integer">
+        select ps.psstate from t_paper_student ps where ps.psid=#{psid}
+    </select>
 </mapper>