Merge branch 'dev_v3.1.0' into release_v3.1.0

merge

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/GradeBatchPaperMapper.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.distributed.print.business.bean.result.analyze.GradeBatchPaperResult;
 import com.qmth.distributed.print.business.entity.GradeBatchPaper;
-import io.swagger.annotations.ApiModelProperty;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

distributed-print-business/src/main/resources/mapper/GradeBatchPaperMapper.xml

@@ -47,6 +47,7 @@
         basic_semester bs ON be.school_id = bs.school_id
         AND be.semester_id = bs.id
         <where>
+            AND gbp.enable = true
             <if test="schoolId != null and schoolId != ''">
                 AND gbp.school_id = #{schoolId}
             </if>

distributed-print-business/src/main/resources/mapper/GradeInitializeMapper.xml

@@ -27,7 +27,7 @@
              FROM
                  grade_batch_paper
              WHERE
-                 status NOT IN ('SETTING_GRADE_PAPER' , 'PUSH_GRADE_BATCH')
+                 enable = true AND status NOT IN ('SETTING_GRADE_PAPER' , 'PUSH_GRADE_BATCH')
              GROUP BY school_id , paper_number , paper_type) pnpt ON et.school_id = pnpt.school_id
                 AND et.paper_number = pnpt.paper_number
                 AND LOCATE(pnpt.paper_type, etd.relate_paper_type)