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

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

@@ -186,6 +186,7 @@ public class PaperService {
         paper.setCreatetime(N_Utils.getSecondTimestamp());
         paper.setChecktype(0);
         paper.setHasreport(0);
+        paper.setTimetype(1);
         String directorid = paper.getDirectorid();
         if (directorid != null && (directorid.equals("0") || directorid.equals(""))) {
             paper.setDirectorid(null);
@@ -885,12 +886,14 @@ public class PaperService {
         Map paper = paperMapper.findById(paperid);
 
         Integer paperstate = Integer.parseInt(paper.get("paperstate").toString());
-        Integer timetype = Integer.parseInt(paper.get("timetype").toString());
-        if(paperstate == 22 && timetype == 1){
-            //统一布置，获取班级发布时间
-            TPaperClass paperClass = paperClassMapper.getPaperClassTimes(paperid);
-            paper.put("starttime",paperClass.getStarttime());
-            paper.put("stoptime",paperClass.getStoptime());
+        if(paperstate == 22){
+            Integer timetype = Integer.parseInt(paper.get("timetype").toString());
+            if(timetype == 1){
+                //统一布置，获取班级发布时间
+                TPaperClass paperClass = paperClassMapper.getPaperClassTimes(paperid);
+                paper.put("starttime",paperClass.getStarttime());
+                paper.put("stoptime",paperClass.getStoptime());
+            }
         }
 
         List<TPaperFile> fils = paperFileService.listObjsByPaperid(paperid);
@@ -915,14 +918,16 @@ public class PaperService {
         Integer papertype = Integer.parseInt(paper.get("papertype").toString());
         Integer paperstate = Integer.parseInt(paper.get("paperstate").toString());
 
-        Integer timetype = Integer.parseInt(paper.get("timetype").toString());
-        if(paperstate == 22 && timetype == 1){
-            //统一布置，获取班级发布时间
-            TPaperClass paperClass = paperClassMapper.getPaperClassTimes(paperid);
-            paper.put("starttime",paperClass.getStarttime());
-            paper.put("stoptime",paperClass.getStoptime());
-        }
 
+        if(paperstate == 22){
+            Integer timetype = Integer.parseInt(paper.get("timetype").toString());
+            if(timetype == 1){
+                //统一布置，获取班级发布时间
+                TPaperClass paperClass = paperClassMapper.getPaperClassTimes(paperid);
+                paper.put("starttime",paperClass.getStarttime());
+                paper.put("stoptime",paperClass.getStoptime());
+            }
+        }
 
         List<PaperQtypeVo> types = paperMapper.listPaperType(paperid);//获取作业题型列表
         List<QuestionVo> qlist = new ArrayList<>();