优化预习、作业、考试基础信息关联年份。

数据汇总

sapi/src/main/resources/mapper/analyze/SchoolSummaryMapper.xml

@@ -99,7 +99,7 @@
         left join t_class c on c.classid=ggs.classid
         left join t_director d on g.directorid=d.directorid
         where d.disabled=0 and g.schoolid=#{sparams.schoolid} and ggs.schoolid=#{sparams.schoolid}
-        and c.gradeid=#{sparams.gradeid} and g.year=#{sparams.year}
+        and c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year}
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and g.subjectid=#{sparams.subjectid}
         </if>

sexam/src/main/java/com/xhkjedu/sexam/mapper/exam/EBaseMapper.java

@@ -38,7 +38,7 @@ public interface EBaseMapper extends TkMapper<EBase> {
     String getNameByExamId(@Param("examid") Integer examid);
 
     //发布考试
-    void postExam(@Param("examid") Integer examid, @Param("examcomm") String examcomm,@Param("year") Integer year);
+    void postExam(@Param("examid") Integer examid, @Param("examcomm") String examcomm);
 
     //根据考试id获取考试状态信息
     EBaseVo getExamStateById(@Param("examid") Integer examid);
@@ -74,7 +74,7 @@ public interface EBaseMapper extends TkMapper<EBase> {
     void clearExamPdf(@Param("examid") Integer examid);
 
     //获取学校当前年份
-    Integer getYearBySchoolid(@Param("schoolid") Integer schoolid);
+    Integer getYearByUserid(@Param("userid") Integer userid);
 
     //获取考试学校id
     Integer getSchoolidByExamid(@Param("examid") Integer examid);

sexam/src/main/java/com/xhkjedu/sexam/service/exam/EBaseService.java

@@ -84,6 +84,8 @@ public class EBaseService {
                 model.setHashb(1);
             }
 
+            int year=eBaseMapper.getYearByUserid(model.getCreateid());
+            model.setYear(year);
             eBaseMapper.insertUseGeneratedKeys(model);
             Integer examid = model.getId();
 
@@ -257,10 +259,8 @@ public class EBaseService {
                     }
                 }).start();
             }
-
-            int year=eBaseMapper.getYearBySchoolid(schoolid);
             //更改考试状态
-            eBaseMapper.postExam(examid, examcomm,year);
+            eBaseMapper.postExam(examid, examcomm);
         } catch (Exception e) {
             log.error("发布考试失败："+e.getMessage());
             return 1;

sexam/src/main/resources/mapper/exam/EBaseMapper.xml

@@ -57,7 +57,7 @@
 
     <!--发布考试-->
     <update id="postExam">
-        update e_base set examcomm=#{examcomm},examstate=1,`year`=#{year} where examid=#{examid}
+        update e_base set examcomm=#{examcomm},examstate=1 where examid=#{examid}
     </update>
     <!--考试基本信息-->
     <select id="findById" resultType="java.util.Map">
@@ -147,8 +147,9 @@
     </update>
 
     <!--获取学校当前年份-->
-    <select id="getYearBySchoolid" resultType="java.lang.Integer">
-        select `year` from t_school where schoolid=#{schoolid}
+    <select id="getYearByUserid" resultType="java.lang.Integer">
+        select s.year from t_user u left join t_school s on u.schoolid=s.schoolid
+        where u.userid=#{userid}
     </select>
 
     <!--获得发起考试学校id-->

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

@@ -9,6 +9,7 @@ import com.xhkjedu.sstudy.mapper.paper.*;
 import com.xhkjedu.sstudy.mapper.paperstudent.PaperClassMapper;
 import com.xhkjedu.sstudy.mapper.paperstudent.PaperStudentMapper;
 import com.xhkjedu.sstudy.mapper.subjectbook.TeacherSubjectbookMapper;
+import com.xhkjedu.sstudy.mapper.system.SchoolMapper;
 import com.xhkjedu.sstudy.model.paper.*;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperClass;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperStudent;
@@ -67,6 +68,8 @@ public class PaperService {
 
     @Resource
     private TeacherSubjectbookMapper teacherSubjectbookMapper;
+    @Resource
+    private SchoolMapper schoolMapper;
 
     /**
      * 功能描述  答题卡作业--保存
@@ -208,6 +211,8 @@ public class PaperService {
         if (directorid != null && (directorid.equals("0") || directorid.equals(""))) {
             paper.setDirectorid(null);
         }
+        int year = schoolMapper.getYearByUserId(paper.getCreateid());
+        paper.setYear(year);
         paperMapper.insertUseGeneratedKeys(paper);
         return paper.getId();
     }

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

@@ -346,9 +346,6 @@ public class PaperClassService {
                     paperGroupParam.setHashb(hashb);
                     paperGroupParam.setPaperstate(22);
 
-                    //获取发布作业时学校年份
-                    int year = schoolMapper.getYearById(paper.getSchoolid());
-                    paperGroupParam.setYear(year);
                     paperMapper.updatePaperState(paperGroupParam,count);
                     return new ResultVo(0, "发布成功", count);
                 } else {

sstudy/src/main/java/com/xhkjedu/sstudy/service/resource/GuideService.java

@@ -116,7 +116,7 @@ public class GuideService {
                     hashb = 1;
                 }
                 guide.setHashb(hashb);
-                int year = schoolMapper.getYearById(guide.getSchoolid());
+                int year = schoolMapper.getYearByUserId(guide.getCreateid());
                 guide.setYear(year);
                 guideMapper.insertUseGeneratedKeys(guide);
                 Integer guideid = guide.getId();//预习id

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

@@ -39,7 +39,7 @@
     </select>
     <!-- 修改作业状态 -->
     <update id="updatePaperState">
-        UPDATE t_paper SET paperstate=#{pg.paperstate},hashb=#{pg.hashb},committype=#{pg.committype},timetype=#{pg.timetype},year=#{pg.year}
+        UPDATE t_paper SET paperstate=#{pg.paperstate},hashb=#{pg.hashb},committype=#{pg.committype},timetype=#{pg.timetype}
         <if test="ctypecount==0">,checktype=4</if>
         WHERE paperid= #{pg.paperid}
     </update>