Merge branch 'dev_200331_openapi' of http://git.qmth.com.cn/luoshi/stmms-ft into dev_200331_openapi

 Conflicts:

	stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/MarkerService.java

	stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/MarkerServiceImpl.java

	stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/dao/UserDao.java

	stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/model/User.java

	stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/service/impl/UserServiceImpl.java

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

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

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

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

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

	stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectClassController.java

	stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectCollegeController.java

	stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectController.java

	stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectGroupController.java

	stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectQuestionController.java

	stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectRangeController.java

	stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherClassController.java

	stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherController.java

	stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

	stmms-web/src/main/webapp/WEB-INF/views/modules/user/userEdit.jsp

	stmms-web/src/main/webapp/WEB-INF/views/modules/user/userList.jsp

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/MarkerDao.java

@@ -66,6 +66,12 @@ public interface MarkerDao extends PagingAndSortingRepository<Marker, Integer>,
 
     public List<Marker> findByMode(String common);
 
+    public Marker findByExamIdAndSubjectCodeAndGroupNumberAndUserId(int examId, String subjectCode, Integer number,
+            Integer userId);
+
+    @Query("select count(m) from Marker m where m.userId=?1")
+    public long countByUserId(Integer userId);
+
     // @Query(value =
     // "select m from Marker m, MarkGroup g where m.openAccountId=?1 and m.enable=?2 "
     // +

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/SubjectUserDao.java

@@ -0,0 +1,18 @@
+package cn.com.qmth.stmms.biz.exam.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import cn.com.qmth.stmms.biz.exam.model.SubjectUser;
+
+public interface SubjectUserDao extends PagingAndSortingRepository<SubjectUser, Integer>,
+        JpaSpecificationExecutor<SubjectUser> {
+
+    List<SubjectUser> findByUserId(Integer userId);
+
+    List<SubjectUser> findBySubjectCode(String subjectCode);
+
+    SubjectUser findBySubjectCodeAndUserId(String subjectCode, Integer userId);
+}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/Marker.java

