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

smarking/src/main/java/com/xhkjedu/smarking/controller/exam/MsSubjectController.java

         msSubjectService.updateCheckState(msid, handleid, 2);
         return new ResultVo(0, "停止成功");
     }
+
+    /**
+     * @Description 考试科目选择列表
+     * @Date 2024/12/3 11:27
+     * @Author YWX
+     * @Param [msSubject]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_sel")
+    public ResultVo listForSel(@RequestBody MsSubject msSubject) {
+        Integer examid = msSubject.getExamid();
+        Integer handleid = msSubject.getHandleid();
+        N_Utils.validation(new Object[]{
+                examid, "考试id", 1
+                , handleid, "操作人id", 1
+        });
+        return new ResultVo(0, "获取成功", msSubjectService.listForSel(examid, handleid));
+    }
+
+    /**
+     * @Description 单科设置信息
+     * @Date 2024/12/3 17:56
+     * @Author YWX
+     * @Param [msSubject]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/get_set")
+    public ResultVo getSet(@RequestBody MsSubject msSubject) {
+        Integer examid = msSubject.getExamid();
+        String subjectid = msSubject.getSubjectid();
+        N_Utils.validation(new Object[]{
+                examid, "考试id", 1
+                , subjectid, "科目id", 2
+        });
+        return new ResultVo(0, "获取成功", msSubjectService.getSet(examid, subjectid));
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/exam/MsSubjectMapper.java

 
     //修改试卷结构后更改后续操作状态
     int updatePaperFollowup(@Param("mpid")Integer mpid);
+
+    //单科设置信息
+    Map getSet(@Param("examid") Integer examid,@Param("subjectid") String subjectid);
 }

smarking/src/main/java/com/xhkjedu/smarking/service/exam/MsSubjectService.java

 import com.xhkjedu.exception.ServiceException;
 import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
 import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckMapper;
+import com.xhkjedu.smarking.mapper.system.UserMapper;
 import com.xhkjedu.smarking.model.exam.MsSubject;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description 阅卷考试科目表 服务实现类
     private MsSubjectMapper msSubjectMapper;
     @Resource
     private MsPaperCheckMapper msPaperCheckMapper;
+    @Resource
+    private UserMapper userMapper;
 
 
     /**
 
         msPaperCheckMapper.updateCheckStateByMsId(msid, checkstate);//更新题块阅卷状态
     }
+
+    /**
+     * @Description 考试科目选择列表
+     * @Date 2024/12/3 11:26
+     * @Author YWX
+     * @Param [examid, handleid]
+     * @Return java.lang.Object
+     **/
+    public Object listForSel(Integer examid, Integer handleid) {
+        Integer usertype = userMapper.getUsertypeByUserid(handleid);
+        if (usertype.equals(0)) {
+            return msSubjectMapper.listSubjectNameByExamId(examid);
+        } else {
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * @Description 单科设置信息
+     * @Date 2024/12/3 17:56
+     * @Author YWX
+     * @Param [examid, subjectid]
+     * @Return java.util.Map
+     **/
+    public Map getSet(Integer examid, String subjectid) {
+        return msSubjectMapper.getSet(examid, subjectid);
+    }
 }

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

         from ms_subject s left join t_user u on s.teacherid=u.userid
         where examid=#{examid}
     </select>
+    <!--单科设置信息-->
+    <select id="getSet" resultType="java.util.Map">
+        select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.pstate,s.checkset,s.checkstate,s.invigilatestate
+        ,count(distinct if(ps.batchid is not null,ps.mpsid,null)) as scannum
+        ,count(distinct pb.mblockid) as blocknum
+        ,count(distinct if(tb.localcoor is null or tb.localcoor='',tb.mblockid,null)) as wkxnum
+        ,count(distinct if(pc.dispenseway!=0,pc.mblockid,null)) as ysznum
+        ,count(distinct if(pb.blocktype=2,pb.mblockid,null))-count(distinct if(pc.dispenseway!=0,pc.mblockid,null)) as wsznum
+        ,count(distinct if(psb.arbitratestate in(1,2),psb.mpsbid,null)) as arbitratenum
+        ,count(distinct if(psb.hasproblem in(1,2),psb.mpsbid,null)) as problemnum
+        from ms_subject s left join ms_paper_student ps on s.msid = ps.msid
+        left join ms_paper_block pb on pb.mpid = ps.mpid
+        left join ms_template t on t.mpid=ps.mpid
+        left join ms_template_block tb on tb.mtid=t.mtid
+        left join ms_paper_check pc on pc.mpid=ps.mpid
+        left join ms_paper_student_block psb on psb.mpsid=ps.mpsid and psb.mblockid=pb.mblockid
+        where s.examid=#{examid} and s.subjectid=#{subjectid}
+    </select>
     <!--定时任务-科目结束考试-->
     <update id="updateEndSubject">
         update ms_subject ms