分组管理，科组长屏蔽新增和修改功能；成绩导出新增科目总分为0和有主观题但未设置评卷分组的验证

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ScoreController.java

@@ -7,6 +7,7 @@ import cn.com.qmth.stmms.biz.exam.model.*;
 import cn.com.qmth.stmms.biz.exam.query.ExamStudentSearchQuery;
 import cn.com.qmth.stmms.biz.exam.service.*;
 import cn.com.qmth.stmms.biz.file.service.FileService;
+import cn.com.qmth.stmms.biz.utils.DoubleUtil;
 import cn.com.qmth.stmms.biz.utils.ScoreItem;
 import cn.com.qmth.stmms.common.annotation.Logging;
 import cn.com.qmth.stmms.common.annotation.RoleRequire;
@@ -342,17 +343,21 @@ public class ScoreController extends BaseExamController {
         if (subject == null) {
             return "该科目不存在";
         }
-
+        if (DoubleUtil.sum(subject.getObjectiveScore(), subject.getSubjectiveScore()) == 0) {
+            return subjectCode + "科目总分为0";
+        }
+        long groupCount = groupService.countByExamAndSubject(examId, subjectCode);
+        if (subject.getSubjectiveScore() != null && subject.getSubjectiveScore() > 0 && groupCount == 0) {
+            return subjectCode + "未设置评卷分组";
+        }
         List<MarkGroup> groups = groupService.findByExamAndSubjectAndStatus(examId, subjectCode, MarkStatus.FORMAL,
                 MarkStatus.TRIAL);
         if (groups != null && !groups.isEmpty()) {
             return subjectCode + "评卷未完成";
         }
-
         if (checkStudentService.countByExamIdAndSubjectCodeAndChecked(examId, subjectCode, false) > 0) {
             return subjectCode + "人工确认未完成";
         }
-
         ExamStudentSearchQuery query = new ExamStudentSearchQuery();
         query.setExamId(examId);
         query.setUpload(false);

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/groupList.jsp

@@ -30,17 +30,17 @@
         </select>
         &nbsp;
         <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-        
-        <c:if test="${web_user.schoolAdmin==true || web_user.subjectHeader==true}">
+
+        <c:if test="${web_user.schoolAdmin==true }">
 	            &nbsp;
 	 			<a href="${ctx}/admin/exam/group/add?subjectCode=${subject.code}" class="btn">新增</a>
+        </c:if>
 	            &nbsp;
 	            <a href="${ctx}/admin/exam/group/check-count?subjectCode=${subject.code}" class="btn">数量校对</a>
             &nbsp;
             <input id="btnFinish" class="btn" type="button" value="关闭" onclick="goFinish()"/>
             <a href="javascript:void(0)" class="trial-button"
                        onclick="updateTrialCount();">设置试评数量</a>
-        </c:if>
     </div>
 </form>
 <tags:message content="${message}"/>
@@ -89,7 +89,7 @@
                     正在删除
                 </c:if>
                 <c:if test="${result.deleting==false}">
-                    <c:if test="${(web_user.schoolAdmin==true ||web_user.subjectHeader==true) && result.status.value!=3}">
+                    <c:if test="${result.status.value!=3}">
                         <c:if test="${result.status.value==1}">
                             <a href="${ctx}/admin/exam/group/changeStatus?subjectCode=${result.subjectCode}&number=${result.number}&status=FORMAL" data-number="${result.number}" class="edit-button"
                                id="statusButton">开始正评</a>
@@ -107,11 +107,11 @@
                             <a href="${ctx}/admin/exam/group/reset?subjectCode=${result.subjectCode}&number=${result.number}" data-number="${result.number}" class="reset-button">重置</a>
                         </c:if> --%>
                         &nbsp;
-                        <c:if test="${examType!='MULTI_MEDIA'}">
+                        <c:if test="${examType!='MULTI_MEDIA' && web_user.schoolAdmin==true}">
                             <a href="${ctx}/admin/exam/group/edit-simple?subjectCode=${result.subjectCode}&number=${result.number}" data-number="${result.number}" class="edit-button">修改</a>
                             &nbsp;
                         </c:if>
-                        <c:if test="${examType=='MULTI_MEDIA'}">
+                        <c:if test="${examType=='MULTI_MEDIA' && web_user.schoolAdmin==true}">
                             <a href="${ctx}/admin/exam/group/delete?subjectCode=${result.subjectCode}&number=${result.number}" data-number="${result.number}" class="delete-button">删除</a>
                             &nbsp;
                         </c:if>