学生提交作业答案显示方式完善

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

@@ -352,7 +352,7 @@ public class PaperStudentService {
 
             //答案显示方式：1作业截至时间，2提交后显示
             Integer showanswer = 0;
-            if (pg.getShowtype() == 2) {
+            if (pg.getShowtype() == 2 || paperStudentBean.getPsstate() == 2) {
                 showanswer = 1;
             }
             paperStudentBean.setShowanswer(showanswer);
@@ -726,7 +726,7 @@ public class PaperStudentService {
 
             //答案显示方式：1作业截至时间，2提交后显示
             Integer showanswer = 0;
-            if (pg.getShowtype() == 2) {
+            if (pg.getShowtype() == 2 || paperStudentBean.getPsstate() == 2) {
                 showanswer = 1;
             }
             paperStudentBean.setShowanswer(showanswer);

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

@@ -304,7 +304,7 @@ public class PaperStudentWebService {
             ps.setPschecked(pschecked);
             ps.setCosttime(paper.getCosttime());
             Integer showanswer = 0;
-            if (pg.getShowtype() == 2){
+            if (pg.getShowtype() == 2 || ps.getPsstate() == 2){
                 showanswer = 1;
             }
             ps.setShowanswer(showanswer);
@@ -488,7 +488,7 @@ public class PaperStudentWebService {
             ps.setPschecked(pschecked);
             ps.setCosttime(paper.getCosttime());
             Integer showanswer = 0;
-            if (pg.getShowtype() == 2){
+            if (pg.getShowtype() == 2 || ps.getPsstate() == 2){
                 showanswer = 1;
             }
             ps.setShowanswer(showanswer);