@@ -19,8 +19,6 @@ import cn.com.qmth.stmms.common.enums.MarkMode;
 @Table(name = "eb_marker")
 public class Marker implements Serializable {
 
-    public static final String LOGINNAME_SPLITE = "-";
-
     private static final long serialVersionUID = -5728058071677581938L;
 
     @Id
@@ -38,7 +36,6 @@ public class Marker implements Serializable {
     private Integer groupNumber;
 
     @Column(name = "user_id", nullable = false)
-    @ExcelField(title = "登录名", align = 2, sort = 30)
     private Integer userId;
 
     @Column(name = "enable", nullable = false)
@@ -83,12 +80,16 @@ public class Marker implements Serializable {
     private String subjectName;
 
     @Transient
-    @ExcelField(title = "大题", align = 2, sort = 20)
     private String groupName;
 
     @Transient
+    @ExcelField(title = "分组号", align = 2, sort = 30)
     private int number;
 
+    @Transient
+    @ExcelField(title = "登录名", align = 2, sort = 40)
+    private String loginName;
+
     @Transient
     private ExamSubject subject;
 
@@ -291,4 +292,12 @@ public class Marker implements Serializable {
         this.user = user;
     }
 
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/SubjectUser.java

@@ -0,0 +1,116 @@
+package cn.com.qmth.stmms.biz.exam.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import cn.com.qmth.stmms.biz.user.model.User;
+import cn.com.qmth.stmms.common.annotation.ExcelField;
+
+@Entity
+@Table(name = "eb_subject_user")
+public class SubjectUser implements Serializable {
+
+    private static final long serialVersionUID = -304051934270195206L;
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+
+    @Column(name = "subject_code", nullable = false)
+    @ExcelField(title = "科目代码", align = 2, sort = 20)
+    private String subjectCode;
+
+    @Column(name = "user_id", nullable = false)
+    private Integer userId;
+
+    @Column(name = "enable", nullable = false)
+    private boolean enable;
+
+    @Transient
+    @ExcelField(title = "科目(导入时可为空)", align = 2, sort = 30)
+    private String subjectName;
+
+    @Transient
+    @ExcelField(title = "登录名", align = 2, sort = 40)
+    private String loginName;
+
+    @Transient
+    private ExamSubject subject;
+
+    @Transient
+    private User user;
+
+    public SubjectUser() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getSubjectCode() {
+        return subjectCode;
+    }
+
+    public void setSubjectCode(String subjectCode) {
+        this.subjectCode = subjectCode;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public boolean isEnable() {
+        return enable;
+    }
+
+    public void setEnable(boolean enable) {
+        this.enable = enable;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public ExamSubject getSubject() {
+        return subject;
+    }
+
+    public void setSubject(ExamSubject subject) {
+        this.subject = subject;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/query/ExamStudentSearchQuery.java

@@ -80,6 +80,8 @@ public class ExamStudentSearchQuery extends BaseQuery<ExamStudent> {
 
     private String teacher;
 
+    private String paperType;
+
     public void orderByExamNumber() {
         setSort(new Sort(Direction.ASC, "examNumber"));
     }
@@ -364,4 +366,12 @@ public class ExamStudentSearchQuery extends BaseQuery<ExamStudent> {
         this.teacher = teacher;
     }
 
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/query/MarkerSearchQuery.java

@@ -18,6 +18,8 @@ public class MarkerSearchQuery extends BaseQuery<Marker> {
 
     private Integer userId;
 
+    private String loginName;
+
     public void orderByUserId() {
         setSort(new Sort(Direction.ASC, "userId"));
     }
@@ -66,4 +68,12 @@ public class MarkerSearchQuery extends BaseQuery<Marker> {
         this.userId = userId;
     }
 
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/MarkerService.java

@@ -1,20 +1,26 @@
 package cn.com.qmth.stmms.biz.exam.service;
 
+import java.util.List;
+
+import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
 import cn.com.qmth.stmms.biz.exam.model.Marker;
 import cn.com.qmth.stmms.biz.exam.query.MarkerSearchQuery;
 
-import java.util.List;
-
 public interface MarkerService {
 
     Marker save(Marker marker);
 
     Marker findById(Integer id);
 
+    // Marker findByLoginName(String loginName);
+    //
     List<Marker> findByExamAndSubjectAndGroup(int examId, String subjectCode, int groupNumber);
 
     long countByExam(int examId);
 
+    // int batchCreate(ExamSubject subject, int groupNumber, int count, String
+    // password);
+
     MarkerSearchQuery findByQuery(MarkerSearchQuery query);
 
     List<Marker> getMarkCount(int examId);
@@ -25,8 +31,26 @@ public interface MarkerService {
 
     List<Marker> findMode(String commo);
 
-    int batchSave(List<Marker> list);
+    // public List<Marker> findByStudentId(int studentId);
+
+    public int batchSave(List<Marker> list);
 
     void updateMarkSetting(Integer id, String setting);
 
+    Marker findByExamAndSubjectAndNumberAndUserId(int examId, String subjectCode, Integer number, Integer userId);
+
+    long countByUserId(Integer userId);
+
+    void deleteById(Integer markerId);
+
+    void save(MarkGroup group, Integer[] userIds);
+
+    // void updateOpenAccountById(Integer id, Integer openAccountId);
+
+    // List<Marker> findByOpenAccountAndMarkStatus(Integer openAccountId,
+    // MarkStatus... status);
+
+    // long countByExamAndSubjectAndGroupAndOpenAccount(Integer examId, String
+    // subjectCode, Integer groupNumber,
+    // Integer openAccountId);
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/SubjectUserService.java

@@ -0,0 +1,23 @@
+package cn.com.qmth.stmms.biz.exam.service;
+
+import java.util.List;
+
+import cn.com.qmth.stmms.biz.exam.model.SubjectUser;
+
+public interface SubjectUserService {
+
+    SubjectUser save(SubjectUser u);
+
+    List<SubjectUser> findByUserId(Integer userId);
+
+    List<SubjectUser> findBySubjectCode(String subjectCode);
+
+    int batchSave(List<SubjectUser> saveList);
+
+    SubjectUser findBySubjectCodeAndUserId(String subjectCode, Integer userId);
+
+    SubjectUser findById(Integer id);
+
+    void save(String subjectCode, Integer[] userIds);
+
+}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamStudentServiceImpl.java

@@ -611,6 +611,18 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
                         predicates.add(cb.and(sub));
                     }
                 }
+                if (StringUtils.isNotBlank(query.getPaperType())) {
+                    predicates.add(cb.equal(root.get("paperType"), query.getPaperType()));
+                }
+                if (StringUtils.isNotBlank(query.getCollege())) {
+                    predicates.add(cb.equal(root.get("college"), query.getCollege()));
+                }
+                if (StringUtils.isNotBlank(query.getClassName())) {
+                    predicates.add(cb.equal(root.get("className"), query.getClassName()));
+                }
+                if (StringUtils.isNotBlank(query.getTeacher())) {
+                    predicates.add(cb.equal(root.get("teacher"), query.getTeacher()));
+                }
                 return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
                         .size()]));
             }
@@ -675,7 +687,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
     public ExamStudent randomUnTrialStudent(Integer examId, String subjectCode, Integer groupNumber) {
         ExamStudentSearchQuery query = new ExamStudentSearchQuery();
         query.setPageNumber(1);
-        query.setPageSize(10);
+        query.setPageSize(200);
         query.setSort(new Sort(Direction.ASC, "uploadTime", "id"));
         List<ExamStudent> list = studentDao.findUnTrialStudent(examId, subjectCode, groupNumber, query);
         if (list.isEmpty()) {

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/MarkerServiceImpl.java

@@ -1,12 +1,14 @@
 package cn.com.qmth.stmms.biz.exam.service.impl;
 
-import cn.com.qmth.stmms.biz.common.BaseQueryService;
-import cn.com.qmth.stmms.biz.exam.dao.MarkerDao;
-import cn.com.qmth.stmms.biz.exam.model.Marker;
-import cn.com.qmth.stmms.biz.exam.query.MarkerSearchQuery;
-import cn.com.qmth.stmms.biz.exam.service.MarkerService;
-import cn.com.qmth.stmms.biz.mark.dao.MarkLibraryDao;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -14,12 +16,15 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.LinkedList;
-import java.util.List;
+import cn.com.qmth.stmms.biz.common.BaseQueryService;
+import cn.com.qmth.stmms.biz.exam.dao.MarkerDao;
+import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
+import cn.com.qmth.stmms.biz.exam.model.Marker;
+import cn.com.qmth.stmms.biz.exam.query.MarkerSearchQuery;
+import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
+import cn.com.qmth.stmms.biz.exam.service.MarkerService;
+import cn.com.qmth.stmms.biz.mark.dao.MarkLibraryDao;
+import cn.com.qmth.stmms.common.enums.LibraryStatus;
 
 @Service("markerService")
 public class MarkerServiceImpl extends BaseQueryService<Marker> implements MarkerService {
@@ -30,6 +35,9 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
     @Autowired
     private MarkLibraryDao libraryDao;
 
+    @Autowired
+    private MarkGroupService groupService;
+
     @Transactional
     @Override
     public Marker save(Marker marker) {
@@ -48,11 +56,23 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
         markerDao.updateMarkSettingById(id, setting);
     }
 
+    // @Transactional
+    // @Override
+    // public void updateOpenAccountById(Integer id, Integer accountId) {
+    // markerDao.updateOpenAccountById(id, accountId);
+    // }
+
     @Override
     public Marker findById(Integer id) {
         return markerDao.findOne(id);
     }
 
+    // @Override
+    // public Marker findByLoginName(String loginName) {
+    // List<Marker> list = markerDao.findByLoginName(loginName);
+    // return list != null && list.size() > 0 ? list.get(0) : null;
+    // }
+
     @Override
     public List<Marker> findByExamAndSubjectAndGroup(int examId, String subjectCode, int number) {
         return markerDao.findByExamIdAndSubjectCodeAndGroupNumber(examId, subjectCode, number, null);
@@ -68,6 +88,78 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
         return markerDao.countByExamIdAndSubjectCodeAndGroupNumber(examId, subjectCode, number);
     }
 
+    // @Transactional
+    // @Override
+    // public int batchCreate(ExamSubject subject, int groupNumber, int count,
+    // String password) {
+    // int result = 0;
+    // if (subject != null && count > 0) {
+    // if (groupNumber > 0) {
+    // result = saveMarker(subject, groupNumber, count, password);
+    // } else {
+    // List<MarkGroup> groups =
+    // groupService.findByExamAndSubject(subject.getExamId(),
+    // subject.getCode());
+    // for (MarkGroup markGroup : groups) {
+    // result = result + saveMarker(subject, markGroup.getNumber(), count,
+    // password);
+    // }
+    // }
+    // }
+    // return result;
+    // }
+
+    // private int saveMarker(ExamSubject subject, int groupNumber, int count,
+    // String password) {
+    // int result = 0;
+    // int start = 1;
+    // Marker previous = findLastMarker(subject.getExamId(), subject.getCode());
+    // if (previous != null) {
+    // start = previous.getNumber() + 1;
+    // }
+    // int end = start + count - 1;
+    // for (; start <= end; start++) {
+    // Marker marker = new Marker();
+    // marker.setExamId(subject.getExamId());
+    // marker.setSubjectCode(subject.getCode());
+    // if (StringUtils.isEmpty(password)) {
+    // Random random = new Random();
+    // for (int i = 0; i < 6; i++) {
+    // password += random.nextInt(10);
+    // }
+    // marker.setPassword(password);
+    // password = "";// 随机码生产后将密码置空
+    // } else {
+    // marker.setPassword(password);
+    // }
+    // marker.setEnable(true);
+    // marker.buildLoginName(start);
+    // marker.setLoginName(marker.getLoginName());
+    // marker.setName(marker.getLoginName());
+    // marker.setGroupNumber(groupNumber);
+    // marker.setClassCount(0);
+    // if (save(marker) != null) {
+    // result++;
+    // }
+    // }
+    // return result;
+    // }
+
+    // private Marker findLastMarker(int examId, String subjectCode) {
+    // Marker marker = null;
+    // List<Marker> list = markerDao.findByExamIdAndSubjectCode(examId,
+    // subjectCode, new BaseQuery<Marker>(1, 1,
+    // new Sort(Direction.DESC, "id")));
+    // if (list != null && !list.isEmpty()) {
+    // marker = list.get(0);
+    // }
+    // if (marker != null) {
+    // return Marker.parseLoginName(marker.getLoginName());
+    // } else {
+    // return null;
+    // }
+    // }
+
     @Override
     public List<Marker> getMarkCount(int examId) {
         List<Marker> list = new LinkedList<Marker>();
@@ -88,8 +180,8 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
     @Override
     public List<Marker> getMarkCount(int examId, String subjectCode) {
         List<Marker> list = new LinkedList<Marker>();
-        List<Object[]> result = libraryDao
-                .countMarkerAndStatus(examId, subjectCode, LibraryStatus.MARKED, LibraryStatus.INSPECTED);
+        List<Object[]> result = libraryDao.countMarkerAndStatus(examId, subjectCode, LibraryStatus.MARKED,
+                LibraryStatus.INSPECTED);
         if (result != null) {
             for (Object[] array : result) {
                 try {
@@ -132,9 +224,8 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
                 if (query.getUserId() != null) {
                     predicates.add(cb.equal(root.get("userId"), query.getUserId()));
                 }
-                return predicates.isEmpty() ?
-                        cb.conjunction() :
-                        cb.and(predicates.toArray(new Predicate[predicates.size()]));
+                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
+                        .size()]));
             }
         };
     }
@@ -150,4 +241,57 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
         return markerDao.findByMode(commo);
     }
 
+    @Override
+    public Marker findByExamAndSubjectAndNumberAndUserId(int examId, String subjectCode, Integer number, Integer userId) {
+        return markerDao.findByExamIdAndSubjectCodeAndGroupNumberAndUserId(examId, subjectCode, number, userId);
+    }
+
+    @Override
+    public long countByUserId(Integer userId) {
+        return markerDao.countByUserId(userId);
+    }
+
+    @Transactional
+    @Override
+    public void deleteById(Integer markerId) {
+        markerDao.delete(markerId);
+    }
+
+    @Override
+    public void save(MarkGroup group, Integer[] userIds) {
+        List<Marker> list = new ArrayList<Marker>();
+        if (userIds != null && userIds.length > 0) {
+            for (Integer userId : userIds) {
+                Marker marker = this.findByExamAndSubjectAndNumberAndUserId(group.getExamId(), group.getSubjectCode(),
+                        group.getNumber(), userId);
+                if (marker == null) {
+                    marker = new Marker();
+                    marker.setExamId(group.getExamId());
+                    marker.setSubjectCode(group.getSubjectCode());
+                    marker.setGroupNumber(group.getNumber());
+                    marker.setUserId(userId);
+                    marker.setEnable(true);
+                    list.add(marker);
+                }
+            }
+        }
+        this.batchSave(list);
+    }
+
+    // @Override
+    // public List<Marker> findByOpenAccountAndMarkStatus(Integer accountId,
+    // MarkStatus... status) {
+    // return markerDao.findByOpenAccountIdAndEnableAndMarkStatus(accountId,
+    // true, status);
+    // }
+
+    // @Override
+    // public long countByExamAndSubjectAndGroupAndOpenAccount(Integer examId,
+    // String subjectCode, Integer groupNumber,
+    // Integer openAccountId) {
+    // return
+    // markerDao.countByExamIdAndSubjectCodeAndGroupNumberAndOpenAccountId(examId,
+    // subjectCode, groupNumber,
+    // openAccountId);
+    // }
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/SubjectUserServiceImpl.java

@@ -0,0 +1,72 @@
+package cn.com.qmth.stmms.biz.exam.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import cn.com.qmth.stmms.biz.common.BaseQueryService;
+import cn.com.qmth.stmms.biz.exam.dao.SubjectUserDao;
+import cn.com.qmth.stmms.biz.exam.model.SubjectUser;
+import cn.com.qmth.stmms.biz.exam.service.SubjectUserService;
+
+@Service("subjectUserService")
+public class SubjectUserServiceImpl extends BaseQueryService<SubjectUser> implements SubjectUserService {
+
+    @Autowired
+    private SubjectUserDao subjectUserDao;
+
+    @Transactional
+    @Override
+    public SubjectUser save(SubjectUser u) {
+        return subjectUserDao.save(u);
+    }
+
+    @Override
+    public List<SubjectUser> findByUserId(Integer userId) {
+        return subjectUserDao.findByUserId(userId);
+    }
+
+    @Override
+    public List<SubjectUser> findBySubjectCode(String subjectCode) {
+        return subjectUserDao.findBySubjectCode(subjectCode);
+    }
+
+    @Override
+    public int batchSave(List<SubjectUser> list) {
+        subjectUserDao.save(list);
+        return list.size();
+    }
+
+    @Override
+    public SubjectUser findBySubjectCodeAndUserId(String subjectCode, Integer userId) {
+        return subjectUserDao.findBySubjectCodeAndUserId(subjectCode, userId);
+    }
+
+    @Override
+    public SubjectUser findById(Integer id) {
+        return subjectUserDao.findOne(id);
+    }
+
+    @Override
+    public void save(String subjectCode, Integer[] userIds) {
+        List<SubjectUser> list = new ArrayList<SubjectUser>();
+        if (userIds != null && userIds.length > 0) {
+            for (Integer userId : userIds) {
+                SubjectUser subjectUser = this.findBySubjectCodeAndUserId(subjectCode, userId);
+                if (subjectUser == null) {
+                    subjectUser = new SubjectUser();
+                    subjectUser.setSubjectCode(subjectCode);
+                    subjectUser.setUserId(userId);
+                    subjectUser.setEnable(true);
+                    list.add(subjectUser);
+                }
+            }
+        }
+        subjectUserDao.save(list);
+
+    }
+
+}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/model/User.java

@@ -1,13 +1,19 @@
 package cn.com.qmth.stmms.biz.user.model;
 
-import cn.com.qmth.stmms.common.enums.Role;
-import cn.com.qmth.stmms.common.enums.UserSource;
-import cn.com.qmth.stmms.common.utils.AccessControlUtils;
-
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import cn.com.qmth.stmms.common.enums.Role;
+import cn.com.qmth.stmms.common.utils.AccessControlUtils;
+
 @Entity
 @Table(name = "b_user")
 public class User implements Serializable {

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/service/UserService.java

@@ -24,4 +24,6 @@ public interface UserService {
 
     User findByMarkerId(Integer markerId);
 
+    User findByLoginNameAndSchoolId(String loginName, Integer schoolId);
+
 }

stmms-common/src/main/java/cn/com/qmth/stmms/common/enums/MarkerExcelError.java

@@ -1,17 +1,13 @@
 package cn.com.qmth.stmms.common.enums;
 
 public enum MarkerExcelError {
-     MARKERED("评卷员已存在",0)
-    ,MARKERPWERROR("密码最少4位",1)
-    ,MARKERCODEMISS("课程代码不存在或该课程与原评卷员不匹配",2)
-    ,MARKER("通过",3)
-    ,MARKERNOTINFO("EXCEL为空",4)
-    ,MARKERNEWMISS("新评卷员已存在",5)
-    ,MARKERMISS("原评卷员不存在",6)
-    ,MARKERNOTCODE("课程代码不存在",7)
-    ,MARKERNOTGROUP("大题号不存在",8)
-    ;
+    MARKERNOTCODE("课程代码不存在", 0), 
+    MARKERNAMENULL("用户名为空", 1), 
+    MARKERNAMEUSED("用户名已被其他学校占用", 2), 
+    MARKERNOTGROUP("大题号不存在", 3);
+
     private String name;
+
     private int value;
 
     MarkerExcelError(String name, int value) {

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

@@ -113,13 +113,14 @@ public class AnswerCheckController extends BaseExamController {
     @RequestMapping("/save")
     @ResponseBody
     public Object save(HttpServletRequest request, @RequestParam Integer studentId, @RequestParam String answers,
-            @RequestParam(required = false) Boolean absent) {
+            @RequestParam(required = false) Boolean absent, @RequestParam String paperType) {
         ExamStudent student = studentService.findById(studentId);
         if (student != null) {
             if (absent != null) {
                 student.setAbsent(absent);
             }
             student.setAnswers(answers);
+            student.setPaperType(paperType);
             return saveUploadStudent(student);
         } else {
             return false;

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

@@ -1,5 +1,20 @@
 package cn.com.qmth.stmms.admin.exam;
 
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import cn.com.qmth.stmms.admin.utils.SessionExamUtils;
 import cn.com.qmth.stmms.biz.common.BaseQuery;
 import cn.com.qmth.stmms.biz.exam.model.Exam;
@@ -12,17 +27,6 @@ import cn.com.qmth.stmms.biz.mark.service.MarkLibraryService;
 import cn.com.qmth.stmms.common.controller.BaseController;
 import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.ExamStatus;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.LinkedList;
-import java.util.List;
 
 public class BaseExamController extends BaseController {
 
@@ -39,19 +43,23 @@ public class BaseExamController extends BaseController {
     @Autowired
     private ExamService examService;
 
+    @Autowired
+    private SubjectUserService subjectUserService;
+
     protected int getSessionExamId(HttpServletRequest request) {
         return SessionExamUtils.getExamId(request);
     }
 
     protected boolean isFinish(int examId) {
         Exam exam = examService.findById(examId);
-        return exam != null && exam.getStatus() == ExamStatus.FINISH;
+        return exam != null ? exam.getStatus() == ExamStatus.FINISH : false;
     }
 
     /**
      * 添加Flash消息
-     *
-     * @param messages 消息
+     * 
+     * @param messages
+     *            消息
      */
     protected void addMessage(RedirectAttributes redirectAttributes, String... messages) {
         StringBuilder sb = new StringBuilder();
@@ -66,11 +74,13 @@ public class BaseExamController extends BaseController {
         if (wu.isSchoolAdmin() || wu.isSchoolViewer()) {
             list = subjectService.list(examId);
         } else if (wu.isSubjectHeader()) {
-            //TODO - subjectHeader
-            //            ExamSubject subject = subjectService.find(examId, wu.getUser().getSubjectCode());
-            //            if (subject != null) {
-            //                list.add(subject);
-            //            }
+            List<SubjectUser> subjectUsers = subjectUserService.findByUserId(wu.getId());
+            for (SubjectUser subjectUser : subjectUsers) {
+                ExamSubject subject = subjectService.find(examId, subjectUser.getSubjectCode());
+                if (subject != null) {
+                    list.add(subject);
+                }
+            }
         }
         return list;
     }
@@ -80,11 +90,13 @@ public class BaseExamController extends BaseController {
         if (wu.isSchoolAdmin()) {
             list = subjectService.list(examId, 0);
         } else if (wu.isSubjectHeader()) {
-            //TODO - subjectHeader
-            //            ExamSubject subject = subjectService.find(examId, wu.getUser().getSubjectCode());
-            //            if (subject != null && subject.getUploadCount() > 0) {
-            //                list.add(subject);
-            //            }
+            List<SubjectUser> subjectUsers = subjectUserService.findByUserId(wu.getId());
+            for (SubjectUser subjectUser : subjectUsers) {
+                ExamSubject subject = subjectService.find(examId, subjectUser.getSubjectCode());
+                if (subject != null) {
+                    list.add(subject);
+                }
+            }
         }
         return list;
     }
@@ -108,8 +120,13 @@ public class BaseExamController extends BaseController {
 
     protected boolean subjectCheck(String subjectCode, WebUser wu) {
         if (wu.isSubjectHeader()) {
-            //return subjectCode.equals(wu.getUser().getSubjectCode());
-            return true;
+            List<SubjectUser> list = subjectUserService.findByUserId(wu.getId());
+            for (SubjectUser subjectUser : list) {
+                if (subjectUser.getSubjectCode().equals(subjectCode)) {
+                    return true;
+                }
+            }
+            return false;
         } else {
             return true;
         }

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

@@ -1,5 +1,21 @@
 package cn.com.qmth.stmms.admin.exam;
 
+import java.text.DecimalFormat;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
 import cn.com.qmth.stmms.admin.dto.MarkGroupDTO;
 import cn.com.qmth.stmms.admin.dto.MarkerInfoDTO;
 import cn.com.qmth.stmms.admin.vo.SubjectLibraryVO;
@@ -17,20 +33,6 @@ import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.LogType;
 import cn.com.qmth.stmms.common.utils.ExportExcel;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.text.DecimalFormat;
-import java.util.LinkedList;
-import java.util.List;
 
 @Controller("markInfoController")
 @RequestMapping("/admin/exam/mark")
@@ -55,7 +57,7 @@ public class MarkController extends BaseExamController {
 
     /**
      * 评卷进度
-     *
+     * 
      * @param request
      * @param model
      * @param query
@@ -104,11 +106,10 @@ public class MarkController extends BaseExamController {
                 //wu.isSubjectHeader() ? groupService.findByExamAndSubject(examId, wu.getUser().getSubjectCode()) :
                 groupService.findByExam(examId);
         for (MarkGroup group : list) {
-            group.setMarkerCount(
-                    markerService.countByExamAndSubjectAndGroup(examId, group.getSubjectCode(), group.getNumber()));
-            group.setQuestionList(questionService
-                    .findByExamAndSubjectAndObjectiveAndGroupNumber(examId, group.getSubjectCode(), false,
-                            group.getNumber()));
+            group.setMarkerCount(markerService.countByExamAndSubjectAndGroup(examId, group.getSubjectCode(),
+                    group.getNumber()));
+            group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
+                    group.getSubjectCode(), false, group.getNumber()));
             MarkGroupDTO dto = new MarkGroupDTO(subjectService.find(examId, group.getSubjectCode()), group);
             result.add(dto);
         }
@@ -136,12 +137,11 @@ public class MarkController extends BaseExamController {
                 markerService.getMarkCount(examId);
         for (Marker marker : list) {
             MarkGroup group = groupService.findOne(examId, marker.getSubjectCode(), marker.getGroupNumber());
-            group.setQuestionList(questionService
-                    .findByExamAndSubjectAndObjectiveAndGroupNumber(examId, group.getSubjectCode(), false,
-                            group.getNumber()));
+            group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
+                    group.getSubjectCode(), false, group.getNumber()));
             marker.setUser(userService.findById(marker.getUserId()));
-            MarkerInfoDTO dto = new MarkerInfoDTO(marker,
-                    subjectService.find(marker.getExamId(), marker.getSubjectCode()), group);
+            MarkerInfoDTO dto = new MarkerInfoDTO(marker, subjectService.find(marker.getExamId(),
+                    marker.getSubjectCode()), group);
             result.add(dto);
         }
 

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

@@ -1,25 +1,18 @@
 package cn.com.qmth.stmms.admin.exam;
 
-import cn.com.qmth.stmms.admin.dto.ExamQuestionDTO;
-import cn.com.qmth.stmms.biz.campus.model.Campus;
-import cn.com.qmth.stmms.biz.campus.service.CampusService;
-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.lock.LockService;
-import cn.com.qmth.stmms.biz.mark.model.PictureConfigItem;
-import cn.com.qmth.stmms.biz.mark.service.MarkService;
-import cn.com.qmth.stmms.common.annotation.Logging;
-import cn.com.qmth.stmms.common.annotation.RoleRequire;
-import cn.com.qmth.stmms.common.domain.WebUser;
-import cn.com.qmth.stmms.common.enums.*;
-import cn.com.qmth.stmms.common.utils.PictureUrlBuilder;
-import cn.com.qmth.stmms.common.utils.RequestUtils;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
+
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -34,9 +27,40 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import javax.servlet.http.HttpServletRequest;
-import java.text.DecimalFormat;
-import java.util.*;
+import cn.com.qmth.stmms.admin.dto.ExamQuestionDTO;
+import cn.com.qmth.stmms.biz.campus.model.Campus;
+import cn.com.qmth.stmms.biz.campus.service.CampusService;
+import cn.com.qmth.stmms.biz.exam.model.Exam;
+import cn.com.qmth.stmms.biz.exam.model.ExamQuestion;
+import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
+import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
+import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
+import cn.com.qmth.stmms.biz.exam.query.ExamStudentSearchQuery;
+import cn.com.qmth.stmms.biz.exam.service.ExamQuestionService;
+import cn.com.qmth.stmms.biz.exam.service.ExamService;
+import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
+import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
+import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
+import cn.com.qmth.stmms.biz.exam.service.MarkerService;
+import cn.com.qmth.stmms.biz.lock.LockService;
+import cn.com.qmth.stmms.biz.mark.model.PictureConfigItem;
+import cn.com.qmth.stmms.biz.mark.service.MarkService;
+import cn.com.qmth.stmms.common.annotation.Logging;
+import cn.com.qmth.stmms.common.annotation.RoleRequire;
+import cn.com.qmth.stmms.common.domain.WebUser;
+import cn.com.qmth.stmms.common.enums.ExamType;
+import cn.com.qmth.stmms.common.enums.LockType;
+import cn.com.qmth.stmms.common.enums.LogType;
+import cn.com.qmth.stmms.common.enums.MarkMode;
+import cn.com.qmth.stmms.common.enums.MarkStatus;
+import cn.com.qmth.stmms.common.enums.Role;
+import cn.com.qmth.stmms.common.enums.ScorePolicy;
+import cn.com.qmth.stmms.common.enums.ThirdPolicy;
+import cn.com.qmth.stmms.common.utils.PictureUrlBuilder;
+import cn.com.qmth.stmms.common.utils.RequestUtils;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Controller("markGroupController")
 @RequestMapping("/admin/exam/group")
@@ -91,12 +115,12 @@ public class MarkGroupController extends BaseExamController {
         }
         List<MarkGroup> list = groupService.findByExamAndSubject(examId, subjectCode);
         for (MarkGroup group : list) {
-            group.setQuestionList(questionService
-                    .findByExamAndSubjectAndObjectiveAndGroupNumber(examId, subjectCode, false, group.getNumber()));
+            group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId, subjectCode,
+                    false, group.getNumber()));
             group.setMarkerCount(markerService.countByExamAndSubjectAndGroup(examId, subjectCode, group.getNumber()));
             group.setCurrentCount(markService.applyCount(group));
-            int percent =
-                    group.getLibraryCount() > 0 ? (int) (group.getMarkedCount() * 100.00 / group.getLibraryCount()) : 0;
+            int percent = group.getLibraryCount() > 0 ? (int) (group.getMarkedCount() * 100.00 / group
+                    .getLibraryCount()) : 0;
             group.setPercent(percent);
         }
         model.addAttribute("resultList", list);
@@ -113,14 +137,13 @@ public class MarkGroupController extends BaseExamController {
             @RequestParam(required = false) Boolean withDouble, @RequestParam(required = false) MarkStatus status) {
         int examId = getSessionExamId(request);
         JSONArray array = new JSONArray();
-        List<MarkGroup> list = withDouble != null && withDouble ?
-                groupService.findByExamAndSubjectWithDouble(examId, subjectCode) :
-                (status != null ?
-                        groupService.findByExamAndSubjectAndStatus(examId, subjectCode, status) :
-                        groupService.findByExamAndSubject(examId, subjectCode));
+        List<MarkGroup> list = withDouble != null && withDouble ? groupService.findByExamAndSubjectWithDouble(examId,
+                subjectCode) : (status != null ? groupService
+                .findByExamAndSubjectAndStatus(examId, subjectCode, status) : groupService.findByExamAndSubject(examId,
+                subjectCode));
         for (MarkGroup group : list) {
-            group.setQuestionList(questionService
-                    .findByExamAndSubjectAndObjectiveAndGroupNumber(examId, subjectCode, false, group.getNumber()));
+            group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId, subjectCode,
+                    false, group.getNumber()));
             JSONObject obj = new JSONObject();
             obj.accumulate("number", group.getNumber());
             obj.accumulate("title", group.getTitle());
@@ -257,12 +280,13 @@ public class MarkGroupController extends BaseExamController {
         if (group != null) {
             String pictureConfig = buildPictureConfig(group);
             group.setPicList(pictureConfig);
-            group.setQuestionList(questionService
-                    .findByExamAndSubjectAndObjectiveAndGroupNumber(examId, subjectCode, false, group.getNumber()));
+            group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId, subjectCode,
+                    false, group.getNumber()));
             model.addAttribute("group", group);
-            model.addAttribute("questions", questionService
-                    .findByExamAndSubjectAndObjectiveAndGroupNumber(group.getExamId(), group.getSubjectCode(), false,
-                            group.getNumber()));
+            model.addAttribute(
+                    "questions",
+                    questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(group.getExamId(),
+                            group.getSubjectCode(), false, group.getNumber()));
             model.addAttribute("pictureConfig", pictureConfig);
             model.addAttribute("markModeList", MarkMode.values());
             model.addAttribute("scorePolicyList", ScorePolicy.values());
@@ -285,14 +309,13 @@ public class MarkGroupController extends BaseExamController {
         if (group != null) {
             String pictureConfig = buildPictureConfig(group);
             group.setPicList(pictureConfig);
-            group.setQuestionList(
-                    questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId, subjectCode, false, number));
+            group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId, subjectCode,
+                    false, number));
             List<MarkGroup> questionList = new ArrayList<MarkGroup>();
             String[] mainNumbers = group.getMainNumber().split(",");
             for (String mainNumber : mainNumbers) {
-                List<ExamQuestion> list = questionService
-                        .findByExamAndSubjectAndObjectiveAndMainNumber(examId, subjectCode, false,
-                                Integer.parseInt(mainNumber));
+                List<ExamQuestion> list = questionService.findByExamAndSubjectAndObjectiveAndMainNumber(examId,
+                        subjectCode, false, Integer.parseInt(mainNumber));
                 StringBuilder score = new StringBuilder();
                 DecimalFormat format = new DecimalFormat("####.###");
                 String title = "";
@@ -362,8 +385,7 @@ public class MarkGroupController extends BaseExamController {
             @RequestParam(required = false) Double arbitrateThreshold,
             @RequestParam(required = false) Integer thirdPolicy, @RequestParam(required = false) Integer scorePolicy,
             @RequestParam(required = false) MarkMode markMode, @RequestParam(required = false) Integer trialCount,
-            @RequestParam boolean sheetView, @RequestParam boolean enableAllZero,
-            @RequestParam(required = false) String questionDetail,
+            @RequestParam(required = false) boolean sheetView, @RequestParam(required = false) String questionDetail,
             @RequestParam(required = false) String intervalScoreList) {
         int examId = getSessionExamId(request);
         MarkGroup group = groupService.findOne(examId, subjectCode, number);
@@ -374,10 +396,10 @@ public class MarkGroupController extends BaseExamController {
                     questionDetail = StringEscapeUtils.unescapeHtml(questionDetail);
                     JSONArray array = JSONArray.fromObject(questionDetail);
                     List<ExamQuestionDTO> detailList = JSONArray.toList(array, new ExamQuestionDTO(), new JsonConfig());
-                    List<ExamQuestion> all = questionService
-                            .findByExamAndSubjectAndObjective(examId, subjectCode, false);
-                    List<ExamQuestion> old = questionService
-                            .findByExamAndSubjectAndObjectiveAndGroupNumber(examId, subjectCode, false, number);
+                    List<ExamQuestion> all = questionService.findByExamAndSubjectAndObjective(examId, subjectCode,
+                            false);
+                    List<ExamQuestion> old = questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
+                            subjectCode, false, number);
                     Set<Integer> mainNumbers = new HashSet<Integer>();
                     for (ExamQuestion examQuestion : all) {
                         mainNumbers.add(examQuestion.getMainNumber());
@@ -402,8 +424,8 @@ public class MarkGroupController extends BaseExamController {
                     }
                     if (detailList != null && detailList.size() > 0) {
                         ScorePolicy policy = scorePolicy != null ? ScorePolicy.findByValue(scorePolicy) : null;
-                        ThirdPolicy third =
-                                thirdPolicy != null ? ThirdPolicy.findByValue(thirdPolicy) : ThirdPolicy.DISABLE;
+                        ThirdPolicy third = thirdPolicy != null ? ThirdPolicy.findByValue(thirdPolicy)
+                                : ThirdPolicy.DISABLE;
                         try {
                             lockService.waitlock(LockType.GROUP, true, group.getExamId(), group.getSubjectCode(),
                                     group.getNumber());
@@ -419,8 +441,8 @@ public class MarkGroupController extends BaseExamController {
                 } else {
                     // simple update
                     List<Double> intervalScores = buildDoubleList(intervalScoreList);
-                    List<ExamQuestion> questionList = questionService
-                            .findByExamAndSubjectAndObjectiveAndGroupNumber(examId, subjectCode, false, number);
+                    List<ExamQuestion> questionList = questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(
+                            examId, subjectCode, false, number);
                     if (intervalScores.size() == questionList.size()) {
                         for (int i = 0; i < questionList.size(); i++) {
                             ExamQuestion q = questionList.get(i);
@@ -447,7 +469,6 @@ public class MarkGroupController extends BaseExamController {
                     groupService.updateTrialCount(examId, subjectCode, number, trialCount);
                 }
                 groupService.updateSheetView(examId, subjectCode, number, sheetView);
-                groupService.updateEnableAllZero(examId, subjectCode, number, enableAllZero);
                 redirectAttributes.addAttribute("subjectCode", subjectCode);
                 redirectAttributes.addAttribute("number", number);
                 return "redirect:/admin/exam/group";
@@ -477,8 +498,8 @@ public class MarkGroupController extends BaseExamController {
             @RequestParam String picList, @RequestParam(required = false) Double doubleRate,
             @RequestParam(required = false) Double arbitrateThreshold,
             @RequestParam(required = false) Integer thirdPolicy, @RequestParam(required = false) Integer scorePolicy,
-            @RequestParam(required = false) String markMode, @RequestParam Integer trialCount,
-            @RequestParam boolean sheetView, @RequestParam boolean enableAllZero) {
+            @RequestParam(required = false) String markMode, @RequestParam(required = false) Integer trialCount,
+            @RequestParam(required = false) boolean sheetView) {
         int examId = getSessionExamId(request);
         Exam exam = examService.findById(examId);
         MarkGroup group = groupService.findOne(examId, subjectCode, number);
@@ -527,16 +548,15 @@ public class MarkGroupController extends BaseExamController {
                         }
                     }
                     group = new MarkGroup(examId, subjectCode, number, picConfigList, 0d, doubleRate,
-                            arbitrateThreshold, scorePolicy, markMode, trialCount, sheetView, enableAllZero,
-                            thirdPolicy);
+                            arbitrateThreshold, scorePolicy, markMode, trialCount, sheetView, thirdPolicy);
                     // clear and replace exam_question
                     questionService
                             .deleteByExamAndSubjectAndObjectiveAndGroupNumber(examId, subjectCode, false, number);
                     List<ExamQuestion> list = buildQuestionList(group, detailList);
                     questionService.save(list);
                     groupService.save(group);
-                    subjectService
-                            .updateScore(examId, subjectCode, false, groupService.sumTotalScore(examId, subjectCode));
+                    subjectService.updateScore(examId, subjectCode, false,
+                            groupService.sumTotalScore(examId, subjectCode));
                     redirectAttributes.addAttribute("subjectCode", subjectCode);
                     return "redirect:/admin/exam/group";
                 } else {
@@ -594,9 +614,8 @@ public class MarkGroupController extends BaseExamController {
 
     private List<String> buildPicUrl(ExamStudent examStudent) {
         Campus campus = campusService.findBySchoolAndName(examStudent.getSchoolId(), examStudent.getCampusName());
-        List<String> picUrls = PictureUrlBuilder
-                .getSliceUrls(examStudent.getExamId(), campus.getId(), examStudent.getSubjectCode(),
-                        examStudent.getExamNumber(), examStudent.getSliceCount());
+        List<String> picUrls = PictureUrlBuilder.getSliceUrls(examStudent.getExamId(), campus.getId(),
+                examStudent.getSubjectCode(), examStudent.getExamNumber(), examStudent.getSliceCount());
         return picUrls;
     }
 

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

@@ -1,41 +1,63 @@
 package cn.com.qmth.stmms.admin.exam;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
 import cn.com.qmth.stmms.biz.exam.model.Exam;
 import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
 import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
 import cn.com.qmth.stmms.biz.exam.model.Marker;
 import cn.com.qmth.stmms.biz.exam.query.MarkerSearchQuery;
-import cn.com.qmth.stmms.biz.exam.service.*;
+import cn.com.qmth.stmms.biz.exam.service.ExamQuestionService;
+import cn.com.qmth.stmms.biz.exam.service.ExamService;
+import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
+import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
+import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
+import cn.com.qmth.stmms.biz.exam.service.MarkerClassService;
+import cn.com.qmth.stmms.biz.exam.service.MarkerService;
 import cn.com.qmth.stmms.biz.lock.LockService;
+import cn.com.qmth.stmms.biz.mark.service.MarkLibraryService;
 import cn.com.qmth.stmms.biz.mark.service.MarkService;
 import cn.com.qmth.stmms.biz.user.model.User;
 import cn.com.qmth.stmms.biz.user.service.UserService;
+import cn.com.qmth.stmms.biz.user.service.query.UserSearchQuery;
+import cn.com.qmth.stmms.common.annotation.Logging;
 import cn.com.qmth.stmms.common.annotation.RoleRequire;
 import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.LockType;
+import cn.com.qmth.stmms.common.enums.LogType;
 import cn.com.qmth.stmms.common.enums.MarkerExcelError;
 import cn.com.qmth.stmms.common.enums.Role;
 import cn.com.qmth.stmms.common.utils.ExportExcel;
 import cn.com.qmth.stmms.common.utils.ImportExcel;
+import cn.com.qmth.stmms.common.utils.Md5EncryptUtils;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
-import com.google.common.collect.Lists;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import com.google.common.collect.Lists;
 
 @Controller("examMarkerController")
 @RequestMapping("/admin/exam/marker")
@@ -43,6 +65,8 @@ public class MarkerController extends BaseExamController {
 
     protected static Logger log = LoggerFactory.getLogger(MarkerController.class);
 
+    public static final String USER_PASSWORD = "123456";
+
     @Autowired
     private UserService userService;
 
@@ -73,9 +97,10 @@ public class MarkerController extends BaseExamController {
     @Autowired
     private ExamQuestionService questionService;
 
-    @Value("${marker.showBtnImportAndBtnUpdateImport}")
-    private String showBtnImport;
+    @Autowired
+    private MarkLibraryService libraryService;
 
+    @Logging(menu = "评卷员查询", type = LogType.QUERY)
     @RequestMapping
     public String list(Model model, HttpServletRequest request, MarkerSearchQuery query) {
         WebUser wu = RequestUtils.getWebUser(request);
@@ -83,13 +108,16 @@ public class MarkerController extends BaseExamController {
         query.setExamId(examId);
         query.orderById();
         subjectFilter(query, wu);
+        if (StringUtils.isNotBlank(query.getLoginName())) {
+            User user = userService.findByLoginNameAndSchoolId(query.getLoginName(), wu.getUser().getSchoolId());
+            query.setUserId(user == null ? null : user.getId());
+        }
         query = markerService.findByQuery(query);
         for (Marker marker : query.getResult()) {
             marker.setSubject(subjectService.find(marker.getExamId(), marker.getSubjectCode()));
             MarkGroup group = groupService.findOne(examId, marker.getSubjectCode(), marker.getGroupNumber());
-            group.setQuestionList(questionService
-                    .findByExamAndSubjectAndObjectiveAndGroupNumber(examId, marker.getSubjectCode(), false,
-                            group.getNumber()));
+            group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
+                    marker.getSubjectCode(), false, group.getNumber()));
             marker.setGroup(group);
             marker.setMarkedCount(markService.markedCount(marker));
             marker.setCurrentCount(markService.applyCount(marker));
@@ -97,7 +125,6 @@ public class MarkerController extends BaseExamController {
         }
         model.addAttribute("query", query);
         model.addAttribute("subjectList", getExamSubject(examId, wu));
-        model.addAttribute("showBtnImport", showBtnImport);
         return "modules/exam/markerList";
     }
 
@@ -109,16 +136,17 @@ public class MarkerController extends BaseExamController {
         JSONArray array = new JSONArray();
         List<Marker> list = markerService.findByExamAndSubjectAndGroup(examId, subjectCode, groupNumber);
         for (Marker marker : list) {
-            User user = userService.findById(marker.getUserId());
             JSONObject obj = new JSONObject();
             obj.accumulate("id", marker.getId());
-            obj.accumulate("loginName", user.getAccount());
+            User user = userService.findById(marker.getUserId());
+            obj.accumulate("loginName", user.getLoginName());
             obj.accumulate("name", user.getName());
             array.add(obj);
         }
         return array;
     }
 
+    @Logging(menu = "评卷员回收任务", type = LogType.UPDATE)
     @RequestMapping("/release")
     @ResponseBody
     @RoleRequire(Role.SCHOOL_ADMIN)
@@ -142,67 +170,48 @@ public class MarkerController extends BaseExamController {
         return result;
     }
 
-    @RequestMapping("/batch-create")
-    @RoleRequire(Role.SCHOOL_ADMIN)
-    public String createInit(Model model, HttpServletRequest request,
-            @RequestParam(required = false) String subjectCode, @RequestParam(required = false) Integer groupNumber) {
-        int examId = getSessionExamId(request);
-        model.addAttribute("subjectList", getExamSubject(examId, RequestUtils.getWebUser(request)));
-        if (subjectCode != null) {
-            model.addAttribute("subjectCode", subjectCode);
-            model.addAttribute("groupList", groupService.findByExamAndSubject(examId, subjectCode));
-            if (groupNumber != null) {
-                model.addAttribute("groupNumber", groupNumber);
-            }
-        } else {
-            model.addAttribute("groupList", new ArrayList<MarkGroup>());
-        }
-        return "modules/exam/markerCreate";
-    }
-
-    @RequestMapping(value = "/batch-create", method = RequestMethod.POST)
-    @RoleRequire(Role.SCHOOL_ADMIN)
-    public ModelAndView create(HttpServletRequest request, @RequestParam String subjectCode,
-            @RequestParam Integer groupNumber, @RequestParam Integer count,
-            @RequestParam(required = false) String password) {
-        int examId = getSessionExamId(request);
-        ExamSubject subject = subjectService.find(examId, subjectCode);
-        ModelAndView view = new ModelAndView("redirect:/admin/exam/marker");
-        if (subject != null && count > 0) {
-            markerService.batchCreate(subject, groupNumber, count, password);
-        }
-        view.addObject("subjectCode", subjectCode);
-        if (groupNumber > 0) {
-            view.addObject("groupNumber", groupNumber);
-        }
-        return view;
-    }
-
-    @RequestMapping(value = "/reset")
-    @RoleRequire(Role.SCHOOL_ADMIN)
-    public String resetMarker(@RequestParam Integer id, Model model, RedirectAttributes redirectAttributes) {
-        Marker marker = markerService.findById(id);
-        if (marker != null) {
-            try {
-                lockService
-                        .waitlock(LockType.GROUP, marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
-                lockService.waitlock(LockType.MARKER, marker.getId());
-
-                markService.resetMarker(marker);
-            } catch (Exception e) {
-                log.error("reset marker error", e);
-                throw new RuntimeException("重置评卷员失败", e);
-            } finally {
-                lockService.unlock(LockType.MARKER, marker.getId());
-                lockService
-                        .unlock(LockType.GROUP, marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
-            }
-        }
-        redirectAttributes.addAttribute("subjectCode", marker.getSubjectCode());
-        redirectAttributes.addAttribute("groupNumber", marker.getGroupNumber());
-        return "redirect:/admin/exam/marker";
-    }
-
+    // @RequestMapping("/batch-create")
+    // @RoleRequire(Role.SCHOOL_ADMIN)
+    // public String createInit(Model model, HttpServletRequest request,
+    // @RequestParam(required = false) String subjectCode,
+    // @RequestParam(required = false) Integer groupNumber) {
+    // int examId = getSessionExamId(request);
+    // model.addAttribute("subjectList", getExamSubject(examId,
+    // RequestUtils.getWebUser(request)));
+    // if (subjectCode != null) {
+    // model.addAttribute("subjectCode", subjectCode);
+    // model.addAttribute("groupList", groupService.findByExamAndSubject(examId,
+    // subjectCode));
+    // if (groupNumber != null) {
+    // model.addAttribute("groupNumber", groupNumber);
+    // }
+    // } else {
+    // model.addAttribute("groupList", new ArrayList<MarkGroup>());
+    // }
+    // return "modules/exam/markerCreate";
+    // }
+
+    // @Logging(menu = "创建评卷员", type = LogType.ADD)
+    // @RequestMapping(value = "/batch-create", method = RequestMethod.POST)
+    // @RoleRequire(Role.SCHOOL_ADMIN)
+    // public ModelAndView create(HttpServletRequest request, @RequestParam
+    // String subjectCode,
+    // @RequestParam Integer groupNumber, @RequestParam Integer count,
+    // @RequestParam(required = false) String password) {
+    // int examId = getSessionExamId(request);
+    // ExamSubject subject = subjectService.find(examId, subjectCode);
+    // ModelAndView view = new ModelAndView("redirect:/admin/exam/marker");
+    // if (subject != null && count > 0) {
+    // // markerService.batchCreate(subject, groupNumber, count, password);
+    // }
+    // view.addObject("subjectCode", subjectCode);
+    // if (groupNumber > 0) {
+    // view.addObject("groupNumber", groupNumber);
+    // }
+    // return view;
+    // }
+
+    @Logging(menu = "评卷员重置", type = LogType.UPDATE)
     @RequestMapping(value = "/reset", method = RequestMethod.POST)
     @ResponseBody
     @RoleRequire(Role.SCHOOL_ADMIN)
@@ -211,8 +220,8 @@ public class MarkerController extends BaseExamController {
         JSONObject obj = new JSONObject();
         if (marker != null) {
             try {
-                lockService
-                        .waitlock(LockType.GROUP, marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
+                lockService.waitlock(LockType.GROUP, marker.getExamId(), marker.getSubjectCode(),
+                        marker.getGroupNumber());
                 lockService.waitlock(LockType.MARKER, marker.getId());
 
                 markService.resetMarker(marker);
@@ -233,6 +242,7 @@ public class MarkerController extends BaseExamController {
         return obj;
     }
 
+    @Logging(menu = "评卷员禁用/启用", type = LogType.UPDATE)
     @RequestMapping(value = "/toggle", method = RequestMethod.POST)
     @ResponseBody
     @RoleRequire(Role.SCHOOL_ADMIN)
@@ -250,45 +260,69 @@ public class MarkerController extends BaseExamController {
         return obj;
     }
 
-    @RequestMapping(value = "/export", method = RequestMethod.POST)
-    public String exportFile(MarkerSearchQuery query, HttpServletRequest request, HttpServletResponse response,
-            RedirectAttributes redirectAttributes) {
-        WebUser wu = RequestUtils.getWebUser(request);
-        int examId = getSessionExamId(request);
-        query.setExamId(examId);
-        try {
-            query.setPageNumber(1);
-            query.setPageSize(Integer.MAX_VALUE);
-            query.setExamId(examId);
-            query.orderById();
-            subjectFilter(query, wu);
-            String fileName = "评卷员账号.xlsx";
-            query = markerService.findByQuery(query);
-            for (Marker marker : query.getResult()) {
-                ExamSubject subject = subjectService.find(examId, marker.getSubjectCode());
-                if (subject != null) {
-                    marker.setSubjectName(subject.getCode() + "-" + subject.getName());
-                } else {
-                    marker.setSubjectName("");
-                }
-                MarkGroup group = groupService.findOne(examId, marker.getSubjectCode(), marker.getGroupNumber());
-                if (group != null) {
-                    group.setQuestionList(questionService
-                            .findByExamAndSubjectAndObjectiveAndGroupNumber(examId, group.getSubjectCode(), false,
-                                    group.getNumber()));
-                    marker.setGroupName(group.getNumber() + "-" + group.getTitle());
-                } else {
-                    marker.setGroupName("");
-                }
-            }
-            new ExportExcel("评卷员数据", Marker.class).setDataList(query.getResult()).write(response, fileName).dispose();
-            return null;
-        } catch (Exception e) {
-            addMessage(redirectAttributes, "导出评卷员失败！" + e.getMessage());
+    // @Logging(menu = "评卷员导出", type = LogType.EXPORT)
+    // @RequestMapping(value = "/export", method = RequestMethod.POST)
+    // public String exportFile(MarkerSearchQuery query, HttpServletRequest
+    // request, HttpServletResponse response,
+    // RedirectAttributes redirectAttributes) {
+    // WebUser wu = RequestUtils.getWebUser(request);
+    // int examId = getSessionExamId(request);
+    // query.setExamId(examId);
+    // try {
+    // query.setPageNumber(1);
+    // query.setPageSize(Integer.MAX_VALUE);
+    // query.setExamId(examId);
+    // query.orderById();
+    // subjectFilter(query, wu);
+    // String fileName = "评卷员账号.xlsx";
+    // query = markerService.findByQuery(query);
+    // for (Marker marker : query.getResult()) {
+    // ExamSubject subject = subjectService.find(examId,
+    // marker.getSubjectCode());
+    // if (subject != null) {
+    // marker.setSubjectName(subject.getCode() + "-" + subject.getName());
+    // } else {
+    // marker.setSubjectName("");
+    // }
+    // MarkGroup group = groupService.findOne(examId, marker.getSubjectCode(),
+    // marker.getGroupNumber());
+    // if (group != null) {
+    // group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
+    // group.getSubjectCode(), false, group.getNumber()));
+    // marker.setGroupName(group.getNumber() + "-" + group.getTitle());
+    // } else {
+    // marker.setGroupName("");
+    // }
+    // }
+    // new ExportExcel("评卷员数据",
+    // Marker.class).setDataList(query.getResult()).write(response,
+    // fileName).dispose();
+    // return null;
+    // } catch (Exception e) {
+    // addMessage(redirectAttributes, "导出评卷员失败！" + e.getMessage());
+    // }
+    // return "redirect:/admin/exam/marker?repage";
+    // }
+
+    @Logging(menu = "评卷员重置密码", type = LogType.UPDATE)
+    @RequestMapping(value = "/reSetPassword", method = RequestMethod.POST)
+    @ResponseBody
+    public JSONObject reSetPassword(@RequestParam Integer id, @RequestParam String password) {
+        Marker marker = markerService.findById(id);
+        User user = userService.findById(marker.getUserId());
+        JSONObject obj = new JSONObject();
+        if (user != null) {
+            user.setPassword(Md5EncryptUtils.md5(password));
+            user = userService.save(user);
+            obj.accumulate("success", true);
+        } else {
+            obj.accumulate("success", false);
+            obj.accumulate("message", "该评卷员不存在");
         }
-        return "redirect:/admin/exam/marker?repage";
+        return obj;
     }
 
+    @Logging(menu = "评卷员设置任务数量", type = LogType.UPDATE)
     @RequestMapping(value = "/setTaskCount", method = RequestMethod.POST)
     @ResponseBody
     public JSONObject setTaskCount(@RequestParam Integer id, @RequestParam Integer taskCount) {
@@ -319,68 +353,77 @@ public class MarkerController extends BaseExamController {
         return "redirect:" + "/admin/exam/marker";
     }
 
-    @RequestMapping(value = "/updateLoginNameTemplate")
-    public String updateLoginNameTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
-        try {
-            String fileName = "评卷员账号修改导入模板.xlsx";
-            List<MarkerDTO> list = Lists.newArrayList();
-            list.add(new MarkerDTO());
-            new ExportExcel("评卷员账号修改数据", MarkerDTO.class, 2).setDataList(list).write(response, fileName).dispose();
-            return null;
-        } catch (Exception e) {
-            addMessage(redirectAttributes, "导入模板下载失败！失败信息：" + e.getMessage());
-        }
-        return "redirect:" + "/admin/exam/marker";
-    }
-
+    @Logging(menu = "评卷员导入", type = LogType.IMPORT_FILE)
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     public String importFile(HttpServletRequest request, MultipartFile file, RedirectAttributes redirectAttributes,
             @RequestParam String subjectCode) {
         int examId = getSessionExamId(request);
+        WebUser wu = RequestUtils.getWebUser(request);
+        Integer schoolId = wu.getUser().getSchoolId();
         try {
             int successNum = 0;
             int failureNum = 0;
             StringBuilder failureMsg = new StringBuilder();
             ImportExcel ei = new ImportExcel(file, 1, 0);
             List<Marker> list = ei.getDataList(Marker.class);
-            List<Marker> saveList = new LinkedList<Marker>();
-            Map<String, Marker> saveMap = new HashMap<String, Marker>();
-            Map<String, ExamSubject> current = null;
-            current = new HashMap<String, ExamSubject>();
-            List<ExamSubject> list2 = subjectService.list(examId);
-            for (ExamSubject s : list2) {
-                current.put(s.getCode(), s);
-            }
+
+            Map<String, User> userMap = new HashMap<String, User>();
+            Map<String, ExamSubject> subjectMap = new HashMap<String, ExamSubject>();
+            Map<String, MarkGroup> groupMap = new HashMap<String, MarkGroup>();
+            List<Marker> saveList = new ArrayList<Marker>();
+
             for (Marker marker : list) {
-                String password = "";
-                if (StringUtils.isBlank(marker.getSubjectCode()) || StringUtils.isBlank(marker.getLoginName())) {
+                if (StringUtils.isBlank(marker.getLoginName())) {
+                    failureMsg.append("<br/>评卷员 " + marker.getLoginName() + "," + marker.getSubjectCode()
+                            + MarkerExcelError.MARKERNAMENULL.getName());
+                    failureNum++;
                     continue;
                 }
-                marker.setExamId(examId);
-                marker.setName(marker.getLoginName());
-                marker.setEnable(true);
-                marker.setClassCount(0);
-                if (StringUtils.isBlank(marker.getPassword())) {
-                    Random random = new Random();
-                    for (int i = 0; i < 6; i++) {
-                        password += random.nextInt(10);
+                ExamSubject examSubject = subjectMap.get(marker.getSubjectCode());
+                if (examSubject == null) {
+                    examSubject = subjectService.find(examId, marker.getSubjectCode());
+                    if (examSubject == null) {
+                        failureMsg.append("<br/>评卷员 " + marker.getLoginName() + "," + marker.getSubjectCode()
+                                + MarkerExcelError.MARKERNOTCODE.getName());
+                        failureNum++;
+                        continue;
                     }
-                    marker.setPassword(password);
                 }
-                MarkerExcelError markerExcelError = checkLongNameAndPassword(marker, current, saveMap);
-                if (markerExcelError.equals(MarkerExcelError.MARKER)) {
-                    saveList.add(marker);
-                    saveMap.put(marker.getLoginName(), marker);
-                } else {
-                    failureMsg.append("<br/>评卷员 " + marker.getLoginName() + "," + markerExcelError.getName());
-                    failureNum++;
+                MarkGroup markGroup = groupMap.get(marker.getSubjectCode() + "-" + marker.getNumber());
+                if (markGroup == null) {
+                    markGroup = groupService.findOne(examId, marker.getSubjectCode(), marker.getNumber());
+                    if (markGroup == null) {
+                        failureMsg.append("<br/>评卷员 " + marker.getLoginName() + "," + marker.getSubjectCode() + ","
+                                + marker.getNumber() + MarkerExcelError.MARKERNOTGROUP.getName());
+                        failureNum++;
+                        continue;
+                    }
+                }
+                User user = userMap.get(marker.getLoginName().trim());
+                if (user == null) {
+                    user = userService.findByLoginName(marker.getLoginName().trim());
+                    if (user != null && !schoolId.equals(user.getSchoolId())) {
+                        failureMsg.append("<br/>评卷员 " + marker.getLoginName() + "," + marker.getSubjectCode()
+                                + MarkerExcelError.MARKERNAMEUSED.getName());
+                        failureNum++;
+                        continue;
+                    }
+                    if (user == null) {
+                        user = getUser(userMap, marker.getLoginName().trim(), schoolId);
+                    }
                 }
+                subjectMap.put(examSubject.getCode(), examSubject);
+                groupMap.put(markGroup.getSubjectCode() + "-" + markGroup.getNumber(), markGroup);
+                marker = getMarker(examId, examSubject.getCode(), markGroup.getNumber(), user.getId());
+                saveList.add(marker);
             }
             successNum = markerService.batchSave(saveList);
             if (failureNum > 0) {
                 failureMsg.insert(0, "，失败 " + failureNum + " 条记录！");
             }
-            addMessage(redirectAttributes, "已成功导入 " + successNum + " 条评卷员" + failureMsg);
+            String message = "已成功导入 " + successNum + " 条评卷员 ";
+            addMessage(redirectAttributes, message + failureMsg);
+            RequestUtils.setLog(request, message);
         } catch (Exception e) {
             log.error("Batch import marker error!", e);
             addMessage(redirectAttributes, "导入评卷员失败！失败信息：" + e.getMessage());
@@ -388,122 +431,85 @@ public class MarkerController extends BaseExamController {
         return "redirect:" + "/admin/exam/marker?subjectCode=" + subjectCode;
     }
 
-    @RequestMapping(value = "/importUpdate", method = RequestMethod.POST)
-    public String importUpdateFile(HttpServletRequest request, MultipartFile file,
-            RedirectAttributes redirectAttributes) {
-        try {
-            int successNum = 0;
-            int failureNum = 0;
-            StringBuilder failureMsg = new StringBuilder();
-            ImportExcel ei = new ImportExcel(file, 1, 0);
-            List<MarkerDTO> list = ei.getDataList(MarkerDTO.class);
-            List<Marker> saveList = new LinkedList<Marker>();
-            Map<String, Marker> current = null;
-            List<Marker> list2 = markerService.findMode("common");
-            if (list2.size() < 10000) {
-                current = new HashMap<String, Marker>();
-                for (Marker s : list2) {
-                    current.put(s.getLoginName(), s);
-                }
-            }
-            for (MarkerDTO markerDTO : list) {
-                if (StringUtils.isBlank(markerDTO.getSubjectCode()) || StringUtils.isBlank(markerDTO.getLoginName())
-                        || StringUtils.isBlank(markerDTO.getNewLoginName()) || StringUtils
-                        .isBlank(markerDTO.getPassword())) {
-                    continue;
-                }
-                MarkerExcelError markerExcelError = checkExcelData(markerDTO, current);
-                if (markerExcelError.equals(MarkerExcelError.MARKER)) {
-                    Marker marker = null;
-                    if (current != null) {
-                        marker = current.get(markerDTO.getLoginName());
-                    } else {
-                        marker = markerService.findByLoginName(markerDTO.getLoginName());
-                    }
-                    marker.setLoginName(markerDTO.getNewLoginName());
-                    marker.setPassword(markerDTO.getPassword());
-                    saveList.add(marker);
-                } else {
-                    failureMsg.append("<br/>科目代码(" + markerDTO.getSubjectCode() + ")原评卷员(" + markerDTO.getLoginName()
-                            + ")更换新评卷员为(" + markerDTO.getNewLoginName() + ")失败!");
-                    failureMsg.append("---->失败原因：(" + markerExcelError.getName() + ")");
-                    failureNum++;
-                }
-            }
-            successNum = markerService.batchSave(saveList);
-            if (failureNum > 0) {
-                failureMsg.insert(0, "，失败 " + failureNum + " 条记录！");
-            }
-            addMessage(redirectAttributes, "已成功导入 " + successNum + " 条" + failureMsg);
-        } catch (Exception e) {
-            log.error("Batch import marker error!", e);
-            addMessage(redirectAttributes, "导入修改评卷员账号失败！失败信息：" + e.getMessage());
+    private Marker getMarker(int examId, String subjectCode, Integer number, Integer userId) {
+        Marker marker = markerService.findByExamAndSubjectAndNumberAndUserId(examId, subjectCode, number, userId);
+        if (marker == null) {
+            marker = new Marker();
+            marker.setExamId(examId);
+            marker.setSubjectCode(subjectCode);
+            marker.setUserId(userId);
+            marker.setEnable(true);
         }
-        return "redirect:" + "/admin/exam/marker";
+        return marker;
     }
 
-    private MarkerExcelError checkLongNameAndPassword(Marker marker, Map<String, ExamSubject> current,
-            Map<String, Marker> saveMap) {
-        Marker previous = null;
-
-        if (current != null && current.get(marker.getSubjectCode()) == null) {
-            return MarkerExcelError.MARKERNOTCODE;
-        }
-        MarkGroup group = groupService
-                .findOne(marker.getExamId(), marker.getSubjectCode(), Integer.valueOf(marker.getGroupName()));
-        if (group == null) {
-            return MarkerExcelError.MARKERNOTGROUP;
-        } else {
-            marker.setGroupNumber(Integer.valueOf(marker.getGroupName()));
-        }
-        if (saveMap != null) {
-            previous = saveMap.get(marker.getLoginName());
-        }
-
-        if (previous != null) {
-            return MarkerExcelError.MARKERED;
+    private User getUser(Map<String, User> saveMap, String loginName, Integer schoolId) {
+        User user = saveMap.get(loginName);
+        if (user == null) {
+            user = new User();
+            user.setLoginName(loginName);
+            user.setName(loginName);
+            user.setPassword(Md5EncryptUtils.md5(USER_PASSWORD));
+            user.setRole(Role.MARKER);
+            user.setSchoolId(schoolId);
+            user.setEnable(true);
+            user.setCreatedTime(new Date());
+            userService.save(user);
+            saveMap.put(loginName, user);
         }
+        return user;
+    }
 
-        previous = markerService.findByLoginName(marker.getLoginName());
-
-        if (marker.getPassword().length() > 0 && marker.getPassword().length() < 4) {
-            return MarkerExcelError.MARKERPWERROR;
+    @RequestMapping("/save")
+    public String add(Model model, HttpServletRequest request, UserSearchQuery query, @RequestParam String subjectCode) {
+        int examId = getSessionExamId(request);
+        if (examId > 0) {
+            Exam exam = examService.findById(examId);
+            query.setSchoolId(exam.getSchoolId());
+            query.setRole(Role.MARKER);
+            query = userService.findByQuery(query);
+            model.addAttribute("query", query);
+            model.addAttribute("subject", subjectService.find(examId, subjectCode));
+            return "modules/exam/markerSubject";
+        } else {
+            return "redirect:/admin/exam/list";
         }
+    }
 
-        if (previous == null) {
-            return MarkerExcelError.MARKER;
+    @Logging(menu = "评卷员绑定", type = LogType.ADD)
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public String save(@RequestParam String subjectCode, @RequestParam Integer groupNumber,
+            @RequestParam Integer[] userIds, HttpServletRequest request, RedirectAttributes redirectAttributes) {
+        int examId = getSessionExamId(request);
+        if (examId > 0) {
+            MarkGroup group = groupService.findOne(examId, subjectCode, groupNumber);
+            if (group != null) {
+                markerService.save(group, userIds);
+                addMessage(redirectAttributes, subjectCode + "设置成功");
+                return "redirect:/admin/exam/marker?subjectCode=" + subjectCode + "&groupNumber=" + groupNumber;
+            }
+            addMessage(redirectAttributes, "科目不存在");
+            return "redirect:/admin/exam/marker";
+        } else {
+            return "redirect:/admin/exam/list";
         }
-        return MarkerExcelError.MARKERED;
     }
 
-    // 校验excel中数据
-    public MarkerExcelError checkExcelData(MarkerDTO markerDTO, Map<String, Marker> current) {
-        if (markerDTO != null) {
-            Marker marker = null;
-            if (current == null) {
-                marker = markerService.findByLoginName(markerDTO.getLoginName());
-            } else {
-                marker = current.get(markerDTO.getLoginName());
-            }
-            if (markerDTO.getPassword().length() < 4) {
-                return MarkerExcelError.MARKERPWERROR;
-            }
-            if (marker != null) {
-                if (marker.getSubjectCode().equals(markerDTO.getSubjectCode())) {
-                    if (markerService.countByLoginName(markerDTO.getNewLoginName()) > 0) {
-                        return MarkerExcelError.MARKERNEWMISS;
-                    } else {
-                        return MarkerExcelError.MARKER;
-                    }
-                } else {
-                    return MarkerExcelError.MARKERCODEMISS;
-                }
-            } else {
-                return MarkerExcelError.MARKERMISS;
-            }
+    @RequestMapping("/delete")
+    public String delete(@RequestParam Integer markerId, RedirectAttributes redirectAttributes) {
+        Marker marker = markerService.findById(markerId);
+        if (marker == null) {
+            return "redirect:/admin/exam/marker";
+        }
+        long count = libraryService.countByMarker(markerId);
+        String subjectCode = marker.getSubjectCode();
+        Integer groupNumber = marker.getGroupNumber();
+        if (count > 0) {
+            addMessage(redirectAttributes, "删除评卷员失败，该评卷员已开始评卷");
         } else {
-            return MarkerExcelError.MARKERNOTINFO;
+            markerService.deleteById(markerId);
         }
+        return "redirect:/admin/exam/marker?subjectCode=" + subjectCode + "&groupNumber=" + groupNumber;
     }
 
     @RequestMapping(value = "/class/{markerId}", method = RequestMethod.GET)
@@ -522,61 +528,67 @@ public class MarkerController extends BaseExamController {
         return "redirect:/admin/exam/marker";
     }
 
+    @Logging(menu = "评卷员班级绑定", type = LogType.UPDATE)
     @RequestMapping(value = "/class/{markerId}", method = RequestMethod.POST)
     public String classSave(@PathVariable Integer markerId, @RequestParam(required = false) String[] classes,
             Model model, RedirectAttributes redirectAttributes) {
         Marker marker = markerService.findById(markerId);
         if (marker != null) {
             classService.save(marker, classes);
-            addMessage(redirectAttributes, "保存'" + marker.getLoginName() + "'成功");
-            return "redirect:" + "/admin/exam/marker?subjectCode=" + marker.getSubjectCode() + "&groupNumber=" + marker
-                    .getGroupNumber();
-        }
-        addMessage(redirectAttributes, "评卷员不存在");
-        return "redirect:/admin/exam/marker";
-    }
-
-    @RequestMapping(value = "/account/{markerId}")
-    public String editAccount(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
-            @PathVariable Integer markerId) {
-        Exam exam = examService.findById(getSessionExamId(request));
-        Marker marker = markerService.findById(markerId);
-        if (exam != null && marker != null && exam.getId().equals(marker.getExamId())) {
-            model.addAttribute("marker", marker);
-            model.addAttribute("openAccountList", userService
-                    .listUnbindOpenAccount(exam.getSchoolId(), marker.getExamId(), marker.getSubjectCode(),
-                            marker.getGroupNumber()));
-            return "modules/exam/markerAccount";
+            addMessage(redirectAttributes, "保存成功");
+            return "redirect:" + "/admin/exam/marker?subjectCode=" + marker.getSubjectCode() + "&groupNumber="
+                    + marker.getGroupNumber();
         }
         addMessage(redirectAttributes, "评卷员不存在");
         return "redirect:/admin/exam/marker";
     }
 
-    @RequestMapping(value = "/account/bind", method = RequestMethod.POST)
-    @ResponseBody
-    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
-    public boolean bindAccount(@RequestParam Integer markerId, @RequestParam Integer accountId) {
-        Marker marker = markerService.findById(markerId);
-        if (marker == null) {
-            return false;
-        }
-        OpenAccount oa = userService.findOpenAccount(accountId);
-        if (oa == null || !oa.isEnable()) {
-            return false;
-        }
-        if (markerService.countByExamAndSubjectAndGroupAndOpenAccount(marker.getExamId(), marker.getSubjectCode(),
-                marker.getGroupNumber(), accountId) == 0) {
-            markerService.updateOpenAccountById(markerId, accountId);
-            return true;
-        }
-        return false;
-    }
-
-    @RequestMapping(value = "/account/unbind", method = RequestMethod.POST)
-    @ResponseBody
-    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
-    public boolean unbindOpenAccount(@RequestParam Integer markerId) {
-        markerService.updateOpenAccountById(markerId, null);
-        return true;
-    }
+    // @RequestMapping(value = "/account/{markerId}")
+    // public String editAccount(HttpServletRequest request, Model model,
+    // RedirectAttributes redirectAttributes,
+    // @PathVariable Integer markerId) {
+    // Exam exam = examService.findById(getSessionExamId(request));
+    // Marker marker = markerService.findById(markerId);
+    // if (exam != null && marker != null &&
+    // exam.getId().equals(marker.getExamId())) {
+    // model.addAttribute("marker", marker);
+    // model.addAttribute("openAccountList",
+    // userService.listUnbindOpenAccount(exam.getSchoolId(),
+    // marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber()));
+    // return "modules/exam/markerAccount";
+    // }
+    // addMessage(redirectAttributes, "评卷员不存在");
+    // return "redirect:/admin/exam/marker";
+    // }
+
+    // @RequestMapping(value = "/account/bind", method = RequestMethod.POST)
+    // @ResponseBody
+    // @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
+    // public boolean bindAccount(@RequestParam Integer markerId, @RequestParam
+    // Integer accountId) {
+    // Marker marker = markerService.findById(markerId);
+    // if (marker == null) {
+    // return false;
+    // }
+    // OpenAccount oa = userService.findOpenAccount(accountId);
+    // if (oa == null || !oa.isEnable()) {
+    // return false;
+    // }
+    // if
+    // (markerService.countByExamAndSubjectAndGroupAndOpenAccount(marker.getExamId(),
+    // marker.getSubjectCode(),
+    // marker.getGroupNumber(), accountId) == 0) {
+    // markerService.updateOpenAccountById(markerId, accountId);
+    // return true;
+    // }
+    // return false;
+    // }
+
+    // @RequestMapping(value = "/account/unbind", method = RequestMethod.POST)
+    // @ResponseBody
+    // @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
+    // public boolean unbindOpenAccount(@RequestParam Integer markerId) {
+    // markerService.updateOpenAccountById(markerId, null);
+    // return true;
+    // }
 }

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

@@ -1,5 +1,32 @@
 package cn.com.qmth.stmms.admin.exam;
 
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
 import cn.com.qmth.stmms.admin.dto.ObjectiveQuestionDTO;
 import cn.com.qmth.stmms.admin.dto.QuestionDTO;
 import cn.com.qmth.stmms.admin.dto.SubjectQuestionDTO;
@@ -23,26 +50,6 @@ import cn.com.qmth.stmms.common.enums.Role;
 import cn.com.qmth.stmms.common.utils.ExportExcel;
 import cn.com.qmth.stmms.common.utils.ImportExcel;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 
 @Controller("examPaperController")
 @RequestMapping("/admin/exam/paper")
@@ -164,10 +171,9 @@ public class PaperController extends BaseExamController {
         query.setPageSize(Integer.MAX_VALUE);
         query = questionService.findByQuery(query);
         for (ExamQuestion q : query.getResult()) {
-            list.add(objective ?
-                    new ObjectiveQuestionDTO(q, subjectMap.get(q.getSubjectCode())) :
-                    new SubjectiveQuestionDTO(q, subjectMap.get(q.getSubjectCode()),
-                            groupMap.get(q.getSubjectCode() + "_" + q.getGroupNumber())));
+            list.add(objective ? new ObjectiveQuestionDTO(q, subjectMap.get(q.getSubjectCode()))
+                    : new SubjectiveQuestionDTO(q, subjectMap.get(q.getSubjectCode()), groupMap.get(q.getSubjectCode()
+                            + "_" + q.getGroupNumber())));
         }
         try {
             String fileName = objective ? "客观题数据.xlsx" : "主观题数据.xlsx";

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectClassController.java

@@ -1,14 +1,12 @@
 package cn.com.qmth.stmms.admin.report;
 
-import cn.com.qmth.stmms.admin.exam.BaseExamController;
-import cn.com.qmth.stmms.biz.report.model.ReportSubjectClass;
-import cn.com.qmth.stmms.biz.report.query.ReportSubjectQuery;
-import cn.com.qmth.stmms.biz.report.service.ReportSubjectClassService;
-import cn.com.qmth.stmms.common.annotation.Logging;
-import cn.com.qmth.stmms.common.domain.WebUser;
-import cn.com.qmth.stmms.common.enums.LogType;
-import cn.com.qmth.stmms.common.utils.ExportExcel;
-import cn.com.qmth.stmms.common.utils.RequestUtils;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,11 +16,15 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.List;
+import cn.com.qmth.stmms.admin.exam.BaseExamController;
+import cn.com.qmth.stmms.biz.report.model.ReportSubjectClass;
+import cn.com.qmth.stmms.biz.report.query.ReportSubjectQuery;
+import cn.com.qmth.stmms.biz.report.service.ReportSubjectClassService;
+import cn.com.qmth.stmms.common.annotation.Logging;
+import cn.com.qmth.stmms.common.domain.WebUser;
+import cn.com.qmth.stmms.common.enums.LogType;
+import cn.com.qmth.stmms.common.utils.ExportExcel;
+import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 /**
  * 课程班级成绩分析

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectCollegeController.java

@@ -1,14 +1,12 @@
 package cn.com.qmth.stmms.admin.report;
 
-import cn.com.qmth.stmms.admin.exam.BaseExamController;
-import cn.com.qmth.stmms.biz.report.model.ReportSubjectCollege;
-import cn.com.qmth.stmms.biz.report.query.ReportSubjectQuery;
-import cn.com.qmth.stmms.biz.report.service.ReportSubjectCollegeService;
-import cn.com.qmth.stmms.common.annotation.Logging;
-import cn.com.qmth.stmms.common.domain.WebUser;
-import cn.com.qmth.stmms.common.enums.LogType;
-import cn.com.qmth.stmms.common.utils.ExportExcel;
-import cn.com.qmth.stmms.common.utils.RequestUtils;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,11 +16,15 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.List;
+import cn.com.qmth.stmms.admin.exam.BaseExamController;
+import cn.com.qmth.stmms.biz.report.model.ReportSubjectCollege;
+import cn.com.qmth.stmms.biz.report.query.ReportSubjectQuery;
+import cn.com.qmth.stmms.biz.report.service.ReportSubjectCollegeService;
+import cn.com.qmth.stmms.common.annotation.Logging;
+import cn.com.qmth.stmms.common.domain.WebUser;
+import cn.com.qmth.stmms.common.enums.LogType;
+import cn.com.qmth.stmms.common.utils.ExportExcel;
+import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 /**
  * 课程学院成绩分析

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectController.java

@@ -1,5 +1,20 @@
 package cn.com.qmth.stmms.admin.report;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
 import cn.com.qmth.stmms.admin.exam.BaseExamController;
 import cn.com.qmth.stmms.biz.report.model.ReportSubject;
 import cn.com.qmth.stmms.biz.report.query.ReportSubjectQuery;
@@ -9,19 +24,6 @@ import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.LogType;
 import cn.com.qmth.stmms.common.utils.ExportExcel;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.List;
 
 /**
  * 课程总量统计

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectGroupController.java

@@ -1,5 +1,21 @@
 package cn.com.qmth.stmms.admin.report;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
 import cn.com.qmth.stmms.admin.exam.BaseExamController;
 import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
 import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
@@ -11,20 +27,6 @@ import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.LogType;
 import cn.com.qmth.stmms.common.utils.ExportExcel;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.List;
 
 /**
  * 大题统计分析

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectQuestionController.java

@@ -1,5 +1,21 @@
 package cn.com.qmth.stmms.admin.report;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
 import cn.com.qmth.stmms.admin.exam.BaseExamController;
 import cn.com.qmth.stmms.biz.exam.service.ExamQuestionService;
 import cn.com.qmth.stmms.biz.report.model.ReportSubjectQuestion;
@@ -10,20 +26,6 @@ import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.LogType;
 import cn.com.qmth.stmms.common.utils.ExportExcel;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.List;
 
 /**
  * 客、主观题 成绩分析
@@ -87,8 +89,8 @@ public class ReportSubjectQuestionController extends BaseExamController {
         }
         String fileName = query.getObjective() ? "客观题统计分析.xlsx" : "主观题统计分析.xlsx";
         try {
-            new ExportExcel(query.getObjective() ? "客观题统计分析" : "主观题统计分析", ReportSubjectQuestion.class).setDataList(list)
-                    .write(response, fileName).dispose();
+            new ExportExcel(query.getObjective() ? "客观题统计分析" : "主观题统计分析", ReportSubjectQuestion.class)
+                    .setDataList(list).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {
             addMessage(redirectAttributes, "导出成绩失败！" + e.getMessage());

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectRangeController.java

@@ -1,5 +1,20 @@
 package cn.com.qmth.stmms.admin.report;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
 import cn.com.qmth.stmms.admin.exam.BaseExamController;
 import cn.com.qmth.stmms.biz.report.model.ReportSubjectRange;
 import cn.com.qmth.stmms.biz.report.query.ReportSubjectRangeQuery;
@@ -9,19 +24,6 @@ import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.LogType;
 import cn.com.qmth.stmms.common.utils.ExportExcel;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.List;
 
 /**
  * 课程分段统计
@@ -75,20 +77,15 @@ public class ReportSubjectRangeController extends BaseExamController {
         List<ReportSubjectRange> list = query.getResult();
         for (ReportSubjectRange r : list) {
             r.setPercent0_49(new BigDecimal(r.getPercent0_49() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent50_59(
-                    new BigDecimal(r.getPercent50_59() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent60_69(
-                    new BigDecimal(r.getPercent60_69() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent70_79(
-                    new BigDecimal(r.getPercent70_79() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent80_89(
-                    new BigDecimal(r.getPercent80_89() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent90_100(
-                    new BigDecimal(r.getPercent90_100() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent_lt60(
-                    new BigDecimal(r.getPercent_lt60() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent_mte60(
-                    new BigDecimal(r.getPercent_mte60() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent50_59(new BigDecimal(r.getPercent50_59() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent60_69(new BigDecimal(r.getPercent60_69() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent70_79(new BigDecimal(r.getPercent70_79() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent80_89(new BigDecimal(r.getPercent80_89() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent90_100(new BigDecimal(r.getPercent90_100() * 100).setScale(2, RoundingMode.HALF_UP)
+                    .doubleValue());
+            r.setPercent_lt60(new BigDecimal(r.getPercent_lt60() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent_mte60(new BigDecimal(r.getPercent_mte60() * 100).setScale(2, RoundingMode.HALF_UP)
+                    .doubleValue());
         }
         String fileName = "课程分段统计.xlsx";
         try {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherClassController.java

@@ -1,5 +1,21 @@
 package cn.com.qmth.stmms.admin.report;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
 import cn.com.qmth.stmms.admin.exam.BaseExamController;
 import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
 import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
@@ -11,20 +27,6 @@ import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.LogType;
 import cn.com.qmth.stmms.common.utils.ExportExcel;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.List;
 
 /**
  * 课程老师班级 成绩分析
@@ -87,8 +89,8 @@ public class ReportSubjectTeacherClassController extends BaseExamController {
             r.setAvgScore(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setExcellentRate(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setPassRate(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setRelativeAvgScore(
-                    new BigDecimal(r.getRelativeAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setRelativeAvgScore(new BigDecimal(r.getRelativeAvgScore()).setScale(2, RoundingMode.HALF_UP)
+                    .doubleValue());
         }
         String fileName = "课程老师班级成绩分析.xlsx";
         try {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherController.java

@@ -1,14 +1,12 @@
 package cn.com.qmth.stmms.admin.report;
 
-import cn.com.qmth.stmms.admin.exam.BaseExamController;
-import cn.com.qmth.stmms.biz.report.model.ReportSubjectTeacher;
-import cn.com.qmth.stmms.biz.report.query.ReportSubjectQuery;
-import cn.com.qmth.stmms.biz.report.service.ReportSubjectTeacherService;
-import cn.com.qmth.stmms.common.annotation.Logging;
-import cn.com.qmth.stmms.common.domain.WebUser;
-import cn.com.qmth.stmms.common.enums.LogType;
-import cn.com.qmth.stmms.common.utils.ExportExcel;
-import cn.com.qmth.stmms.common.utils.RequestUtils;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,11 +16,15 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.List;
+import cn.com.qmth.stmms.admin.exam.BaseExamController;
+import cn.com.qmth.stmms.biz.report.model.ReportSubjectTeacher;
+import cn.com.qmth.stmms.biz.report.query.ReportSubjectQuery;
+import cn.com.qmth.stmms.biz.report.service.ReportSubjectTeacherService;
+import cn.com.qmth.stmms.common.annotation.Logging;
+import cn.com.qmth.stmms.common.domain.WebUser;
+import cn.com.qmth.stmms.common.enums.LogType;
+import cn.com.qmth.stmms.common.utils.ExportExcel;
+import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 /**
  * 课程老师成绩分析
@@ -78,8 +80,8 @@ public class ReportSubjectTeacherController extends BaseExamController {
             r.setAvgScore(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setExcellentRate(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setPassRate(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setRelativeAvgScore(
-                    new BigDecimal(r.getRelativeAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setRelativeAvgScore(new BigDecimal(r.getRelativeAvgScore()).setScale(2, RoundingMode.HALF_UP)
+                    .doubleValue());
         }
         String fileName = "课程老师成绩分析.xlsx";
         try {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/SubjectUserController.java

@@ -0,0 +1,218 @@
+package cn.com.qmth.stmms.admin.user;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.json.JSONObject;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import cn.com.qmth.stmms.admin.exam.BaseExamController;
+import cn.com.qmth.stmms.biz.exam.model.Exam;
+import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
+import cn.com.qmth.stmms.biz.exam.model.Marker;
+import cn.com.qmth.stmms.biz.exam.model.SubjectUser;
+import cn.com.qmth.stmms.biz.exam.service.ExamService;
+import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
+import cn.com.qmth.stmms.biz.exam.service.SubjectUserService;
+import cn.com.qmth.stmms.biz.user.model.User;
+import cn.com.qmth.stmms.biz.user.service.UserService;
+import cn.com.qmth.stmms.biz.user.service.query.UserSearchQuery;
+import cn.com.qmth.stmms.common.annotation.Logging;
+import cn.com.qmth.stmms.common.annotation.RoleRequire;
+import cn.com.qmth.stmms.common.domain.WebUser;
+import cn.com.qmth.stmms.common.enums.LogType;
+import cn.com.qmth.stmms.common.enums.MarkerExcelError;
+import cn.com.qmth.stmms.common.enums.Role;
+import cn.com.qmth.stmms.common.utils.ExportExcel;
+import cn.com.qmth.stmms.common.utils.ImportExcel;
+import cn.com.qmth.stmms.common.utils.Md5EncryptUtils;
+import cn.com.qmth.stmms.common.utils.RequestUtils;
+
+@Controller
+@RequestMapping("/admin/user/subject")
+public class SubjectUserController extends BaseExamController {
+
+    public static final String USER_PASSWORD = "123456";
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private SubjectUserService subjectUserService;
+
+    @Autowired
+    private ExamSubjectService subjectService;
+
+    @Autowired
+    private ExamService examService;
+
+    @RequestMapping(value = "/template")
+    public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+        try {
+            String fileName = "科组长数据导入模板.xlsx";
+            List<SubjectUser> list = new ArrayList<SubjectUser>();
+            list.add(new SubjectUser());
+            new ExportExcel("科组长数据", Marker.class, 2).setDataList(list).write(response, fileName).dispose();
+            return null;
+        } catch (Exception e) {
+            addMessage(redirectAttributes, "导入模板下载失败！失败信息：" + e.getMessage());
+        }
+        return "redirect:" + "/admin/exam/marker";
+    }
+
+    @RequestMapping(value = "/import", method = RequestMethod.POST)
+    public String importFile(HttpServletRequest request, MultipartFile file, RedirectAttributes redirectAttributes) {
+        WebUser wu = RequestUtils.getWebUser(request);
+        try {
+            int successNum = 0;
+            int failureNum = 0;
+            StringBuilder failureMsg = new StringBuilder();
+            ImportExcel ei = new ImportExcel(file, 1, 0);
+            List<SubjectUser> list = ei.getDataList(SubjectUser.class);
+
+            Map<String, User> userMap = new HashMap<String, User>();
+            Map<String, ExamSubject> subjectMap = new HashMap<String, ExamSubject>();
+            List<SubjectUser> saveList = new ArrayList<SubjectUser>();
+            Integer schoolId = wu.getUser().getSchoolId();
+            for (SubjectUser subjectUser : list) {
+                if (StringUtils.isBlank(subjectUser.getLoginName())) {
+                    failureMsg.append("<br/>科组长 " + subjectUser.getLoginName() + "," + subjectUser.getSubjectCode()
+                            + MarkerExcelError.MARKERNAMENULL.getName());
+                    failureNum++;
+                    continue;
+                }
+                // ExamSubject examSubject =
+                // subjectMap.get(subjectUser.getSubjectCode());
+                // if (examSubject == null) {
+                // examSubject = subjectService.find(examId,
+                // subjectUser.getSubjectCode());
+                // if (examSubject == null) {
+                // failureMsg.append("<br/>科组长 " + subjectUser.getLoginName() +
+                // "," + subjectUser.getSubjectCode()
+                // + MarkerExcelError.MARKERNOTCODE.getName());
+                // failureNum++;
+                // continue;
+                // }
+                // }
+                User user = userMap.get(subjectUser.getLoginName().trim());
+                if (user == null) {
+                    user = userService.findByLoginName(subjectUser.getLoginName().trim());
+                    if (user != null && !schoolId.equals(user.getSchoolId())) {
+                        failureMsg.append("<br/>评卷员 " + subjectUser.getLoginName() + "," + subjectUser.getSubjectCode()
+                                + MarkerExcelError.MARKERNAMEUSED.getName());
+                        failureNum++;
+                        continue;
+                    }
+                    if (user == null) {
+                        user = getUser(userMap, subjectUser.getLoginName().trim(), schoolId);
+                    }
+                }
+                // subjectMap.put(examSubject.getCode(), examSubject);
+                subjectUser = getSubjectUser(subjectUser.getSubjectCode(), user.getId());
+                saveList.add(subjectUser);
+            }
+            successNum = subjectUserService.batchSave(saveList);
+            if (failureNum > 0) {
+                failureMsg.insert(0, "，失败 " + failureNum + " 条记录！");
+            }
+            addMessage(redirectAttributes, "已成功导入 " + subjectMap.size() + " 条科目，绑定 " + successNum + " 条评卷员 "
+                    + failureMsg);
+        } catch (Exception e) {
+            log.error("Batch import marker error!", e);
+            addMessage(redirectAttributes, "导入评卷员失败！失败信息：" + e.getMessage());
+        }
+        return "redirect:" + "/admin/exam-param/marker";
+    }
+
+    private SubjectUser getSubjectUser(String subjectCode, Integer userId) {
+        SubjectUser subjectUser = subjectUserService.findBySubjectCodeAndUserId(subjectCode, userId);
+        if (subjectUser == null) {
+            subjectUser = new SubjectUser();
+            subjectUser.setSubjectCode(subjectCode);
+            subjectUser.setUserId(userId);
+            subjectUser.setEnable(true);
+        }
+        return subjectUser;
+    }
+
+    private User getUser(Map<String, User> saveMap, String loginName, Integer schoolId) {
+        User user = saveMap.get(loginName);
+        if (user == null) {
+            user = new User();
+            user.setLoginName(loginName);
+            user.setName(loginName);
+            user.setPassword(Md5EncryptUtils.md5(USER_PASSWORD));
+            user.setRole(Role.SUBJECT_HEADER);
+            user.setSchoolId(schoolId);
+            user.setEnable(true);
+            user.setCreatedTime(new Date());
+            userService.save(user);
+            saveMap.put(loginName, user);
+        }
+        return user;
+    }
+
+    @Logging(menu = "评卷员禁用/启用", type = LogType.UPDATE)
+    @RequestMapping(value = "/toggle", method = RequestMethod.POST)
+    @ResponseBody
+    @RoleRequire(Role.SCHOOL_ADMIN)
+    public JSONObject toggle(@RequestParam Integer id, @RequestParam Boolean enable) {
+        SubjectUser subjectUser = subjectUserService.findById(id);
+        JSONObject obj = new JSONObject();
+        if (subjectUser != null) {
+            subjectUser.setEnable(enable);
+            subjectUserService.save(subjectUser);
+            obj.accumulate("success", true);
+        } else {
+            obj.accumulate("success", false);
+            obj.accumulate("message", "该评卷员不存在");
+        }
+        return obj;
+    }
+
+    @Logging(menu = "科组长绑定", type = LogType.ADD)
+    @RequestMapping("/save")
+    public String add(Model model, HttpServletRequest request, UserSearchQuery query, @RequestParam String subjectCode) {
+        int examId = getSessionExamId(request);
+        if (examId > 0) {
+            Exam exam = examService.findById(examId);
+            query.setSchoolId(exam.getSchoolId());
+            query.setRole(Role.SUBJECT_HEADER);
+            query = userService.findByQuery(query);
+            model.addAttribute("query", query);
+            model.addAttribute("subject", subjectService.find(examId, subjectCode));
+            return "modules/exam/userSubject";
+        } else {
+            return "redirect:/admin/exam/list";
+        }
+    }
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public String save(@RequestParam String subjectCode, @RequestParam Integer[] userIds, HttpServletRequest request,
+            RedirectAttributes redirectAttributes) {
+        int examId = getSessionExamId(request);
+        if (examId > 0) {
+            subjectUserService.save(subjectCode, userIds);
+            addMessage(redirectAttributes, subjectCode + "设置成功");
+            return "redirect:/admin/user/subject?subjectCode=" + subjectCode;
+        } else {
+            return "redirect:/admin/exam/list";
+        }
+    }
+}

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -1,5 +1,19 @@
 package cn.com.qmth.stmms.admin.user;
 
+import java.util.Date;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
 import cn.com.qmth.stmms.biz.user.model.User;
 import cn.com.qmth.stmms.biz.user.service.UserService;
 import cn.com.qmth.stmms.biz.user.service.query.UserSearchQuery;
@@ -8,20 +22,8 @@ import cn.com.qmth.stmms.common.annotation.RoleRequire;
 import cn.com.qmth.stmms.common.controller.BaseController;
 import cn.com.qmth.stmms.common.enums.LogType;
 import cn.com.qmth.stmms.common.enums.Role;
-import cn.com.qmth.stmms.common.enums.UserSource;
 import cn.com.qmth.stmms.common.utils.Md5EncryptUtils;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 
 @Controller
 @RequestMapping("/admin/user")

stmms-web/src/main/java/cn/com/qmth/stmms/card/CardController.java → stmms-web/src/main/java/cn/com/qmth/stmms/student/StudentScoreController.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.stmms.card;
+package cn.com.qmth.stmms.student;
 
 import java.util.List;
 
@@ -19,11 +19,11 @@ import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
 import cn.com.qmth.stmms.biz.school.model.School;
 import cn.com.qmth.stmms.biz.school.service.SchoolService;
 
-@Controller("cardApiController")
-@RequestMapping("/card")
-public class CardController {
+@Controller("studentScoreController")
+@RequestMapping("/student")
+public class StudentScoreController {
 
-    protected static Logger log = LoggerFactory.getLogger(CardController.class);
+    protected static Logger log = LoggerFactory.getLogger(StudentScoreController.class);
 
     @Autowired
     private SchoolService schoolService;

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

@@ -86,6 +86,12 @@
                 </select>
                 <input id="subjectiveScoreInput" class="input-large"/>
             </div>
+        </div>
+		<div class="control-group">
+            <label class="control-label">试卷类型</label>
+            <div class="controls">
+                <input id="paperType" name="paperType" class="input-large" maxlength="1"/>
+            </div>
         </div>
         <div class="control-group">
             <label class="control-label">查询结果</label>
@@ -106,6 +112,16 @@ $('#count-button').click(function(){
     check('campusName');
     check('objectiveScore');
     check('subjectiveScore');
+    var paperType = $('#paperType').val();
+    if(paperType.length>1){
+    	return;
+    }
+    var re = new RegExp("^[a-zA-Z#]+$"); 
+    if(paperType.length!=0 && !re.test(paperType)){
+    	alert("试卷类型仅支持英文或#!");
+    	return;
+    }
+    
     
     //alert($("#searchForm").serialize());
     $.post('${ctx}/admin/exam/check/answer/count', $("#searchForm").serialize(), function(result){

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

@@ -50,6 +50,10 @@
                                 <label>
                                 <span class="radio"><input type="button" class="absent-select" data-absent="false"></span><span>否</span>
                                 </label>
+                                <span class="b">试卷类型：</span>
+                                <label>
+                                <input id="paperType" name="paperType" class="input-large" maxlength="1"/>
+                                </label>
                             </div>
                             <div id="answer-content">
                             </div>
@@ -168,6 +172,7 @@ function render(){
     }else{
         $('.absent-select[data-absent="false"]').addClass('on');
     }
+    $('.form-t').find('input').on('input', onPaperTypeInput);
     
     var count = {};
     for(var i=0;i<student.answers.length;i++){
@@ -265,5 +270,18 @@ function onAnswerInput(){
     }
     $(this).val(value);
 }
+function onPaperTypeInput(){
+    var value = $(this).val();
+    if(value.length>1){
+        value = value.substring(value.length-1);
+    }
+    var re = new RegExp("^[a-zA-Z#]+$"); 
+    if(value.length==0 || re.test(value)==false){
+        value='';
+    }else{
+        value = value.toUpperCase();
+    }
+    $(this).val(value);
+}
 </script>
 </html>

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

@@ -95,10 +95,11 @@
 											<li><a href="${ctx}/admin/exam/scan" target="mainFrame" ><i class="icon-print"></i>扫描进度</a></li>
 											<li><a href="${ctx}/admin/exam/mark" target="mainFrame" ><i class="icon-pencil"></i>评卷管理</a></li>
 											<li><a href="${ctx}/admin/exam/score" target="mainFrame" ><i class="icon-search"></i>成绩查询</a></li>
-											<li><a href="${ctx}/admin/exam/reportSubjectRange" target="mainFrame" ><i class="icon-signal"></i>成绩分析</a></li>
 											<li><a href="${ctx}/admin/exam/problem/history" target="mainFrame" ><i class="icon-tag"></i>问题试卷</a></li>	
+                                            <li><a href="${ctx}/admin/exam/reportSubject" target="mainFrame" ><i class="icon-signal"></i>总量分析</a></li>
+                                            <li><a href="${ctx}/admin/exam/reportSubjectCollege" target="mainFrame" ><i class="icon-asterisk"></i>科目分析</a></li>       
 											<li><a href="${ctx}/admin/exam/check/answer" target="mainFrame" ><i class="icon-check"></i>数据检查</a></li>			
-											<li><a href="${ctx}/admin/operation/log" target="mainFrame" ><i class="icon-check"></i>操作日志</a></li>			
+											<li><a href="${ctx}/admin/operation/log" target="mainFrame" ><i class="icon-tasks"></i>操作日志</a></li>			
 											</c:if>
 											
 											<c:if test="${web_user.subjectHeader==true}">
@@ -107,7 +108,8 @@
                                             <li><a href="${ctx}/admin/exam/mark" target="mainFrame" ><i class="icon-pencil"></i>评卷管理</a></li>
                                             <li><a href="${ctx}/admin/exam/score" target="mainFrame" ><i class="icon-search"></i>成绩查询</a></li> 
                                             <li><a href="${ctx}/admin/exam/problem/history" target="mainFrame" ><i class="icon-tag"></i>问题试卷</a></li>	
-                                            <li><a href="${ctx}/admin/exam/reportSubjectRange" target="mainFrame" ><i class="icon-signal"></i>成绩分析</a></li>     
+                                            <li><a href="${ctx}/admin/exam/reportSubject" target="mainFrame" ><i class="icon-signal"></i>总量分析</a></li> 
+                                            <li><a href="${ctx}/admin/exam/reportSubjectCollege" target="mainFrame" ><i class="icon-asterisk"></i>科目分析</a></li>         
                                             </c:if>
                                             
                                             <c:if test="${web_user.schoolViewer==true}">

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

@@ -139,14 +139,10 @@
         <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
         <c:if test="${web_user.schoolAdmin==true}">
             &nbsp;
-            <a href="${ctx}/admin/exam/marker/batch-create" class="btn btn-success">新增</a>
+            <a href="${ctx}/admin/exam/marker/add" class="btn btn-success">新增</a>
         </c:if>
-        &nbsp;
-        <c:if test="${showBtnImport}">
             &nbsp;<input id="btnImport" class="btn" type="button" value="导入"/>
-            <!-- &nbsp;<input id="btnUpdateImport" class="btn" type="button" value="批量修改评卷员账号"/> -->
-        </c:if>
-        <input id="btnExport" class="btn" type="button" value="导出"/>
+    <!--     <input id="btnExport" class="btn" type="button" value="导出"/> -->
     </div>
 </form>
 <tags:message content="${message}"/>
@@ -157,13 +153,11 @@
         <th>大题</th>
         <th>登录名</th>
         <th>姓名</th>
-        <th>密码</th>
         <th>状态</th>
         <th>已评数量</th>
         <th>正在评卷</th>
         <th>任务数</th>
         <th>绑定班级</th>
-        <th>绑定账号</th>
         <th>操作</th>
     </tr>
     </thead>
@@ -180,21 +174,14 @@
                     ${marker.group.number}-${marker.group.title}
                 </c:if>
             </td>
-            <td>${marker.loginName}</td>
-            <td>${marker.name}</td>
-            <td>${marker.password}</td>
+            <td>${marker.user.loginName}</td>
+            <td>${marker.user.name}</td>
             <td>${marker.enable eq true ? "启用" : "禁用"}</td>
             <td>${marker.markedCount}</td>
             <td>${marker.currentCount}</td>
             <td>${marker.topCount}</td>
             <td><a href="${ctx}/admin/exam/marker/class/${marker.id}"><c:if test="${marker.classCount == null}">0</c:if>
                     ${marker.classCount}</a></td>
-            <td>
-                <a href="${ctx}/admin/exam/marker/account/${marker.id}">
-                    <c:if test="${marker.openAccountId == null}">#</c:if>
-                    <c:if test="${marker.openAccount != null}">${marker.openAccount.name}</c:if>
-                </a>
-            </td>
             <td>
                 <c:if test="${web_user.schoolAdmin==true}">
                     <a href="javascript:void(0)" class="reset-button" data-id="${marker.id}">重置</a>

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

@@ -56,6 +56,13 @@
 			<label> 到&nbsp;&nbsp;&nbsp;</label>
 			<input type="text"  number="true" id="endScroe" name="endScroe"  value="${query.endScroe}"  class="input-mini"/>
 			
+			<label>学院</label>
+			<input type="text" name="college" value="${query.college}"  maxlength="10" class="input-mini"/>
+			<label>班级</label>
+			<input type="text" name="className" value="${query.className}"  maxlength="10" class="input-mini"/>
+			<label>任课老师</label>
+			<input type="text" name="teacher" value="${query.teacher}"  maxlength="10" class="input-mini"/>
+			
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
 			&nbsp;
 			<c:if test="${!web_user.schoolViewer }">

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubject.jsp

@@ -11,7 +11,6 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/admin/exam/reportSubjectRange">课程分段统计</a></li>
 		<li class="active"><a href="${ctx}/admin/exam/reportSubject">课程总量统计</a></li>
 	</ul>
 	<form id="searchForm" action="${ctx}/admin/exam/reportSubject" method="post" class="breadcrumb form-search">

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectCollege.jsp

@@ -80,6 +80,10 @@
 </table>
 <script type="text/javascript">
 $("#export-button").click(function(){
+	if ($("#subjectCode").val() == null || $("#subjectCode").val() == '') {
+        alert('请选择科目');
+        return;
+    }
 	$("#searchForm").attr("action","${ctx}/admin/exam/reportSubjectCollege/export");
 	$("#searchForm").submit();
 });

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectRange.jsp

@@ -17,8 +17,15 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-    <li class="active"><a href="${ctx}/admin/exam/reportSubjectRange">课程分段统计</a></li>
-    <li><a href="${ctx}/admin/exam/reportSubject">课程总量统计</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${query.subjectCode}">学院分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}">任课老师分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectClass?subjectCode=${query.subjectCode}">班级分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=true">客观题分析</a>
+    </li>
+    <li><a href="${ctx}/admin/exam/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=false">主观题分析</a>
+    </li>
+    <li><a href="${ctx}/admin/exam/reportSubjectGroup?subjectCode=${query.subjectCode}">大题统计分析</a></li>
+    <li class="active"><a href="${ctx}/admin/exam/reportSubjectRange">分段统计</a></li>
 </ul>
 <form id="searchForm" action="${ctx}/admin/exam/reportSubjectRange" method="post" class="breadcrumb form-search">
     <input type="hidden" id="pageNumber" name="pageNumber" value="${query.pageNumber }"/>
@@ -97,6 +104,10 @@
 <div class="pagination">${query}</div>
 <script type="text/javascript">
 $("#export-button").click(function(){
+	if ($("#subjectCode").val() == null || $("#subjectCode").val() == '') {
+        alert('请选择科目');
+        return;
+    }
 	$("#searchForm").attr("action","${ctx}/admin/exam/reportSubjectRange/export");
 	$("#searchForm").submit();
 });

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectTeacher.jsp

@@ -87,6 +87,10 @@
 </table>
 <script type="text/javascript">
 $("#export-button").click(function(){
+	if ($("#subjectCode").val() == null || $("#subjectCode").val() == '') {
+        alert('请选择科目');
+        return;
+    }
 	$("#searchForm").attr("action","${ctx}/admin/exam/reportSubjectTeacher/export");
 	$("#searchForm").submit();
 });

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectTeacherClass.jsp

@@ -62,6 +62,10 @@
 </table>
 <script type="text/javascript">
 $("#export-button").click(function(){
+	if ($("#subjectCode").val() == null || $("#subjectCode").val() == '') {
+        alert('请选择科目');
+        return;
+    }
 	$("#searchForm").attr("action","${ctx}/admin/exam/reportSubjectTeacherClass/export");
 	$("#searchForm").submit();
 });

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/userInfo.jsp

@@ -39,6 +39,12 @@
 				<label class="lbl">${school.name}</label>
 			</div>
 		</div>
+		<div class="control-group">
+			<label class="control-label">学校Id:</label>
+			<div class="controls">
+				<label class="lbl">${school.id}</label>
+			</div>
+		</div>
 		<div class="control-group">
 			<label class="control-label">姓名:</label>
 			<div class="controls">

stmms-web/src/main/webapp/static/answer-check/css/style.css

@@ -208,7 +208,6 @@ input[type="text"]:focus {
 .form-t span.b {
 	font-size: 15px;
 	font-weight: bold;
-	padding-right: 40px;
 }
 .form-t span.radio {
 	-webkit-box-sizing: border-box;
@@ -224,14 +223,14 @@ input[type="text"]:focus {
 	vertical-align: text-bottom;
 	cursor: pointer;
 }
-.form-t input {
+.form-t span input {
 	width: 16px;
 	height: 16px;
 	background: url(../img/radio.png) no-repeat 0 0;
 	border: 0;
 	cursor: pointer;
 }
-.form-t input.on {
+.form-t span input.on {
 	background: url(../img/radio_on.png) no-repeat 0 0;
 }
 .form-t span.radio + * {
@@ -239,6 +238,9 @@ input[type="text"]:focus {
 	padding-left: 8px;
 	padding-right: 8px;
 }
+.form-t input {
+	width: 40px;
+}
 /*======form-m======*/
 .form-m {
 	padding-bottom: 15px;