yin пре 2 месеци
родитељ
комит
d27ca8e556

+ 12 - 0
install/mysql/upgrade/1.6.0.sql

@@ -5,6 +5,18 @@ ALTER TABLE eb_exam_question ADD COLUMN `track_count` int(11) NOT NULL COMMENT '
 ALTER TABLE eb_exam_student ADD COLUMN `collation_label_code` varchar(64) DEFAULT NULL COMMENT '回卷标识代码';
 ALTER TABLE eb_exam_subject ADD COLUMN `enable_all_selective`  tinyint(1)  NOT NULL COMMENT '开启一键未选做';
 
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
+VALUES ('exam_problem_history-export', '导出', 'exam_problem_history', 'BUTTON', 2, 3);
+INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
+SELECT s.id,'SCHOOL_ADMIN',p.`code`,1 from b_privilege p join b_school s
+where p.`code` ='exam_problem_history-export';
+INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
+SELECT s.id,'SUBJECT_HEADER',p.`code`,0 from b_privilege p join b_school s
+where p.`code` ='exam_problem_history-export';
+INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
+SELECT s.id,'COLLEGE_ADMIN',p.`code`,0 from b_privilege p join b_school s
+where p.`code` ='exam_problem_history-export';
+
 DROP TABLE IF EXISTS `eb_collation_label`;
 CREATE TABLE `eb_collation_label`
 (

+ 2 - 2
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/basic/service/impl/PrivilegeServiceImpl.java

@@ -135,7 +135,7 @@ public class PrivilegeServiceImpl extends BaseQueryService<Privilege> implements
         sql.append("INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)");
         sql.append(" SELECT s.id,'" + role.name() + "',p.`code`,0 from b_privilege p join b_school s   ");
         sql.append(
-                " where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete')");
+                " where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete' ,'exam_problem_history-export')");
         sql.append(" and s.id=" + schoolId);
         query = entityManager.createNativeQuery(sql.toString());
         query.executeUpdate();
@@ -167,7 +167,7 @@ public class PrivilegeServiceImpl extends BaseQueryService<Privilege> implements
         sql.append("INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)");
         sql.append(" SELECT s.id,'" + role.name() + "',p.`code`,0 from b_privilege p join b_school s   ");
         sql.append(
-                " where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete')");
+                " where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete', 'exam_problem_history-export')");
         sql.append(" and s.id=" + schoolId);
         query = entityManager.createNativeQuery(sql.toString());
         query.executeUpdate();

+ 0 - 11
stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ProblemHistoryDTO.java

@@ -19,9 +19,6 @@ public class ProblemHistoryDTO {
     @ExcelField(title = "准考证号", align = 2, sort = 60)
     private String examNumber;
 
-    @ExcelField(title = "学号", align = 2, sort = 70)
-    private String studentCode;
-
     @ExcelField(title = "密号", align = 2, sort = 80)
     private String secretNumber;
 
@@ -86,14 +83,6 @@ public class ProblemHistoryDTO {
         this.examNumber = examNumber;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
     public String getSecretNumber() {
         return secretNumber;
     }

+ 0 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ProblemHistoryController.java

@@ -215,7 +215,6 @@ public class ProblemHistoryController extends BaseExamController {
                 dto.setStatus(query.getStatus().getName());
                 dto.setGroupNumber(history.getGroupNumber());
                 dto.setExamNumber(student.getExamNumber());
-                dto.setStudentCode(student.getStudentCode());
                 dto.setSecretNumber(student.getSecretNumber());
                 dto.setName(student.getName());
                 dto.setProblemType(problemMap.get(history.getProblemId()).getName());

+ 3 - 2
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/problemHistory.jsp

@@ -55,8 +55,9 @@
         <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_problem_history-batch_reset') && query.status=='WAITING'}">
         <input id="btnRest" class="btn" type="button" value="批量重置" onclick="goRest()"/>
         </c:if>
-
-        <input id="btnExport" class="btn btn-primary" type="button" value="导出" onclick="goExport()"/>
+        <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_problem_history-export')}">
+            <input id="btnExport" class="btn btn-primary" type="button" value="导出" onclick="goExport()"/>
+        </c:if>
     </div>
 </form>
 <tags:message content="${message}"/>