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

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsPaperQtypeService.java

@@ -134,7 +134,13 @@ public class MsPaperQtypeService {
     //设置试卷基本信息
     private void setPaperBaseDetail(MsPaper paper,List<MsPaperQtype> qtypelist){
         if(paper.getPtype() == 2 && paper.getPfiles()!=null && !paper.getPfiles().isEmpty()){
-            paper.setHasfile(1);
+            //获取附件为1题干的数量
+            List<MsPaperFile> pfiles = paper.getPfiles().stream().filter(p -> p.getFiletype() == 1).collect(Collectors.toList());
+            if(N_Utils.isListNotEmpty(pfiles)){
+                paper.setHasfile(1);
+            }else{
+                paper.setHasfile(0);
+            }
         }else {
             paper.setHasfile(0);
         }
@@ -1033,6 +1039,8 @@ public class MsPaperQtypeService {
             pf.setFiletype(1);
             pf.setFileorder(i++);
         }
+        paper.setHasfile(1);
+        msPaperMapper.updateByPrimaryKeySelective(paper);
         msPaperFileMapper.insertList(pfiles);
     }
 

smarking/src/main/resources/mapper/exam/MsSubjectMapper.xml

@@ -13,7 +13,7 @@
     <select id="examOverview" resultType="java.util.Map">
         select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.pstate,s.ptstate,
         s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.answered,s.teacherid,
-        u.username as teachername,p.mpid,e.exammode,s.leaderid,u2.username as leadername
+        u.username as teachername,p.mpid,p.hasfile,e.exammode,s.leaderid,u2.username as leadername
         ,if(ps.batchid is not null,ps.mpsid,null) scannum,count(ps.mpsid) stunum
         from ms_subject s left join t_user u on s.teacherid=u.userid
         left join t_user u2 on s.leaderid=u2.userid