1.无用代码清理，以及部分代码重新格式化

2.评卷员topCount字段类型修改

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/dao/CaseHistoryDao.java

@@ -1,16 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.CaseHistory;
-
-public interface CaseHistoryDao extends PagingAndSortingRepository<CaseHistory, Integer>,
-        JpaSpecificationExecutor<CaseHistory> {
-
-    List<CaseHistory> findByLibraryId(Integer libraryId);
-
-    List<CaseHistory> findByLibraryIdAndScorer(Integer libraryId, Integer scorer);
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/dao/CaseLibraryDao.java

@@ -1,26 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.CaseLibrary;
-
-public interface CaseLibraryDao extends PagingAndSortingRepository<CaseLibrary, Integer>,
-        JpaSpecificationExecutor<CaseLibrary> {
-
-    List<CaseLibrary> findByExamIdAndBlockId(Integer examId, Integer blockId);
-
-    List<CaseLibrary> findByExamIdAndBlockIdAndSubjectCode(Integer examId, Integer blockId, String subjectCode);
-
-    List<CaseLibrary> findByBlockIdAndSecretNo(Integer blockId, Integer secretNo);
-
-    List<CaseLibrary> findByBlockId(Integer blockId);
-
-    @Modifying
-    @Query("update CaseLibrary c set c.getCount=c.getCount+1 where c.id=?1")
-    void incrGetCount(Integer id);
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/dao/FormallyHistoryDao.java

@@ -1,18 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.dao;
-
-import java.util.List;
-
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.FormallyHistory;
-
-public interface FormallyHistoryDao extends PagingAndSortingRepository<FormallyHistory, Integer>,
-        JpaSpecificationExecutor<FormallyHistory> {
-
-    List<FormallyHistory> findByLibraryId(int libraryId, Sort sort);
-
-    List<FormallyHistory> findByScorer(int markerId);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/dao/FormallyLibraryDao.java

@@ -1,53 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.FormallyLibrary;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-public interface FormallyLibraryDao extends PagingAndSortingRepository<FormallyLibrary, Integer>,
-        JpaSpecificationExecutor<FormallyLibrary> {
-
-    List<FormallyLibrary> findByExamIdAndBlockId(Integer examId, Integer blockId);
-
-    List<FormallyLibrary> findByExamIdAndBlockIdAndStatus(Integer examId, Integer blockId, LibraryStatus status);
-
-    List<FormallyLibrary> findByExamIdAndBlockIdAndStatusAndIsChecked(Integer examId, Integer blockId,
-            LibraryStatus status, boolean isChecked);
-
-    List<FormallyLibrary> findByExamIdAndBlockIdAndGetter(Integer examId, Integer blockId, Integer getter);
-
-    List<FormallyLibrary> findByBlockIdAndSecretNo(Integer blockId, Integer secretNo);
-
-    List<FormallyLibrary> findByExamIdAndBlockIdAndGetterAndStatus(int examId, int blockId, int getter,
-            LibraryStatus status);
-
-    @Query("select count(*) from FormallyLibrary f where f.examId=?1 and f.subjectCode=?2 and f.blockId=?3")
-    Long getCountByExamIdAndSubjectCodeAndBlockId(Integer examId, String subjectCode, Integer blockId);
-
-    List<FormallyLibrary> findByExamIdAndSubjectCodeAndStatus(Integer examId, String subjectCode, LibraryStatus status);
-
-    @Query("select count(*) from FormallyLibrary f where f.examId=?1 and f.subjectCode=?2 and f.blockId=?3 and f.getter=?4 and f.status=?5")
-    Long endingCount(Integer examId, String subjectCode, Integer blockId, Integer getterId, LibraryStatus status);
-
-    List<FormallyLibrary> findByExamIdAndSubjectCodeAndBlockIdAndSecretNoAndStatus(int examId, String subjectCode, int blockId, int secretNo, LibraryStatus status);
-
-    List<FormallyLibrary> findByExamIdAndSubjectCodeAndBlockId(int examId, String subjectCode, int blockId);
-
-    @Query("select count(*) from FormallyLibrary f where f.examId=?1 and f.subjectCode=?2 and f.blockId=?3 and f.status=?4")
-    Long getCountByExamIdAndSubjectCodeAndBlockIdAndStatus(Integer examId, String subjectCode, Integer blockId,
-            LibraryStatus status);
-
-    @Query("select f from FormallyLibrary f where f.examId=?1 and f.subjectCode=?2 and f.blockId=?3 and f.status=?4 and f.getter=?5")
-    List<FormallyLibrary> endTask(Integer examId, String subjectCode, Integer blockId, LibraryStatus status, Integer id1);
-
-    @Modifying
-    @Query("update FormallyLibrary f set f.status=?2 where f.id=?1")
-    void updateStatusById(int id, LibraryStatus status);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/dao/ProblemHistoryDao.java

@@ -1,18 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.dao;
-
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.ProblemHistory;
-
-public interface ProblemHistoryDao extends PagingAndSortingRepository<ProblemHistory, Integer> {
-
-    /*
-     * List<ProblemHistory>
-     * findByExamIdAndSubjectIdAndSchoolIdAndStatusAndIsChecked(Integer examId,
-     * Integer subjectId, Integer schoolId, Integer status, boolean isChecked);
-     * 
-     * List<ProblemHistory>
-     * findByExamIdAndSubjectIdAndSchoolIdAndBlockId(Integer examId, Integer
-     * subjectId, Integer schoolId, Integer blockId);
-     */
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/dao/ProblemLibraryDao.java

@@ -1,15 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.ProblemLibrary;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-public interface ProblemLibraryDao extends PagingAndSortingRepository<ProblemLibrary, Integer>,
-        JpaSpecificationExecutor<ProblemLibrary> {
-
-    List<ProblemLibrary> findByLibraryIdAndStatus(int libraryId, LibraryStatus status);
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/dao/StandardHistoryDao.java

@@ -1,18 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.StandardHistory;
-
-public interface StandardHistoryDao extends PagingAndSortingRepository<StandardHistory, Integer>,
-        JpaSpecificationExecutor<StandardHistory> {
-
-    List<StandardHistory> findByLibraryId(Integer libraryId);
-
-    List<StandardHistory> findByLibraryIdAndScorer(Integer libraryId, Integer scorer);
-
-    List<StandardHistory> findByScorer(Integer scorerId);
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/dao/StandardLibraryDao.java

@@ -1,26 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.StandardLibrary;
-
-public interface StandardLibraryDao extends PagingAndSortingRepository<StandardLibrary, Integer>,
-        JpaSpecificationExecutor<StandardLibrary> {
-
-    List<StandardLibrary> findByExamIdAndBlockId(Integer examId, Integer blockId);
-
-    List<StandardLibrary> findByExamIdAndBlockIdAndSubjectCode(Integer examId, Integer blockId, String subjectCode);
-
-    List<StandardLibrary> findByBlockIdAndSecretNo(Integer blockId, Integer secretNo);
-
-    List<StandardLibrary> findByBlockId(Integer blockId);
-
-    @Modifying
-    @Query("update StandardLibrary s set s.getCount=s.getCount+1 where s.id=?1")
-    void incrGetCount(Integer id);
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/dao/TryHistoryDao.java

@@ -1,18 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.dao;
-
-import java.util.List;
-
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.TryHistory;
-
-public interface TryHistoryDao extends PagingAndSortingRepository<TryHistory, Integer>,
-        JpaSpecificationExecutor<TryHistory> {
-
-    List<TryHistory> findByLibraryIdAndScorer(int libraryId, int scorer);
-
-    List<TryHistory> findByLibraryId(int libraryId, Sort sort);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/dao/TryLibraryDao.java

@@ -1,33 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.TryLibrary;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-public interface TryLibraryDao extends PagingAndSortingRepository<TryLibrary, Integer>,
-        JpaSpecificationExecutor<TryLibrary> {
-
-    List<TryLibrary> findByExamIdAndBlockId(int examId, int blockId);
-
-    List<TryLibrary> findByExamIdAndBlockIdAndStatusAndIsChecked(int examId, int blockId, LibraryStatus status,
-            boolean isChecked);
-
-    List<TryLibrary> findByBlockIdAndSecretNo(int blockId, int secretNo);
-
-    List<TryLibrary> findByExamIdAndBlockIdAndGetterAndStatus(int examId, int blockId, int getter, LibraryStatus status);
-
-    List<TryLibrary> findByExamIdAndBlockIdAndStatus(int examId, int blockId, LibraryStatus status);
-
-    List<TryLibrary> findByExamIdAndSubjectCodeAndBlockIdAndSecretNoAndStatus(int examId, String subjectCode, int blockId, int secretNo, LibraryStatus status);
-
-    @Modifying
-    @Query("update TryLibrary f set f.status=?2 where f.id=?1")
-    void updateStatusById(int id, LibraryStatus status);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/model/CaseHistory.java

@@ -1,174 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.model;
-
-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 javax.persistence.Transient;
-
-import cn.com.qmth.stmms.biz.exam.model.Marker;
-import cn.com.qmth.stmms.common.enums.LibraryType;
-
-@Entity
-@Table(name = "m_case_history")
-public class CaseHistory implements Serializable {
-
-    private static final long serialVersionUID = 5981774838980004673L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 样卷库ID
-     */
-    @Column(name = "library_id")
-    private Integer libraryId;
-
-    /**
-     * 一评，二评
-     */
-    @Column(name = "stage")
-    private Integer stage;
-
-    /**
-     * 评卷人
-     */
-    @Column(name = "scorer")
-    private Integer scorer;
-
-    /**
-     * 领卷时间
-     */
-    @Column(name = "score_time")
-    private Date scoreTime;
-
-    /**
-     * 总得分
-     */
-    @Column(name = "total_score")
-    private Double totalScore;
-
-    /**
-     * 分值列表
-     */
-    @Column(name = "score_list")
-    private String scoreList;
-
-    /**
-     * 所花时间，以秒为单位
-     */
-    @Column(name = "spent")
-    private Long spent;
-
-    /**
-     * 1:试评2：正评
-     */
-    @Column(name = "type")
-    @Enumerated(EnumType.ORDINAL)
-    private LibraryType type;
-
-    /**
-     * 状态：1正常给分2问题卷给分3需仲裁
-     */
-    @Column(name = "status")
-    private Integer status;
-
-    @Transient
-    private Marker marker;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getScorer() {
-        return scorer;
-    }
-
-    public void setScorer(Integer scorer) {
-        this.scorer = scorer;
-    }
-
-    public Date getScoreTime() {
-        return scoreTime;
-    }
-
-    public void setScoreTime(Date scoreTime) {
-        this.scoreTime = scoreTime;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public String getScoreList() {
-        return scoreList;
-    }
-
-    public void setScoreList(String scoreList) {
-        this.scoreList = scoreList;
-    }
-
-    public Long getSpent() {
-        return spent;
-    }
-
-    public void setSpent(Long spent) {
-        this.spent = spent;
-    }
-
-    public Integer getStage() {
-        return stage;
-    }
-
-    public void setStage(Integer stage) {
-        this.stage = stage;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Marker getMarker() {
-        return marker;
-    }
-
-    public void setMarker(Marker marker) {
-        this.marker = marker;
-    }
-
-    public Integer getLibraryId() {
-        return libraryId;
-    }
-
-    public void setLibraryId(Integer libraryId) {
-        this.libraryId = libraryId;
-    }
-
-    public LibraryType getType() {
-        return type;
-    }
-
-    public void setType(LibraryType type) {
-        this.type = type;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/model/CaseLibrary.java

@@ -1,246 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-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.biz.exam.model.SubjectiveBlock;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-@Entity
-@Table(name = "m_case_library")
-public class CaseLibrary implements Serializable {
-
-    private static final long serialVersionUID = -3007844827459700822L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 学习中心Code
-     */
-    @Column(name = "campus_code")
-    private String campusCode;
-
-    /**
-     * 考试ID
-     */
-    @Column(name = "exam_id")
-    private Integer examId;
-
-    /**
-     * 科目CODE
-     */
-    @Column(name = "subject_code")
-    private String subjectCode;
-
-    /**
-     * 科目块ID
-     */
-    @Column(name = "block_id")
-    private Integer blockId;
-
-    /**
-     * 密号
-     */
-    @Column(name = "secret_no")
-    private Integer secretNo;
-
-    /**
-     * 准考证号
-     */
-    @Column(name = "exam_number")
-    private String examNumber;
-
-    @Column(name = "pic_count")
-    private Integer picCount;
-
-    /**
-     * 总分
-     */
-    @Column(name = "total_score")
-    private Double totalScore;
-
-    /**
-     * 分值列表
-     */
-    @Column(name = "score_list")
-    private String scoreList;
-
-    /**
-     * 采样人
-     */
-    @Column(name = "sampler")
-    private Integer sampler;
-
-    /**
-     * 采样时间
-     */
-    @Column(name = "sample_time")
-    private Date sampleTime;
-
-    /**
-     * 状态，0：已领取1：未领取
-     */
-    @Column(name = "status")
-    @Enumerated(EnumType.ORDINAL)
-    private LibraryStatus status;
-
-    /**
-     * 领取数量
-     */
-    @Column(name = "get_count")
-    private Integer getCount;
-
-    private transient SubjectiveBlock subjectiveBlock;
-
-    private transient String pictureConfig;
-
-    private transient List<String> pictureUrls;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getSecretNo() {
-        return secretNo;
-    }
-
-    public void setSecretNo(Integer secretNo) {
-        this.secretNo = secretNo;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public String getCampusCode() {
-        return campusCode;
-    }
-
-    public void setCampusCode(String campusCode) {
-        this.campusCode = campusCode;
-    }
-
-    public LibraryStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(LibraryStatus status) {
-        this.status = status;
-    }
-
-    public Integer getGetCount() {
-        return getCount;
-    }
-
-    public void setGetCount(Integer getCount) {
-        this.getCount = getCount;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public String getScoreList() {
-        return scoreList;
-    }
-
-    public void setScoreList(String scoreList) {
-        this.scoreList = scoreList;
-    }
-
-    public Integer getSampler() {
-        return sampler;
-    }
-
-    public void setSampler(Integer sampler) {
-        this.sampler = sampler;
-    }
-
-    public Date getSampleTime() {
-        return sampleTime;
-    }
-
-    public void setSampleTime(Date sampleTime) {
-        this.sampleTime = sampleTime;
-    }
-
-    public SubjectiveBlock getSubjectiveBlock() {
-        return subjectiveBlock;
-    }
-
-    public void setSubjectiveBlock(SubjectiveBlock subjectiveBlock) {
-        this.subjectiveBlock = subjectiveBlock;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public Integer getPicCount() {
-        return picCount;
-    }
-
-    public void setPicCount(Integer picCount) {
-        this.picCount = picCount;
-    }
-
-    public String getPictureConfig() {
-        return pictureConfig;
-    }
-
-    public void setPictureConfig(String pictureConfig) {
-        this.pictureConfig = pictureConfig;
-    }
-
-    public List<String> getPictureUrls() {
-        return pictureUrls;
-    }
-
-    public void setPictureUrls(List<String> pictureUrls) {
-        this.pictureUrls = pictureUrls;
-    }
-
-    public String getExamNumber() {
-        return examNumber;
-    }
-
-    public void setExamNumber(String examNumber) {
-        this.examNumber = examNumber;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/model/FormallyHistory.java

@@ -1,160 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.model;
-
-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 javax.persistence.Transient;
-
-import cn.com.qmth.stmms.biz.exam.model.Marker;
-import cn.com.qmth.stmms.common.enums.HistoryType;
-
-@Entity
-@Table(name = "m_formally_history")
-public class FormallyHistory implements Serializable {
-
-    private static final long serialVersionUID = 1751016902951510338L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 正评库ID
-     */
-    @Column(name = "library_id")
-    private Integer libraryId;
-
-    /**
-     * 一评，二评
-     */
-    @Column(name = "stage")
-    private Integer stage;
-
-    /**
-     * 评卷人
-     */
-    @Column(name = "scorer")
-    private Integer scorer;
-
-    /**
-     * 给分时间
-     */
-    @Column(name = "score_time")
-    private Date scoreTime;
-
-    /**
-     * 总得分
-     */
-    @Column(name = "total_score")
-    private Double totalScore;
-
-    /**
-     * 分值列表
-     */
-    @Column(name = "score_list")
-    private String scoreList;
-
-    /**
-     * 所花时间，以秒为单位
-     */
-    @Column(name = "spent")
-    private Long spent;
-
-    /**
-     * 类型
-     */
-    @Column(name = "type")
-    @Enumerated(EnumType.ORDINAL)
-    private HistoryType type;
-
-    @Transient
-    private Marker marker;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getLibraryId() {
-        return libraryId;
-    }
-
-    public void setLibraryId(Integer libraryId) {
-        this.libraryId = libraryId;
-    }
-
-    public Integer getStage() {
-        return stage;
-    }
-
-    public void setStage(Integer stage) {
-        this.stage = stage;
-    }
-
-    public Integer getScorer() {
-        return scorer;
-    }
-
-    public void setScorer(Integer scorer) {
-        this.scorer = scorer;
-    }
-
-    public Date getScoreTime() {
-        return scoreTime;
-    }
-
-    public void setScoreTime(Date scoreTime) {
-        this.scoreTime = scoreTime;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public String getScoreList() {
-        return scoreList;
-    }
-
-    public void setScoreList(String scoreList) {
-        this.scoreList = scoreList;
-    }
-
-    public Long getSpent() {
-        return spent;
-    }
-
-    public void setSpent(Long spent) {
-        this.spent = spent;
-    }
-
-    public HistoryType getType() {
-        return type;
-    }
-
-    public void setType(HistoryType type) {
-        this.type = type;
-    }
-
-    public Marker getMarker() {
-        return marker;
-    }
-
-    public void setMarker(Marker marker) {
-        this.marker = marker;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/model/FormallyLibrary.java

@@ -1,309 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.model;
-
-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.LibraryStatus;
-
-@Entity
-@Table(name = "m_formally_library")
-public class FormallyLibrary implements Serializable {
-
-    private static final long serialVersionUID = 7121951721670633060L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 学习中心CODE
-     */
-    @Column(name = "campus_code")
-    private String campusCode;
-
-    /**
-     * 考试ID
-     */
-    @Column(name = "exam_id")
-    private Integer examId;
-
-    /**
-     * 科目CODE
-     */
-    @Column(name = "subject_code")
-    private String subjectCode;
-
-    /**
-     * 科目块ID
-     */
-    @Column(name = "block_id")
-    private Integer blockId;
-
-    /**
-     * 密号
-     */
-    @Column(name = "secret_no")
-    private Integer secretNo;
-
-    /**
-     * 准考证号
-     */
-    @Column(name = "exam_number")
-    private String examNumber;
-
-    /**
-     * 小图数量
-     */
-    @Column(name = "pic_count")
-    private Integer picCount;
-
-    /**
-     * 评卷员
-     */
-    @Column(name = "getter")
-    private Integer getter;
-
-    /**
-     * 评卷时间
-     */
-    @Column(name = "get_time")
-    private Date getTime;
-
-    /**
-     * 任务状态
-     */
-    @Column(name = "status")
-    @Enumerated(EnumType.ORDINAL)
-    private LibraryStatus status;
-
-    /**
-     * 当前大题的多评次数
-     */
-    @Column(name = "marker_count")
-    private Integer markerCount;
-
-    /**
-     * 多评情况下，当前任务的序号
-     */
-    private Integer number;
-
-    /**
-     * 是否已抽查
-     */
-    @Column(name = "is_checked")
-    private boolean isChecked;
-
-    /**
-     * 科组长最终给分
-     */
-    @Column(name = "header_score")
-    private Double headerScore;
-
-    /**
-     * 科组长最终给分列表
-     */
-    @Column(name = "header_score_list")
-    private String headerScoreList;
-
-    /**
-     * 评卷员最终给分
-     */
-    @Column(name = "marker_score")
-    private Double markerScore;
-
-    /**
-     * 评卷员最终给分列表
-     */
-    @Column(name = "marker_score_list")
-    private String markerScoreList;
-
-    /**
-     * 客观题得分
-     */
-    @Column(name = "objective_score")
-    private Double objectiveScore;
-
-    public FormallyLibrary clone() {
-        FormallyLibrary library = new FormallyLibrary();
-        library.setExamId(examId);
-        library.setCampusCode(campusCode);
-        library.setSubjectCode(subjectCode);
-        library.setBlockId(blockId);
-        library.setSecretNo(secretNo);
-        library.setExamNumber(examNumber);
-        library.setPicCount(picCount);
-        library.setGetter(getter);
-        library.setGetTime(getTime);
-        library.setStatus(status);
-        library.setMarkerCount(markerCount);
-        library.setNumber(number);
-        library.setChecked(isChecked);
-        library.setHeaderScore(headerScore);
-        library.setMarkerScore(markerScore);
-        library.setHeaderScoreList(headerScoreList);
-        library.setMarkerScoreList(markerScoreList);
-        library.setObjectiveScore(objectiveScore);
-        return library;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getSecretNo() {
-        return secretNo;
-    }
-
-    public void setSecretNo(Integer secretNo) {
-        this.secretNo = secretNo;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public String getCampusCode() {
-        return campusCode;
-    }
-
-    public void setCampusCode(String campusCode) {
-        this.campusCode = campusCode;
-    }
-
-    public Integer getGetter() {
-        return getter;
-    }
-
-    public void setGetter(Integer getter) {
-        this.getter = getter;
-    }
-
-    public Date getGetTime() {
-        return getTime;
-    }
-
-    public void setGetTime(Date getTime) {
-        this.getTime = getTime;
-    }
-
-    public LibraryStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(LibraryStatus status) {
-        this.status = status;
-    }
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public boolean isChecked() {
-        return isChecked;
-    }
-
-    public void setChecked(boolean isChecked) {
-        this.isChecked = isChecked;
-    }
-
-    public Integer getMarkerCount() {
-        return markerCount;
-    }
-
-    public void setMarkerCount(Integer markerCount) {
-        this.markerCount = markerCount;
-    }
-
-    public Double getHeaderScore() {
-        return headerScore;
-    }
-
-    public void setHeaderScore(Double headerScore) {
-        this.headerScore = headerScore;
-    }
-
-    public Double getMarkerScore() {
-        return markerScore;
-    }
-
-    public void setMarkerScore(Double markerScore) {
-        this.markerScore = markerScore;
-    }
-
-    public String getHeaderScoreList() {
-        return headerScoreList;
-    }
-
-    public void setHeaderScoreList(String headerScoreList) {
-        this.headerScoreList = headerScoreList;
-    }
-
-    public String getMarkerScoreList() {
-        return markerScoreList;
-    }
-
-    public void setMarkerScoreList(String markerScoreList) {
-        this.markerScoreList = markerScoreList;
-    }
-
-    public Integer getPicCount() {
-        return picCount;
-    }
-
-    public void setPicCount(Integer picCount) {
-        this.picCount = picCount;
-    }
-
-    public String getExamNumber() {
-        return examNumber;
-    }
-
-    public void setExamNumber(String examNumber) {
-        this.examNumber = examNumber;
-    }
-
-    public Double getObjectiveScore() {
-        return objectiveScore;
-    }
-
-    public void setObjectiveScore(Double objectiveScore) {
-        this.objectiveScore = objectiveScore;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/model/ProblemHistory.java

@@ -1,158 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.model;
-
-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.LibraryStatus;
-
-@Entity
-@Table(name = "m_problem_history")
-public class ProblemHistory implements Serializable {
-
-    private static final long serialVersionUID = 5760219635508062736L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 问题卷库ID
-     */
-    @Column(name = "library_id")
-    private Integer libraryId;
-
-    /**
-     * 总得分
-     */
-    @Column(name = "total_score")
-    private Double totalScore;
-
-    /**
-     * 分值列表
-     */
-    @Column(name = "score_list")
-    private String scoreList;
-
-    /**
-     * 所花时间，以秒为单位
-     */
-    @Column(name = "spent")
-    private Long spent;
-
-    @Enumerated(EnumType.ORDINAL)
-    @Column(name = "status")
-    private LibraryStatus status;
-
-    /**
-     * 提交人
-     */
-    @Column(name = "submitter")
-    private Integer submitter;
-
-    /**
-     * 领卷时间
-     */
-    @Column(name = "submit_time")
-    private Date submitTime;
-
-    /**
-     * 类型：0：样卷1：试评2：正评
-     */
-    @Column(name = "type")
-    private Integer type;
-
-    /**
-     * 1：一评2：二评
-     */
-    @Column(name = "stage")
-    private Integer stage;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getLibraryId() {
-        return libraryId;
-    }
-
-    public void setLibraryId(Integer libraryId) {
-        this.libraryId = libraryId;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public String getScoreList() {
-        return scoreList;
-    }
-
-    public void setScoreList(String scoreList) {
-        this.scoreList = scoreList;
-    }
-
-    public Long getSpent() {
-        return spent;
-    }
-
-    public void setSpent(Long spent) {
-        this.spent = spent;
-    }
-
-    public LibraryStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(LibraryStatus status) {
-        this.status = status;
-    }
-
-    public Integer getSubmitter() {
-        return submitter;
-    }
-
-    public void setSubmitter(Integer submitter) {
-        this.submitter = submitter;
-    }
-
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Integer getStage() {
-        return stage;
-    }
-
-    public void setStage(Integer stage) {
-        this.stage = stage;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/model/ProblemLibrary.java

@@ -1,265 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-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 javax.persistence.Transient;
-
-import cn.com.qmth.stmms.biz.exam.model.Marker;
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-import cn.com.qmth.stmms.common.enums.LibraryType;
-
-@Entity
-@Table(name = "m_problem_library")
-public class ProblemLibrary implements Serializable {
-
-    private static final long serialVersionUID = -8940367483803324547L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 学习中心CODE
-     */
-    @Column(name = "campus_code")
-    private String campusCode;
-
-    /**
-     * 考试ID
-     */
-    @Column(name = "exam_id")
-    private Integer examId;
-
-    /**
-     * 科目CODE
-     */
-    @Column(name = "subject_Code")
-    private String subjectCode;
-
-    /**
-     * 库ID
-     */
-    @Column(name = "library_id")
-    private Integer libraryId;
-
-    /**
-     * 类型：0：样卷1：试评2：正评
-     */
-    @Column(name = "type")
-    @Enumerated(EnumType.ORDINAL)
-    private LibraryType type;
-
-    /**
-     * 科目块ID
-     */
-    @Column(name = "block_id")
-    private Integer blockId;
-
-    /**
-     * 密号
-     */
-    @Column(name = "secret_no")
-    private Integer secretNo;
-
-    /**
-     * 原因
-     */
-    @Column(name = "reason")
-    private Integer reason;
-
-    /**
-     * 发生时间
-     */
-    @Column(name = "submit_time")
-    private Date submitTime;
-
-    /**
-     * 提交人ID
-     */
-    @Column(name = "submitter")
-    private Integer submitter;
-
-    /**
-     * 状态
-     */
-    @Enumerated(EnumType.ORDINAL)
-    @Column(name = "status")
-    private LibraryStatus status;
-
-    /**
-     * 一评、二评
-     */
-    @Transient
-    private Integer stage;
-
-    @Transient
-    private Marker marker;
-
-    @Transient
-    private SubjectiveBlock subjectiveBlock;
-
-    @Transient
-    private String pictureConfig;
-
-    @Transient
-    private List<String> pictureUrls;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getSecretNo() {
-        return secretNo;
-    }
-
-    public void setSecretNo(Integer secretNo) {
-        this.secretNo = secretNo;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public Integer getReason() {
-        return reason;
-    }
-
-    public void setReason(Integer reason) {
-        this.reason = reason;
-    }
-
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
-
-    public Integer getSubmitter() {
-        return submitter;
-    }
-
-    public void setSubmitter(Integer submitter) {
-        this.submitter = submitter;
-    }
-
-    public Marker getMarker() {
-        return marker;
-    }
-
-    public void setMarker(Marker marker) {
-        this.marker = marker;
-    }
-
-    public SubjectiveBlock getSubjectiveBlock() {
-        return subjectiveBlock;
-    }
-
-    public void setSubjectiveBlock(SubjectiveBlock subjectiveBlock) {
-        this.subjectiveBlock = subjectiveBlock;
-    }
-
-    public Integer getStage() {
-        return stage;
-    }
-
-    public void setStage(Integer stage) {
-        this.stage = stage;
-    }
-
-    public LibraryType getType() {
-        return type;
-    }
-
-    public void setType(LibraryType type) {
-        this.type = type;
-    }
-
-    public Integer getLibraryId() {
-        return libraryId;
-    }
-
-    public void setLibraryId(Integer libraryId) {
-        this.libraryId = libraryId;
-    }
-
-    public LibraryStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(LibraryStatus status) {
-        this.status = status;
-    }
-
-    public String getPictureConfig() {
-        return pictureConfig;
-    }
-
-    public void setPictureConfig(String pictureConfig) {
-        this.pictureConfig = pictureConfig;
-    }
-
-    public String getPictureUrls() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("[");
-        if (pictureUrls != null && pictureUrls.size() > 0) {
-            int length = pictureUrls.size();
-            for (int i = 0; i < length; i++) {
-                sb.append("\"").append(pictureUrls.get(i)).append("\"");
-                if (i < (length - 1)) {
-                    sb.append(",");
-                }
-            }
-        }
-        sb.append("]");
-        return sb.toString();
-    }
-
-    public void setPictureUrls(List<String> pictureUrls) {
-        this.pictureUrls = pictureUrls;
-    }
-
-    public String getCampusCode() {
-        return campusCode;
-    }
-
-    public void setCampusCode(String campusCode) {
-        this.campusCode = campusCode;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/model/StandardHistory.java

@@ -1,174 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.model;
-
-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 javax.persistence.Transient;
-
-import cn.com.qmth.stmms.biz.exam.model.Marker;
-import cn.com.qmth.stmms.common.enums.LibraryType;
-
-@Entity
-@Table(name = "m_standard_history")
-public class StandardHistory implements Serializable {
-
-    private static final long serialVersionUID = 3265772212222711113L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 样卷库ID
-     */
-    @Column(name = "library_id")
-    private Integer libraryId;
-
-    /**
-     * 一评，二评
-     */
-    @Column(name = "stage")
-    private Integer stage;
-
-    /**
-     * 评卷人
-     */
-    @Column(name = "scorer")
-    private Integer scorer;
-
-    /**
-     * 领卷时间
-     */
-    @Column(name = "score_time")
-    private Date scoreTime;
-
-    /**
-     * 总得分
-     */
-    @Column(name = "total_score")
-    private Double totalScore;
-
-    /**
-     * 分值列表
-     */
-    @Column(name = "score_list")
-    private String scoreList;
-
-    /**
-     * 所花时间，以秒为单位
-     */
-    @Column(name = "spent")
-    private Long spent;
-
-    /**
-     * 1:试评2：正评
-     */
-    @Column(name = "type")
-    @Enumerated(EnumType.ORDINAL)
-    private LibraryType type;
-
-    /**
-     * 状态：1正常给分2问题卷给分3需仲裁
-     */
-    @Column(name = "status")
-    private Integer status;
-
-    @Transient
-    private Marker marker;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getScorer() {
-        return scorer;
-    }
-
-    public void setScorer(Integer scorer) {
-        this.scorer = scorer;
-    }
-
-    public Date getScoreTime() {
-        return scoreTime;
-    }
-
-    public void setScoreTime(Date scoreTime) {
-        this.scoreTime = scoreTime;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public String getScoreList() {
-        return scoreList;
-    }
-
-    public void setScoreList(String scoreList) {
-        this.scoreList = scoreList;
-    }
-
-    public Long getSpent() {
-        return spent;
-    }
-
-    public void setSpent(Long spent) {
-        this.spent = spent;
-    }
-
-    public Integer getStage() {
-        return stage;
-    }
-
-    public void setStage(Integer stage) {
-        this.stage = stage;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Marker getMarker() {
-        return marker;
-    }
-
-    public void setMarker(Marker marker) {
-        this.marker = marker;
-    }
-
-    public Integer getLibraryId() {
-        return libraryId;
-    }
-
-    public void setLibraryId(Integer libraryId) {
-        this.libraryId = libraryId;
-    }
-
-    public LibraryType getType() {
-        return type;
-    }
-
-    public void setType(LibraryType type) {
-        this.type = type;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/model/StandardLibrary.java

@@ -1,246 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-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.biz.exam.model.SubjectiveBlock;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-@Entity
-@Table(name = "m_standard_library")
-public class StandardLibrary implements Serializable {
-
-    private static final long serialVersionUID = 986913961826350864L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 学习中心CODE
-     */
-    @Column(name = "campus_code")
-    private String campusCode;
-
-    /**
-     * 考试ID
-     */
-    @Column(name = "exam_id")
-    private Integer examId;
-
-    /**
-     * 科目CODE
-     */
-    @Column(name = "subject_code")
-    private String subjectCode;
-
-    /**
-     * 科目块ID
-     */
-    @Column(name = "block_id")
-    private Integer blockId;
-
-    /**
-     * 密号
-     */
-    @Column(name = "secret_no")
-    private Integer secretNo;
-
-    /**
-     * 准考证号
-     */
-    @Column(name = "exam_number")
-    private String examNumber;
-
-    @Column(name = "pic_count")
-    private Integer picCount;
-
-    /**
-     * 总分
-     */
-    @Column(name = "total_score")
-    private Double totalScore;
-
-    /**
-     * 分值列表
-     */
-    @Column(name = "score_list")
-    private String scoreList;
-
-    /**
-     * 创建人
-     */
-    @Column(name = "creator")
-    private Integer creator;
-
-    /**
-     * 采样时间
-     */
-    @Column(name = "create_time")
-    private Date createTime;
-
-    /**
-     * 状态，0：已领取1：未领取
-     */
-    @Column(name = "status")
-    @Enumerated(EnumType.ORDINAL)
-    private LibraryStatus status;
-
-    /**
-     * 领取数量
-     */
-    @Column(name = "get_count")
-    private Integer getCount;
-
-    private transient SubjectiveBlock subjectiveBlock;
-
-    private transient String pictureConfig;
-
-    private transient List<String> pictureUrls;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getSecretNo() {
-        return secretNo;
-    }
-
-    public void setSecretNo(Integer secretNo) {
-        this.secretNo = secretNo;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public String getCampusCode() {
-        return campusCode;
-    }
-
-    public void setCampusCode(String campusCode) {
-        this.campusCode = campusCode;
-    }
-
-    public LibraryStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(LibraryStatus status) {
-        this.status = status;
-    }
-
-    public Integer getGetCount() {
-        return getCount;
-    }
-
-    public void setGetCount(Integer getCount) {
-        this.getCount = getCount;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public String getScoreList() {
-        return scoreList;
-    }
-
-    public void setScoreList(String scoreList) {
-        this.scoreList = scoreList;
-    }
-
-    public Integer getCreator() {
-        return creator;
-    }
-
-    public void setCreator(Integer creator) {
-        this.creator = creator;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public SubjectiveBlock getSubjectiveBlock() {
-        return subjectiveBlock;
-    }
-
-    public void setSubjectiveBlock(SubjectiveBlock subjectiveBlock) {
-        this.subjectiveBlock = subjectiveBlock;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public Integer getPicCount() {
-        return picCount;
-    }
-
-    public void setPicCount(Integer picCount) {
-        this.picCount = picCount;
-    }
-
-    public String getPictureConfig() {
-        return pictureConfig;
-    }
-
-    public void setPictureConfig(String pictureConfig) {
-        this.pictureConfig = pictureConfig;
-    }
-
-    public List<String> getPictureUrls() {
-        return pictureUrls;
-    }
-
-    public void setPictureUrls(List<String> pictureUrls) {
-        this.pictureUrls = pictureUrls;
-    }
-
-    public String getExamNumber() {
-        return examNumber;
-    }
-
-    public void setExamNumber(String examNumber) {
-        this.examNumber = examNumber;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/model/TryHistory.java

@@ -1,160 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.model;
-
-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 javax.persistence.Transient;
-
-import cn.com.qmth.stmms.biz.exam.model.Marker;
-import cn.com.qmth.stmms.common.enums.HistoryType;
-
-@Entity
-@Table(name = "m_try_history")
-public class TryHistory implements Serializable {
-
-    private static final long serialVersionUID = 2659399330984305370L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 试评库ID
-     */
-    @Column(name = "library_id")
-    private Integer libraryId;
-
-    /**
-     * 评卷阶段，1一评2二评
-     */
-    @Column(name = "stage")
-    private Integer stage;
-
-    /**
-     * 评卷人
-     */
-    @Column(name = "scorer")
-    private Integer scorer;
-
-    /**
-     * 给分时间
-     */
-    @Column(name = "score_time")
-    private Date scoreTime;
-
-    /**
-     * 总得分
-     */
-    @Column(name = "total_score")
-    private Double totalScore;
-
-    /**
-     * 分值列表
-     */
-    @Column(name = "score_list")
-    private String scoreList;
-
-    /**
-     * 所花时间，以秒为单位
-     */
-    @Column(name = "spent")
-    private Long spent;
-
-    /**
-     * 类型
-     */
-    @Column(name = "type")
-    @Enumerated(EnumType.ORDINAL)
-    private HistoryType type;
-
-    @Transient
-    private Marker marker;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getLibraryId() {
-        return libraryId;
-    }
-
-    public void setLibraryId(Integer libraryId) {
-        this.libraryId = libraryId;
-    }
-
-    public Integer getStage() {
-        return stage;
-    }
-
-    public void setStage(Integer stage) {
-        this.stage = stage;
-    }
-
-    public Integer getScorer() {
-        return scorer;
-    }
-
-    public void setScorer(Integer scorer) {
-        this.scorer = scorer;
-    }
-
-    public Date getScoreTime() {
-        return scoreTime;
-    }
-
-    public void setScoreTime(Date scoreTime) {
-        this.scoreTime = scoreTime;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public String getScoreList() {
-        return scoreList;
-    }
-
-    public void setScoreList(String scoreList) {
-        this.scoreList = scoreList;
-    }
-
-    public Long getSpent() {
-        return spent;
-    }
-
-    public void setSpent(Long spent) {
-        this.spent = spent;
-    }
-
-    public HistoryType getType() {
-        return type;
-    }
-
-    public void setType(HistoryType type) {
-        this.type = type;
-    }
-
-    public Marker getMarker() {
-        return marker;
-    }
-
-    public void setMarker(Marker marker) {
-        this.marker = marker;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/model/TryLibrary.java

@@ -1,291 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.model;
-
-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.LibraryStatus;
-
-@Entity
-@Table(name = "m_try_library")
-public class TryLibrary implements Serializable {
-
-    private static final long serialVersionUID = 7121951721670633060L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 学习中心ID
-     */
-    @Column(name = "campus_code")
-    private String campusCode;
-
-    /**
-     * 考试ID
-     */
-    @Column(name = "exam_id")
-    private Integer examId;
-
-    /**
-     * 科目CODE
-     */
-    @Column(name = "subject_code")
-    private String subjectCode;
-
-    /**
-     * 科目块ID
-     */
-    @Column(name = "block_id")
-    private Integer blockId;
-
-    /**
-     * 密号
-     */
-    @Column(name = "secret_no")
-    private Integer secretNo;
-
-    /**
-     * 准考证号
-     */
-    @Column(name = "exam_number")
-    private String examNumber;
-
-    @Column(name = "pic_count")
-    private Integer picCount;
-
-    /**
-     * 领卷人
-     */
-    @Column(name = "getter")
-    private Integer getter;
-
-    /**
-     * 领卷时间
-     */
-    @Column(name = "get_time")
-    private Date getTime;
-
-    /**
-     * 状态
-     */
-    @Column(name = "status")
-    @Enumerated(EnumType.ORDINAL)
-    private LibraryStatus status;
-
-    /**
-     * 当前块的多评次数
-     */
-    @Column(name = "marker_count")
-    private Integer markerCount;
-
-    /**
-     * 多评情况下，当前任务的序号
-     */
-    private Integer number;
-
-    /**
-     * 是否已抽查
-     */
-    @Column(name = "is_checked")
-    private boolean isChecked;
-
-    /**
-     * 科组长最终给分
-     */
-    @Column(name = "header_score")
-    private Double headerScore;
-
-    /**
-     * 科组长最终给分列表
-     */
-    @Column(name = "header_score_list")
-    private String headerScoreList;
-
-    /**
-     * 评卷员最终给分
-     */
-    @Column(name = "marker_score")
-    private Double markerScore;
-
-    /**
-     * 评卷员最终给分列表
-     */
-    @Column(name = "marker_score_list")
-    private String markerScoreList;
-
-    public TryLibrary clone() {
-        TryLibrary library = new TryLibrary();
-        library.setExamId(examId);
-        library.setCampusCode(campusCode);
-        library.setSubjectCode(subjectCode);
-        library.setBlockId(blockId);
-        library.setSecretNo(secretNo);
-        library.setExamNumber(examNumber);
-        library.setPicCount(picCount);
-        library.setGetter(getter);
-        library.setGetTime(getTime);
-        library.setStatus(status);
-        library.setMarkerCount(markerCount);
-        library.setNumber(number);
-        library.setChecked(isChecked);
-        library.setHeaderScore(headerScore);
-        library.setMarkerScore(markerScore);
-        library.setHeaderScoreList(headerScoreList);
-        library.setMarkerScoreList(markerScoreList);
-        return library;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public String getCampusCode() {
-        return campusCode;
-    }
-
-    public void setCampusCode(String campusCode) {
-        this.campusCode = campusCode;
-    }
-
-    public Integer getGetter() {
-        return getter;
-    }
-
-    public void setGetter(Integer getter) {
-        this.getter = getter;
-    }
-
-    public Date getGetTime() {
-        return getTime;
-    }
-
-    public void setGetTime(Date getTime) {
-        this.getTime = getTime;
-    }
-
-    public Integer getSecretNo() {
-        return secretNo;
-    }
-
-    public void setSecretNo(Integer secretNo) {
-        this.secretNo = secretNo;
-    }
-
-    public LibraryStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(LibraryStatus status) {
-        this.status = status;
-    }
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public boolean isChecked() {
-        return isChecked;
-    }
-
-    public void setChecked(boolean isChecked) {
-        this.isChecked = isChecked;
-    }
-
-    public Integer getMarkerCount() {
-        return markerCount;
-    }
-
-    public void setMarkerCount(Integer markerCount) {
-        this.markerCount = markerCount;
-    }
-
-    public Double getHeaderScore() {
-        return headerScore;
-    }
-
-    public void setHeaderScore(Double headerScore) {
-        this.headerScore = headerScore;
-    }
-
-    public Double getMarkerScore() {
-        return markerScore;
-    }
-
-    public void setMarkerScore(Double markerScore) {
-        this.markerScore = markerScore;
-    }
-
-    public String getHeaderScoreList() {
-        return headerScoreList;
-    }
-
-    public void setHeaderScoreList(String headerScoreList) {
-        this.headerScoreList = headerScoreList;
-    }
-
-    public String getMarkerScoreList() {
-        return markerScoreList;
-    }
-
-    public void setMarkerScoreList(String markerScoreList) {
-        this.markerScoreList = markerScoreList;
-    }
-
-    public Integer getPicCount() {
-        return picCount;
-    }
-
-    public void setPicCount(Integer picCount) {
-        this.picCount = picCount;
-    }
-
-    public String getExamNumber() {
-        return examNumber;
-    }
-
-    public void setExamNumber(String examNumber) {
-        this.examNumber = examNumber;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/query/FormallyHistorySearchQuery.java

@@ -1,80 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.query;
-
-import java.util.Date;
-
-import cn.com.qmth.stmms.biz.common.BaseQuery;
-import cn.com.qmth.stmms.biz.distributpaper.model.FormallyHistory;
-
-public class FormallyHistorySearchQuery extends BaseQuery<FormallyHistory> {
-
-    private Date startTime;
-
-    private Date endTime;
-
-    private Integer libraryId;
-
-    private Integer paperNumber;
-
-    private Integer blockId;
-
-    private Integer status;
-
-    private Boolean isChecked;
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public Integer getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(Integer paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Integer getLibraryId() {
-        return libraryId;
-    }
-
-    public void setLibraryId(Integer libraryId) {
-        this.libraryId = libraryId;
-    }
-
-    public Boolean getIsChecked() {
-        return isChecked;
-    }
-
-    public void setIsChecked(Boolean isChecked) {
-        this.isChecked = isChecked;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/query/FormallyLibrarySearchQuery.java

@@ -1,101 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.query;
-
-import java.util.Date;
-
-import cn.com.qmth.stmms.biz.common.BaseQuery;
-import cn.com.qmth.stmms.biz.distributpaper.model.FormallyLibrary;
-import cn.com.qmth.stmms.common.enums.ClassType;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-public class FormallyLibrarySearchQuery extends BaseQuery<FormallyLibrary> {
-
-    private int examId;
-
-    private int subjectId;
-
-    private ClassType classType;
-
-    private int blockId;
-
-    private int secretNo;
-
-    private int getter;
-
-    private LibraryStatus status;
-
-    private Date maxGetTime;
-
-    private Date minGetTime;
-
-    public int getExamId() {
-        return examId;
-    }
-
-    public void setExamId(int examId) {
-        this.examId = examId;
-    }
-
-    public int getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(int blockId) {
-        this.blockId = blockId;
-    }
-
-    public int getSecretNo() {
-        return secretNo;
-    }
-
-    public void setSecretNo(int secretNo) {
-        this.secretNo = secretNo;
-    }
-
-    public int getGetter() {
-        return getter;
-    }
-
-    public void setGetter(int getter) {
-        this.getter = getter;
-    }
-
-    public LibraryStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(LibraryStatus status) {
-        this.status = status;
-    }
-
-    public int getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(int subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public ClassType getClassType() {
-        return classType;
-    }
-
-    public void setClassType(ClassType classType) {
-        this.classType = classType;
-    }
-
-    public Date getMaxGetTime() {
-        return maxGetTime;
-    }
-
-    public void setMaxGetTime(Date maxGetTime) {
-        this.maxGetTime = maxGetTime;
-    }
-
-    public Date getMinGetTime() {
-        return minGetTime;
-    }
-
-    public void setMinGetTime(Date minGetTime) {
-        this.minGetTime = minGetTime;
-    }
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/query/TryHistorySearchQuery.java

@@ -1,80 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.query;
-
-import java.util.Date;
-
-import cn.com.qmth.stmms.biz.common.BaseQuery;
-import cn.com.qmth.stmms.biz.distributpaper.model.TryHistory;
-
-public class TryHistorySearchQuery extends BaseQuery<TryHistory> {
-
-    private Date startTime;
-
-    private Date endTime;
-
-    private Integer libraryId;
-
-    private Integer paperNumber;
-
-    private Integer blockId;
-
-    private Integer status;
-
-    private Boolean isChecked;
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public Integer getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(Integer paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Integer getLibraryId() {
-        return libraryId;
-    }
-
-    public void setLibraryId(Integer libraryId) {
-        this.libraryId = libraryId;
-    }
-
-    public Boolean getIsChecked() {
-        return isChecked;
-    }
-
-    public void setIsChecked(Boolean isChecked) {
-        this.isChecked = isChecked;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/query/TryLibrarySearchQuery.java

@@ -1,101 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.query;
-
-import java.util.Date;
-
-import cn.com.qmth.stmms.biz.common.BaseQuery;
-import cn.com.qmth.stmms.biz.distributpaper.model.TryLibrary;
-import cn.com.qmth.stmms.common.enums.ClassType;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-public class TryLibrarySearchQuery extends BaseQuery<TryLibrary> {
-
-    private int examId;
-
-    private int subjectId;
-
-    private ClassType classType;
-
-    private int blockId;
-
-    private int secretNo;
-
-    private int getter;
-
-    private LibraryStatus status;
-
-    private Date maxGetTime;
-
-    private Date minGetTime;
-
-    public int getExamId() {
-        return examId;
-    }
-
-    public void setExamId(int examId) {
-        this.examId = examId;
-    }
-
-    public int getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(int blockId) {
-        this.blockId = blockId;
-    }
-
-    public int getSecretNo() {
-        return secretNo;
-    }
-
-    public void setSecretNo(int secretNo) {
-        this.secretNo = secretNo;
-    }
-
-    public int getGetter() {
-        return getter;
-    }
-
-    public void setGetter(int getter) {
-        this.getter = getter;
-    }
-
-    public LibraryStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(LibraryStatus status) {
-        this.status = status;
-    }
-
-    public int getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(int subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public ClassType getClassType() {
-        return classType;
-    }
-
-    public void setClassType(ClassType classType) {
-        this.classType = classType;
-    }
-
-    public Date getMaxGetTime() {
-        return maxGetTime;
-    }
-
-    public void setMaxGetTime(Date maxGetTime) {
-        this.maxGetTime = maxGetTime;
-    }
-
-    public Date getMinGetTime() {
-        return minGetTime;
-    }
-
-    public void setMinGetTime(Date minGetTime) {
-        this.minGetTime = minGetTime;
-    }
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/CaseHistoryService.java

@@ -1,23 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.CaseHistory;
-
-public interface CaseHistoryService {
-
-    CaseHistory save(CaseHistory caseHistory);
-
-    CaseHistory findById(Integer id);
-
-    void deleteById(Integer id);
-
-    void delete(CaseHistory caseHistory);
-
-    List<CaseHistory> getHistoryByScorer(Integer examId, String subjectCode, Integer blockId, Integer scorer);
-
-    List<CaseHistory> findByExamIdAndSubjectIdAndBlockIdAndSchoolId(Integer examId, String subjectCode, Integer blockId);
-
-    public List<CaseHistory> findByLibraryId(int libraryId);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/CaseLibraryService.java

@@ -1,44 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.CaseLibrary;
-import cn.com.qmth.stmms.biz.subjectheader.query.CaseLibrarySearchQuery;
-
-public interface CaseLibraryService {
-
-    CaseLibrary save(CaseLibrary caseLibrary);
-
-    CaseLibrary findById(Integer id);
-
-    void deleteById(Integer id);
-
-    void delete(CaseLibrary caseLibrary);
-
-    List<CaseLibrary> findByExamIdAndBlockId(Integer examId, Integer blockId);
-
-    CaseLibrary findByBlockIdAndSecretNo(Integer blockId, Integer secretNo);
-
-    /**
-     * 累加领取数量
-     * 
-     * @param id
-     * @return
-     */
-    public CaseLibrary incrGetCount(Integer id);
-
-    public CaseLibrarySearchQuery findByQuery(CaseLibrarySearchQuery query);
-
-    /**
-     * 采样
-     * 
-     * @param examId
-     * @param subjectCode
-     * @param blockId
-     * @param count
-     * @param subjectheaderId
-     */
-    void example(int examId, String subjectCode, int blockId, int count, int subjectheaderId);
-
-    List<CaseLibrary> findByBlockId(int blockId);
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/FormallyHistoryService.java

@@ -1,31 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.FormallyHistory;
-import cn.com.qmth.stmms.biz.distributpaper.query.FormallyHistorySearchQuery;
-
-public interface FormallyHistoryService {
-
-    FormallyHistory save(FormallyHistory formallyHistory);
-
-    FormallyHistory findById(Integer id);
-
-    void deleteById(Integer id);
-
-    void delete(FormallyHistory formallyHistory);
-
-    List<FormallyHistory> getHistoryByScorer(Integer examId, Integer subjectId, Integer blockId, Integer scorer);
-
-    List<FormallyHistory> getHistoryByScorerAndIsChecked(Integer examId, Integer subjectId, Integer blockId,
-            Integer scorer, boolean isChecked);
-
-    FormallyHistorySearchQuery findByQuery(FormallyHistorySearchQuery query);
-
-    List<FormallyHistory> findByLibraryId(int libraryId);
-
-    public FormallyHistory findLastByLibraryId(int libraryId);
-
-    List<FormallyHistory> findByScorer(int markerId);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/FormallyLibraryService.java

@@ -1,47 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.FormallyLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.query.FormallyLibrarySearchQuery;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-public interface FormallyLibraryService {
-
-    FormallyLibrary save(FormallyLibrary formallyLibrary);
-
-    FormallyLibrary findById(Integer id);
-
-    void deleteById(Integer id);
-
-    void delete(FormallyLibrary formallyLibrary);
-
-    List<FormallyLibrary> findByExamIdAndBlockId(Integer examId, Integer blockId);
-
-    public long countByExamIdAndBlockId(Integer examId, Integer blockId);
-
-    List<FormallyLibrary> findByExamIdAndBlockIdAndStatus(Integer examId, Integer blockId, LibraryStatus status);
-
-    public long countByExamIdAndBlockIdAndStatus(Integer examId, Integer blockId, LibraryStatus status);
-
-    List<FormallyLibrary> findByBlockIdAndSecretNo(Integer blockId, Integer secretNo);
-
-    /**
-     * 查询打回试卷
-     * 
-     * @param examId
-     * @param blockId
-     * @param getter
-     * @param status
-     * @return
-     */
-    List<FormallyLibrary> findByExamIdAndBlockIdAndGetterAndStatus(int examId, int blockId, int getter,
-            LibraryStatus status);
-
-    public FormallyLibrarySearchQuery findByQuery(final FormallyLibrarySearchQuery query);
-
-    List<FormallyLibrary> randomCheck(int examId, String subjectCode);
-
-    List<FormallyLibrary> findByExamIdAndSubjectCodeAndBlockIdAndSecretNoAndStatus(int examId, String subjectCode, int blockId, int secretNo, LibraryStatus status);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/ProblemHistoryService.java

@@ -1,22 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.ProblemHistory;
-
-public interface ProblemHistoryService {
-
-    ProblemHistory save(ProblemHistory problemHistory);
-
-    ProblemHistory findById(Integer id);
-
-    void deleteById(Integer id);
-
-    void delete(ProblemHistory ProblemHistory);
-
-    List<ProblemHistory> findByExamIdAndSubjectIdAndStatusAndIsChecked(Integer examId, Integer subjectId,
-            Integer status, boolean isChecked);
-
-    List<ProblemHistory> findByExamIdAndSubjectIdAndBlockId(Integer examId, Integer subjectId, Integer blockId);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/ProblemLibraryService.java

@@ -1,39 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.ProblemHistory;
-import cn.com.qmth.stmms.biz.distributpaper.model.ProblemLibrary;
-import cn.com.qmth.stmms.biz.subjectheader.query.ProblemLibrarySearchQuery;
-
-public interface ProblemLibraryService {
-
-    ProblemLibrary save(ProblemLibrary problemLibrary);
-
-    ProblemLibrary findById(Integer id);
-
-    void deleteById(Integer id);
-
-    void delete(ProblemLibrary problemLibrary);
-
-    ProblemLibrarySearchQuery findByQuery(ProblemLibrarySearchQuery query);
-
-    void saveMark(ProblemHistory problemHistory);
-
-    /**
-     * 查询未处理仲裁卷
-     * 
-     * @param examId
-     * @param subjectCode
-     * @return
-     */
-    int findUntreated(Integer examId, String subjectCode);
-
-    /**
-     * 查询未处理仲裁卷(按照题块)
-     * 
-     * @param examId
-     * @param subjectiveBlockId
-     * @return
-     */
-    int findUntreatedByBlockId(Integer examId, Integer subjectiveBlockId);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/ProgressService.java

@@ -1,13 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service;
-
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-public interface ProgressService {
-
-    public Long formallyHistoryCount(Integer examId, String subjectCode, Integer blockId);
-
-    public Long formallyLibraryCount(Integer examId, String subjectCode, Integer blockId);
-
-    public long formallyLibraryMarkedCount(Integer examId, String subjectCode, Integer blockId, LibraryStatus status);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/StandardHistoryService.java

@@ -1,25 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.StandardHistory;
-
-public interface StandardHistoryService {
-
-    StandardHistory save(StandardHistory standardHistory);
-
-    StandardHistory findById(Integer id);
-
-    void deleteById(Integer id);
-
-    void delete(StandardHistory StandardHistory);
-
-    List<StandardHistory> getHistoryByScorer(Integer examId, String subjectCode, Integer blockId, Integer scorer);
-
-    List<StandardHistory> findByExamIdAndSubjectCodeAndBlockId(Integer examId, String subjectCode, Integer blockId);
-
-    public List<StandardHistory> findByLibraryId(int libraryId);
-
-    List<StandardHistory> findByScorer(Integer scorerId);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/StandardLibraryService.java

@@ -1,45 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.StandardLibrary;
-import cn.com.qmth.stmms.biz.subjectheader.query.StandardLibrarySearchQuery;
-import cn.com.qmth.stmms.common.enums.ClassType;
-
-public interface StandardLibraryService {
-
-    StandardLibrary save(StandardLibrary standardLibrary);
-
-    StandardLibrary findById(Integer id);
-
-    void deleteById(Integer id);
-
-    void delete(StandardLibrary standardLibrary);
-
-    List<StandardLibrary> findByExamIdAndBlockId(Integer examId, Integer blockId);
-
-    StandardLibrary findByBlockIdAndSecretNo(Integer blockId, Integer secretNo);
-
-    /**
-     * 累加领取数量
-     * 
-     * @param id
-     * @return
-     */
-    public StandardLibrary incrGetCount(Integer id);
-
-    public StandardLibrarySearchQuery findByQuery(StandardLibrarySearchQuery query);
-
-    /**
-     * 设置标准卷
-     * 
-     * @param examId
-     * @param subjectCode
-     * @param blockId
-     * @param count
-     * @param subjectheaderId
-     */
-    void example(int examId, String subjectCode,  int blockId, int count, int subjectheaderId);
-
-    List<StandardLibrary> findByBlockId(int blockId);
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/TryHistoryService.java

@@ -1,23 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.TryHistory;
-
-public interface TryHistoryService {
-
-    TryHistory save(TryHistory tryHistory);
-
-    TryHistory findById(Integer id);
-
-    void deleteById(Integer id);
-
-    void delete(TryHistory tryHistory);
-
-    List<TryHistory> getHistoryByScorer(Integer examId, Integer subjectId, Integer blockId, Integer scorer);
-
-    List<TryHistory> findByLibraryId(int libraryId);
-
-    TryHistory findLastByLibraryId(int libraryId);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/TryLibraryService.java

@@ -1,42 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.TryLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.query.TryLibrarySearchQuery;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-public interface TryLibraryService {
-
-    TryLibrary save(TryLibrary tryLibrary);
-
-    TryLibrary findById(Integer id);
-
-    void deleteById(Integer id);
-
-    void delete(TryLibrary tryLibrary);
-
-    List<TryLibrary> findByExamIdAndBlockId(Integer examId, Integer blockId);
-
-    List<TryLibrary> findByBlockIdAndSecretNo(Integer blockId, Integer secretNo);
-
-    /**
-     * 查询打回试卷
-     * 
-     * @param examId
-     * @param blockId
-     * @param getter
-     * @param status
-     * @return
-     */
-    List<TryLibrary> findByExamIdAndBlockIdAndGetterAndStatus(int examId, int blockId, int getter, LibraryStatus status);
-
-    List<TryLibrary> findByExamIdAndBlockIdAndStatus(int examId, int blockId, LibraryStatus status);
-
-    TryLibrarySearchQuery findByQuery(final TryLibrarySearchQuery query);
-
-    List<TryLibrary> randomCheck(int examId, String subjectCode);
-
-    List<TryLibrary> findByExamIdAndSubjectCodeAndBlockIdAndSecretNoAndStatus(int examId, String subjectCode, int blockId, int secretNo, LibraryStatus status);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/impl/CaseHistoryServiceImpl.java

@@ -1,66 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service.impl;
-
-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.distributpaper.dao.CaseHistoryDao;
-import cn.com.qmth.stmms.biz.distributpaper.dao.CaseLibraryDao;
-import cn.com.qmth.stmms.biz.distributpaper.model.CaseHistory;
-import cn.com.qmth.stmms.biz.distributpaper.model.CaseLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.service.CaseHistoryService;
-
-@Service
-public class CaseHistoryServiceImpl implements CaseHistoryService {
-
-    @Autowired
-    private CaseHistoryDao caseHistoryDao;
-
-    @Autowired
-    private CaseLibraryDao libraryDao;
-
-    @Transactional
-    public CaseHistory save(CaseHistory caseHistory) {
-        return caseHistoryDao.save(caseHistory);
-    }
-
-    public CaseHistory findById(Integer id) {
-        return caseHistoryDao.findOne(id);
-    }
-
-    @Transactional
-    public void deleteById(Integer id) {
-        caseHistoryDao.delete(id);
-    }
-
-    @Transactional
-    public void delete(CaseHistory caseHistory) {
-        caseHistoryDao.delete(caseHistory);
-    }
-
-    public List<CaseHistory> getHistoryByScorer(Integer examId, String subjectCode, Integer blockId, Integer scorer) {
-        List<CaseLibrary> list = libraryDao.findByExamIdAndBlockIdAndSubjectCode(examId, blockId, subjectCode);
-        if (list != null && list.size() > 0) {
-            return caseHistoryDao.findByLibraryIdAndScorer(list.get(0).getId(), scorer);
-        } else {
-            return null;
-        }
-    }
-
-    public List<CaseHistory> findByExamIdAndSubjectIdAndBlockIdAndSchoolId(Integer examId, String subjectCode,
-            Integer blockId) {
-        List<CaseLibrary> list = libraryDao.findByExamIdAndBlockIdAndSubjectCode(examId, blockId, subjectCode);
-        if (list != null && list.size() > 0) {
-            return caseHistoryDao.findByLibraryId(list.get(0).getId());
-        } else {
-            return null;
-        }
-    }
-
-    public List<CaseHistory> findByLibraryId(int libraryId) {
-        return caseHistoryDao.findByLibraryId(libraryId);
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/impl/CaseLibraryServiceImpl.java

@@ -1,188 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service.impl;
-
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Random;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import cn.com.qmth.stmms.biz.distributpaper.dao.CaseLibraryDao;
-import cn.com.qmth.stmms.biz.distributpaper.dao.FormallyLibraryDao;
-import cn.com.qmth.stmms.biz.distributpaper.model.CaseLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.model.FormallyLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.service.CaseLibraryService;
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-import cn.com.qmth.stmms.biz.exam.service.SubjectiveBlockService;
-import cn.com.qmth.stmms.biz.subjectheader.query.CaseLibrarySearchQuery;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-@Service
-public class CaseLibraryServiceImpl implements CaseLibraryService {
-
-    @Autowired
-    private CaseLibraryDao caseLibraryDao;
-
-    @Autowired
-    private FormallyLibraryDao formallyLibraryDao;
-
-    @Autowired
-    private SubjectiveBlockService subjectiveBlockService;
-
-    @Transactional
-    public CaseLibrary save(CaseLibrary caseLibrary) {
-        return caseLibraryDao.save(caseLibrary);
-    }
-
-    public CaseLibrary findById(Integer id) {
-        CaseLibrary caseLibrary = caseLibraryDao.findOne(id);
-        return buildCaseLibrary(caseLibrary);
-    }
-
-    @Transactional
-    public void deleteById(Integer id) {
-        caseLibraryDao.delete(id);
-    }
-
-    @Transactional
-    public void delete(CaseLibrary caseLibrary) {
-        caseLibraryDao.delete(caseLibrary);
-    }
-
-    public List<CaseLibrary> findByExamIdAndBlockId(Integer examId, Integer blockId) {
-        List<CaseLibrary> list = caseLibraryDao.findByExamIdAndBlockId(examId, blockId);
-        for (CaseLibrary caseLibrary : list) {
-            buildCaseLibrary(caseLibrary);
-        }
-        return list;
-    }
-
-    public CaseLibrary findByBlockIdAndSecretNo(Integer blockId, Integer secretNo) {
-        List<CaseLibrary> list = caseLibraryDao.findByBlockIdAndSecretNo(blockId, secretNo);
-        return list != null && list.size() > 0 ? list.get(0) : null;
-    }
-
-    @Transactional
-    public CaseLibrary incrGetCount(Integer id) {
-        caseLibraryDao.incrGetCount(id);
-        return findById(id);
-    }
-
-    @Override
-    public CaseLibrarySearchQuery findByQuery(final CaseLibrarySearchQuery query) {
-        Page<CaseLibrary> result = caseLibraryDao.findAll(new Specification<CaseLibrary>() {
-
-            @Override
-            public Predicate toPredicate(Root<CaseLibrary> root, CriteriaQuery<?> cQuery, CriteriaBuilder cb) {
-                List<Predicate> predicates = new LinkedList<Predicate>();
-                // EntityType<CaseLibrary> ci_ = root.getModel();
-
-                if (query.getExamId() != null) {
-                    predicates.add(cb.equal(root.get("examId"), query.getExamId()));
-                }
-                if (StringUtils.isNotEmpty(query.getSubjectCode())) {
-                    predicates.add(cb.equal(root.get("subjectCode"), query.getSubjectCode()));
-                }
-                if (query.getBlockId() != null) {
-                    predicates.add(cb.equal(root.get("blockId"), query.getBlockId()));
-                }
-
-                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
-                        .size()]));
-            }
-        }, query);
-        for (CaseLibrary caseLibrary : result) {
-            buildCaseLibrary(caseLibrary);
-        }
-        query.setResult(result.getContent());
-        query.setTotalCount(result.getTotalElements());
-        query.setTotalPage(result.getTotalPages());
-        return query;
-    }
-
-    @Override
-    @Transactional
-    public void example(int examId, String subjectCode, int blockId, int count, int subjectheaderId) {
-        List<FormallyLibrary> libList = formallyLibraryDao.findByExamIdAndSubjectCodeAndBlockId(examId, subjectCode,
-                blockId);
-        int size = libList.size();
-        int[] random = random(size);
-
-        for (int i : random) {
-            FormallyLibrary formally = libList.get(i);
-            CaseLibrary caseLib = new CaseLibrary();
-            caseLib.setBlockId(formally.getBlockId());
-            caseLib.setExamId(formally.getExamId());
-            caseLib.setGetCount(0);
-            caseLib.setPicCount(formally.getPicCount());
-            caseLib.setSampler(subjectheaderId);
-            caseLib.setSampleTime(new Date());
-            caseLib.setCampusCode(formally.getCampusCode());
-            caseLib.setSecretNo(formally.getSecretNo());
-            caseLib.setStatus(LibraryStatus.WAITING);
-            caseLib.setSubjectCode(formally.getSubjectCode());
-            caseLibraryDao.save(caseLib);
-        }
-    }
-
-    private int[] random(int size) {
-        int random[];
-        if (size < 10) {
-            random = new int[size];
-        } else {
-            random = new int[10];
-        }
-        // 全部初始化为-1
-        for (int i = 0; i < random.length; i++) {
-            random[i] = -1;
-        }
-
-        if (size > 0) {
-            Random rand = new Random();
-            int num = 0;
-            for (int i = 0; i < random.length; i++) {
-                do {
-                    num = rand.nextInt(size);
-                } while (!getDistinctNum(num, random));
-                random[i] = num;
-
-            }
-        }
-        return random;
-    }
-
-    private boolean getDistinctNum(int num, int[] random) {
-        boolean result = false;
-        for (int i = 0; i < random.length; i++) {
-            if (num == random[i]) {
-                result = false;
-                break;
-            } else {
-                result = true;
-            }
-        }
-        return result;
-    }
-
-    private CaseLibrary buildCaseLibrary(CaseLibrary caseLibrary) {
-        if (caseLibrary.getBlockId() != null) {
-            SubjectiveBlock subjectiveBlock = subjectiveBlockService.findBlockById(caseLibrary.getBlockId(), true);
-            caseLibrary.setSubjectiveBlock(subjectiveBlock);
-        }
-        return caseLibrary;
-    }
-
-    public List<CaseLibrary> findByBlockId(int blockId) {
-        return caseLibraryDao.findByBlockId(blockId);
-    }
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/impl/FormallyHistoryServiceImpl.java

@@ -1,167 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service.impl;
-
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.metamodel.EntityType;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import cn.com.qmth.stmms.biz.distributpaper.dao.FormallyHistoryDao;
-import cn.com.qmth.stmms.biz.distributpaper.model.FormallyHistory;
-import cn.com.qmth.stmms.biz.distributpaper.query.FormallyHistorySearchQuery;
-import cn.com.qmth.stmms.biz.distributpaper.service.FormallyHistoryService;
-import cn.com.qmth.stmms.biz.exam.model.Marker;
-import cn.com.qmth.stmms.biz.exam.service.MarkerService;
-
-@Service
-public class FormallyHistoryServiceImpl implements FormallyHistoryService {
-
-    @Autowired
-    private FormallyHistoryDao formallyHistoryDao;
-
-    @Autowired
-    private MarkerService markerService;
-
-    @Transactional
-    public FormallyHistory save(FormallyHistory formallyHistory) {
-        formallyHistoryDao.save(formallyHistory);
-        return buildFormallyHistory(formallyHistory);
-    }
-
-    public FormallyHistory findById(Integer id) {
-        FormallyHistory formallyHistory = formallyHistoryDao.findOne(id);
-        return buildFormallyHistory(formallyHistory);
-    }
-
-    @Transactional
-    public void deleteById(Integer id) {
-        formallyHistoryDao.delete(id);
-    }
-
-    @Transactional
-    public void delete(FormallyHistory formallyHistory) {
-        formallyHistoryDao.delete(formallyHistory);
-    }
-
-    public List<FormallyHistory> getHistoryByScorer(Integer examId, Integer subjectId, Integer blockId, Integer scorer) {
-        /*
-         * List<FormallyHistory> list = formallyHistoryDao
-         * .findByExamIdAndSubjectIdAndBlockIdAndSchoolIdAndScorer(examId,
-         * subjectId, blockId, schoolId, scorer); for (FormallyHistory
-         * formallyHistory : list) { buildFormallyHistory(formallyHistory); }
-         * return list;
-         */
-        return null;
-    }
-
-    public List<FormallyHistory> getHistoryByScorerAndIsChecked(Integer examId, Integer subjectId, Integer blockId,
-            Integer scorer, boolean isChecked) {
-        // List<FormallyHistory> list = formallyHistoryDao
-        // .findByExamIdAndSubjectIdAndBlockIdAndSchoolIdAndScorerAndIsChecked(examId,
-        // subjectId, blockId, schoolId, scorer, isChecked);
-        // for (FormallyHistory formallyHistory : list) {
-        // buildFormallyHistory(formallyHistory);
-        // }
-        // return list;
-        return null;
-
-    }
-
-    private FormallyHistory buildFormallyHistory(FormallyHistory formallyHistory) {
-        Marker marker = markerService.findById(formallyHistory.getScorer());
-        formallyHistory.setMarker(marker);
-        return formallyHistory;
-    }
-
-    public FormallyHistorySearchQuery findByQuery(final FormallyHistorySearchQuery query) {
-        Page<FormallyHistory> result = formallyHistoryDao.findAll(new Specification<FormallyHistory>() {
-
-            @Override
-            public Predicate toPredicate(Root<FormallyHistory> root, CriteriaQuery<?> cQuery, CriteriaBuilder cb) {
-                List<Predicate> predicates = new LinkedList<Predicate>();
-                EntityType<FormallyHistory> ci_ = root.getModel();
-                if (query.getLibraryId() != null) {
-                    predicates.add(cb.equal(root.get("libraryId"), query.getLibraryId()));
-                }
-                if (query.getStatus() != null) {
-                    predicates.add(cb.equal(root.get("status"), query.getStatus()));
-                }
-                if (query.getPaperNumber() != null) {
-                    predicates.add(cb.equal(root.get("paperNumber"), query.getPaperNumber()));
-                }
-                if (query.getBlockId() != null) {
-                    predicates.add(cb.equal(root.get("blockId"), query.getBlockId()));
-                }
-                if (query.getIsChecked() != null) {
-                    predicates.add(cb.equal(root.get("isChecked"), query.getIsChecked()));
-                }
-                // 发放时间处理
-                Predicate issueDate;
-
-                if (query.getStartTime() != null && query.getEndTime() != null) {
-                    Expression<Date> start = cb.literal(query.getStartTime());
-                    Expression<Date> end = cb.literal(query.getEndTime());
-                    issueDate = cb.between(root.get(ci_.getSingularAttribute("scoreTime", Date.class)), start, end);
-                    predicates.add(issueDate);
-                }
-
-                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
-                        .size()]));
-            }
-        }, query);
-
-        query.setResult(result.getContent());
-        query.setTotalCount(result.getTotalElements());
-        query.setTotalPage(result.getTotalPages());
-        List<FormallyHistory> list = query.getResult();
-        for (FormallyHistory formallyHistory : list) {
-            buildFormallyHistory(formallyHistory);
-        }
-        return query;
-    }
-
-    @Override
-    public List<FormallyHistory> findByLibraryId(int libraryId) {
-        List<FormallyHistory> list = formallyHistoryDao.findByLibraryId(libraryId,
-                new Sort(Direction.DESC, "scoreTime"));
-        for (FormallyHistory history : list) {
-            buildFormallyHistory(history);
-        }
-        return list;
-    }
-
-    @Override
-    public FormallyHistory findLastByLibraryId(int libraryId) {
-        FormallyHistorySearchQuery query = new FormallyHistorySearchQuery();
-        query.setLibraryId(libraryId);
-        query.setSort(new Sort(Direction.DESC, "scoreTime"));
-        query.setPageNumber(1);
-        query.setPageSize(1);
-        query = findByQuery(query);
-        if (query.getCurrentCount() > 0) {
-            return query.getResult().get(0);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public List<FormallyHistory> findByScorer(int markerId) {
-        List<FormallyHistory> list = formallyHistoryDao.findByScorer(markerId);
-        return list;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/impl/FormallyLibraryServiceImpl.java

@@ -1,191 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service.impl;
-
-import java.util.ArrayList;
-import java.util.Date;
-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.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-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.distributpaper.dao.FormallyLibraryDao;
-import cn.com.qmth.stmms.biz.distributpaper.model.FormallyLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.query.FormallyLibrarySearchQuery;
-import cn.com.qmth.stmms.biz.distributpaper.service.FormallyLibraryService;
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-import cn.com.qmth.stmms.biz.exam.service.SubjectiveBlockService;
-import cn.com.qmth.stmms.common.enums.ClassType;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-@Service
-public class FormallyLibraryServiceImpl extends BaseQueryService<FormallyLibrary> implements FormallyLibraryService {
-
-    @Autowired
-    private FormallyLibraryDao formallyLibraryDao;
-
-    @Autowired
-    private SubjectiveBlockService subjectiveBlockService;
-
-    @Transactional
-    public FormallyLibrary save(FormallyLibrary formallyLibrary) {
-        return formallyLibraryDao.save(formallyLibrary);
-    }
-
-    public FormallyLibrary findById(Integer id) {
-        return formallyLibraryDao.findOne(id);
-    }
-
-    @Transactional
-    public void deleteById(Integer id) {
-        formallyLibraryDao.delete(id);
-    }
-
-    @Transactional
-    public void delete(FormallyLibrary formallyLibrary) {
-        formallyLibraryDao.delete(formallyLibrary);
-    }
-
-    public List<FormallyLibrary> findByExamIdAndBlockId(Integer examId, Integer blockId) {
-        return formallyLibraryDao.findByExamIdAndBlockId(examId, blockId);
-    }
-
-    public long countByExamIdAndBlockId(Integer examId, Integer blockId) {
-        FormallyLibrarySearchQuery query = new FormallyLibrarySearchQuery();
-        query.setExamId(examId);
-        query.setBlockId(blockId);
-        return countByQuery(query);
-    }
-
-    public List<FormallyLibrary> findByExamIdAndBlockIdAndStatus(Integer examId, Integer blockId, LibraryStatus status) {
-        return formallyLibraryDao.findByExamIdAndBlockIdAndStatus(examId, blockId, status);
-    }
-
-    public long countByExamIdAndBlockIdAndStatus(Integer examId, Integer blockId, LibraryStatus status) {
-        FormallyLibrarySearchQuery query = new FormallyLibrarySearchQuery();
-        query.setExamId(examId);
-        query.setBlockId(blockId);
-        query.setStatus(status);
-        return countByQuery(query);
-    }
-
-    public List<FormallyLibrary> findByBlockIdAndSecretNo(Integer blockId, Integer secretNo) {
-        return formallyLibraryDao.findByBlockIdAndSecretNo(blockId, secretNo);
-    }
-
-    public List<FormallyLibrary> findByExamIdAndBlockIdAndGetterAndStatus(int examId, int blockId, int getter,
-            LibraryStatus status) {
-        return formallyLibraryDao.findByExamIdAndBlockIdAndGetterAndStatus(examId, blockId, getter, status);
-    }
-
-    public long countByQuery(final FormallyLibrarySearchQuery query) {
-        return formallyLibraryDao.count(new Specification<FormallyLibrary>() {
-
-            @Override
-            public Predicate toPredicate(Root<FormallyLibrary> root, CriteriaQuery<?> cQuery, CriteriaBuilder cb) {
-                List<Predicate> predicates = new LinkedList<Predicate>();
-                if (query.getExamId() > 0) {
-                    predicates.add(cb.equal(root.get("examId"), query.getExamId()));
-                }
-                if (query.getSubjectId() > 0) {
-                    predicates.add(cb.equal(root.get("subjectId"), query.getSubjectId()));
-                }
-                if (query.getClassType() != null) {
-                    predicates.add(cb.equal(root.get("classType").as(ClassType.class), query.getClassType()));
-                }
-                if (query.getBlockId() > 0) {
-                    predicates.add(cb.equal(root.get("blockId"), query.getBlockId()));
-                }
-                if (query.getSecretNo() > 0) {
-                    predicates.add(cb.equal(root.get("secretNo"), query.getSecretNo()));
-                }
-                if (query.getGetter() > 0) {
-                    predicates.add(cb.equal(root.get("getter"), query.getGetter()));
-                }
-                if (query.getStatus() != null) {
-                    predicates.add(cb.equal(root.get("status").as(LibraryStatus.class), query.getStatus()));
-                }
-                if (query.getMaxGetTime() != null) {
-                    predicates.add(cb.lessThanOrEqualTo(root.get("getTime").as(Date.class), query.getMaxGetTime()));
-                }
-                if (query.getMinGetTime() != null) {
-                    predicates.add(cb.greaterThan(root.get("getTime").as(Date.class), query.getMinGetTime()));
-                }
-
-                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
-                        .size()]));
-            }
-        });
-    }
-
-    public FormallyLibrarySearchQuery findByQuery(final FormallyLibrarySearchQuery query) {
-        checkQuery(query);
-
-        Page<FormallyLibrary> result = formallyLibraryDao.findAll(new Specification<FormallyLibrary>() {
-
-            @Override
-            public Predicate toPredicate(Root<FormallyLibrary> root, CriteriaQuery<?> cQuery, CriteriaBuilder cb) {
-                List<Predicate> predicates = new LinkedList<Predicate>();
-                if (query.getExamId() > 0) {
-                    predicates.add(cb.equal(root.get("examId"), query.getExamId()));
-                }
-                if (query.getSubjectId() > 0) {
-                    predicates.add(cb.equal(root.get("subjectId"), query.getSubjectId()));
-                }
-                if (query.getClassType() != null) {
-                    predicates.add(cb.equal(root.get("classType").as(ClassType.class), query.getClassType()));
-                }
-                if (query.getBlockId() > 0) {
-                    predicates.add(cb.equal(root.get("blockId"), query.getBlockId()));
-                }
-                if (query.getSecretNo() > 0) {
-                    predicates.add(cb.equal(root.get("secretNo"), query.getSecretNo()));
-                }
-                if (query.getGetter() > 0) {
-                    predicates.add(cb.equal(root.get("getter"), query.getGetter()));
-                }
-                if (query.getStatus() != null) {
-                    predicates.add(cb.equal(root.get("status").as(LibraryStatus.class), query.getStatus()));
-                }
-                if (query.getMaxGetTime() != null) {
-                    predicates.add(cb.lessThanOrEqualTo(root.get("getTime").as(Date.class), query.getMaxGetTime()));
-                }
-                if (query.getMinGetTime() != null) {
-                    predicates.add(cb.greaterThan(root.get("getTime").as(Date.class), query.getMinGetTime()));
-                }
-
-                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
-                        .size()]));
-            }
-        }, query);
-
-        fillResult(result, query);
-        return query;
-    }
-
-    @Override
-    public List<FormallyLibrary> randomCheck(int examId, String subjectCode) {
-        List<SubjectiveBlock> blockList = subjectiveBlockService.findBlockByExamIdAndSubjectCode(examId,subjectCode);
-        List<FormallyLibrary> list = new ArrayList<FormallyLibrary>();
-        for (SubjectiveBlock block : blockList) {
-            List<FormallyLibrary> formallyList = formallyLibraryDao.findByExamIdAndBlockIdAndStatusAndIsChecked(examId,
-                    block.getId(), LibraryStatus.MARKED, false);
-            list.addAll(formallyList);
-        }
-        return list;
-    }
-
-    @Override
-    public List<FormallyLibrary> findByExamIdAndSubjectCodeAndBlockIdAndSecretNoAndStatus(int examId,
-            String subjectCode, int blockId, int secretNo, LibraryStatus status) {
-        return formallyLibraryDao.findByExamIdAndSubjectCodeAndBlockIdAndSecretNoAndStatus(examId, subjectCode, blockId, secretNo, status);
-    }
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/impl/ProblemHistoryServiceImpl.java

@@ -1,56 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service.impl;
-
-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.distributpaper.dao.ProblemHistoryDao;
-import cn.com.qmth.stmms.biz.distributpaper.model.ProblemHistory;
-import cn.com.qmth.stmms.biz.distributpaper.service.ProblemHistoryService;
-
-@Service
-public class ProblemHistoryServiceImpl implements ProblemHistoryService {
-
-    @Autowired
-    private ProblemHistoryDao problemHistoryDao;
-
-    @Transactional
-    public ProblemHistory save(ProblemHistory problemHistory) {
-        return problemHistoryDao.save(problemHistory);
-    }
-
-    public ProblemHistory findById(Integer id) {
-        return problemHistoryDao.findOne(id);
-    }
-
-    @Transactional
-    public void deleteById(Integer id) {
-        problemHistoryDao.delete(id);
-    }
-
-    @Transactional
-    public void delete(ProblemHistory ProblemHistory) {
-        problemHistoryDao.delete(ProblemHistory);
-    }
-
-    public List<ProblemHistory> findByExamIdAndSubjectIdAndStatusAndIsChecked(Integer examId, Integer subjectId,
-            Integer status, boolean isChecked) {
-        /*
-         * return problemHistoryDao.
-         * findByExamIdAndSubjectIdAndStatusAndIsChecked(examId, subjectId,
-         * schoolId, status, isChecked);
-         */
-        return null;
-    }
-
-    public List<ProblemHistory> findByExamIdAndSubjectIdAndBlockId(Integer examId, Integer subjectId, Integer blockId) {
-        /*
-         * return problemHistoryDao.findByExamIdAndSubjectIdAndBlockId (examId,
-         * subjectId, schoolId, blockId);
-         */
-        return null;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/impl/ProblemLibraryServiceImpl.java

@@ -1,223 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service.impl;
-
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.metamodel.EntityType;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import cn.com.qmth.stmms.biz.distributpaper.dao.FormallyLibraryDao;
-import cn.com.qmth.stmms.biz.distributpaper.dao.ProblemHistoryDao;
-import cn.com.qmth.stmms.biz.distributpaper.dao.ProblemLibraryDao;
-import cn.com.qmth.stmms.biz.distributpaper.dao.TryLibraryDao;
-import cn.com.qmth.stmms.biz.distributpaper.model.FormallyLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.model.ProblemHistory;
-import cn.com.qmth.stmms.biz.distributpaper.model.ProblemLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.model.TryLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.service.ProblemLibraryService;
-import cn.com.qmth.stmms.biz.exam.model.Marker;
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-import cn.com.qmth.stmms.biz.exam.service.MarkerService;
-import cn.com.qmth.stmms.biz.exam.service.SubjectiveBlockService;
-import cn.com.qmth.stmms.biz.subjectheader.query.ProblemLibrarySearchQuery;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-@Service
-public class ProblemLibraryServiceImpl implements ProblemLibraryService {
-
-    @Autowired
-    private ProblemLibraryDao problemLibraryDao;
-
-    @Autowired
-    private ProblemHistoryDao problemHistoryDao;
-
-    @Autowired
-    private MarkerService markerService;
-
-    @Autowired
-    private SubjectiveBlockService subjectiveBlockService;
-
-    @Autowired
-    private TryLibraryDao tryLibraryDao;
-
-    @Autowired
-    private FormallyLibraryDao formallyLibraryDao;
-
-    @Transactional
-    public ProblemLibrary save(ProblemLibrary problemLibrary) {
-        problemLibraryDao.save(problemLibrary);
-        return buildProblemLibrary(problemLibrary);
-    }
-
-    public ProblemLibrary findById(Integer id) {
-        ProblemLibrary problemLibrary = problemLibraryDao.findOne(id);
-        return buildProblemLibrary(problemLibrary);
-    }
-
-    @Transactional
-    public void deleteById(Integer id) {
-        problemLibraryDao.delete(id);
-    }
-
-    @Transactional
-    public void delete(ProblemLibrary problemLibrary) {
-        problemLibraryDao.delete(problemLibrary);
-    }
-
-    public ProblemLibrarySearchQuery findByQuery(final ProblemLibrarySearchQuery query) {
-        Page<ProblemLibrary> result = problemLibraryDao.findAll(new Specification<ProblemLibrary>() {
-
-            @Override
-            public Predicate toPredicate(Root<ProblemLibrary> root, CriteriaQuery<?> cQuery, CriteriaBuilder cb) {
-                List<Predicate> predicates = new LinkedList<Predicate>();
-                EntityType<ProblemLibrary> ci_ = root.getModel();
-
-                if (query.getExamId() != null) {
-                    predicates.add(cb.equal(root.get("examId"), query.getExamId()));
-                }
-
-                if (StringUtils.isNotEmpty(query.getSubjectCode())) {
-                    predicates.add(cb.equal(root.get("subjectCode"), query.getSubjectCode()));
-                }
-
-                if (query.getSubmitter() != null) {
-                    predicates.add(cb.equal(root.get("submitter"), query.getSubmitter()));
-                }
-                if (query.getReason() != null) {
-                    predicates.add(cb.equal(root.get("reason"), query.getReason()));
-                }
-                if (query.getStatus() != null) {
-                    predicates.add(cb.equal(root.get("status").as(LibraryStatus.class),
-                            LibraryStatus.findByValue(query.getStatus())));
-                }
-                if (query.getPaperNumber() != null) {
-                    predicates.add(cb.equal(root.get("paperNumber"), query.getPaperNumber()));
-                }
-                if (query.getBlockId() != null) {
-                    predicates.add(cb.equal(root.get("blockId"), query.getBlockId()));
-                }
-                // 发放时间处理
-                Predicate issueDate;
-
-                if (query.getStartTime() != null && query.getEndTime() != null) {
-                    Expression<Date> start = cb.literal(query.getStartTime());
-                    Expression<Date> end = cb.literal(query.getEndTime());
-                    issueDate = cb.between(root.get(ci_.getSingularAttribute("submitTime", Date.class)), start, end);
-                    predicates.add(issueDate);
-                }
-
-                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
-                        .size()]));
-            }
-        }, query);
-        for (ProblemLibrary problemLibrary : result) {
-            buildProblemLibrary(problemLibrary);
-        }
-        query.setResult(result.getContent());
-        query.setTotalCount(result.getTotalElements());
-        query.setTotalPage(result.getTotalPages());
-        return query;
-    }
-
-    private ProblemLibrary buildProblemLibrary(ProblemLibrary problemLibrary) {
-        if (problemLibrary.getSubmitter() != null) {
-            int markerId = problemLibrary.getSubmitter();
-            Marker marker = markerService.findById(markerId);
-            problemLibrary.setMarker(marker);
-        }
-        if (problemLibrary.getBlockId() != null) {
-            SubjectiveBlock block = subjectiveBlockService.findBlockById(problemLibrary.getBlockId());
-            if (block != null) {
-                problemLibrary.setSubjectiveBlock(block);
-
-                // if (problemLibrary.getType() == LibraryType.TRY) {
-                // TryLibrary library =
-                // tryLibraryDao.findOne(problemLibrary.getLibraryId());
-                // problemLibrary.setPictureConfig(block.getPictureConfig());
-                // problemLibrary.setPictureUrls(PictureUrlBuilder.getSliceUrls(library.getExamId(),
-                // library.getCampusCode(), block.getSubjectCode(),
-                // library.getExamNumber(),
-                // library.getPicCount()));
-                // } else {
-                // FormallyLibrary library =
-                // formallyLibraryDao.findOne(problemLibrary.getLibraryId());
-                // problemLibrary.setPictureConfig(block.getPictureConfig());
-                // problemLibrary.setPictureUrls(PictureUrlBuilder.getSliceUrls(library.getExamId(),
-                // library.getCampusCode(), block.getSubjectCode(),
-                // library.getExamNumber(),
-                // library.getPicCount()));
-                // }
-            }
-        }
-        return problemLibrary;
-    }
-
-    @Override
-    public void saveMark(ProblemHistory problemHistory) {
-        ProblemLibrary library = problemLibraryDao.findOne(problemHistory.getLibraryId());
-        if (library.getType().getValue() == 1) {
-            TryLibrary tryLibrary = tryLibraryDao.findOne(library.getLibraryId());
-            tryLibrary.setStatus(LibraryStatus.MARKED);
-            tryLibraryDao.save(tryLibrary);
-        }
-
-        if (library.getType().getValue() == 2) {
-            FormallyLibrary formallyLibrary = formallyLibraryDao.findOne(library.getLibraryId());
-            formallyLibrary.setStatus(LibraryStatus.MARKED);
-            formallyLibraryDao.save(formallyLibrary);
-        }
-
-        library.setStatus(LibraryStatus.MARKED);
-        problemLibraryDao.save(library);
-
-        long spent = new Date().getTime() - problemHistory.getSpent();
-        problemHistory.setSpent(spent);
-        problemHistory.setStatus(LibraryStatus.MARKED);
-        problemHistory.setSubmitTime(new Date());
-        problemHistoryDao.save(problemHistory);
-
-    }
-
-    @Override
-    public int findUntreated(Integer examId, String subjectCode) {
-        int count = 0;
-        List<FormallyLibrary> formallyList = formallyLibraryDao.findByExamIdAndSubjectCodeAndStatus(examId,
-                subjectCode, LibraryStatus.EXCEPTION);
-        for (FormallyLibrary formally : formallyList) {
-            List<ProblemLibrary> markedList = problemLibraryDao.findByLibraryIdAndStatus(formally.getId(),
-                    LibraryStatus.WAITING);
-            if (markedList != null) {
-                count += markedList.size();
-            }
-        }
-        return count;
-    }
-
-    @Override
-    public int findUntreatedByBlockId(Integer examId, Integer subjectiveBlockId) {
-        int count = 0;
-        List<FormallyLibrary> formallyList = formallyLibraryDao.findByExamIdAndBlockIdAndStatus(examId,
-                subjectiveBlockId, LibraryStatus.EXCEPTION);
-        for (FormallyLibrary formally : formallyList) {
-            List<ProblemLibrary> markedList = problemLibraryDao.findByLibraryIdAndStatus(formally.getId(),
-                    LibraryStatus.WAITING);
-            if (markedList != null) {
-                count += markedList.size();
-            }
-        }
-        return count;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/impl/ProgressServiceImpl.java

@@ -1,41 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.stmms.biz.distributpaper.dao.FormallyHistoryDao;
-import cn.com.qmth.stmms.biz.distributpaper.dao.FormallyLibraryDao;
-import cn.com.qmth.stmms.biz.distributpaper.service.ProgressService;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-@Service
-public class ProgressServiceImpl implements ProgressService {
-
-    @Autowired
-    private FormallyHistoryDao formallyHistoryDao;
-
-    @Autowired
-    private FormallyLibraryDao formallyLibraryDao;
-
-    @Override
-    public Long formallyHistoryCount(Integer examId, String subjectCode, Integer blockId) {
-        /*
-         * return
-         * formallyHistoryDao.getCountByExamIdAndSchoolIdAndSubjectIdAndBlockId
-         * (examId, schoolId, subjectId, blockId);
-         */
-        return null;
-    }
-
-    @Override
-    public Long formallyLibraryCount(Integer examId, String subjectCode, Integer blockId) {
-
-        return formallyLibraryDao.getCountByExamIdAndSubjectCodeAndBlockId(examId, subjectCode, blockId);
-    }
-
-    @Override
-    public long formallyLibraryMarkedCount(Integer examId, String subjectCode, Integer blockId, LibraryStatus status) {
-        return formallyLibraryDao.getCountByExamIdAndSubjectCodeAndBlockIdAndStatus(examId, subjectCode, blockId, status);
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/impl/StandardHistoryServiceImpl.java

@@ -1,70 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service.impl;
-
-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.distributpaper.dao.StandardHistoryDao;
-import cn.com.qmth.stmms.biz.distributpaper.dao.StandardLibraryDao;
-import cn.com.qmth.stmms.biz.distributpaper.model.StandardHistory;
-import cn.com.qmth.stmms.biz.distributpaper.model.StandardLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.service.StandardHistoryService;
-
-@Service
-public class StandardHistoryServiceImpl implements StandardHistoryService {
-
-    @Autowired
-    private StandardHistoryDao standardHistoryDao;
-
-    @Autowired
-    private StandardLibraryDao libraryDao;
-
-    @Transactional
-    public StandardHistory save(StandardHistory standardHistory) {
-        return standardHistoryDao.save(standardHistory);
-    }
-
-    public StandardHistory findById(Integer id) {
-        return standardHistoryDao.findOne(id);
-    }
-
-    @Transactional
-    public void deleteById(Integer id) {
-        standardHistoryDao.delete(id);
-    }
-
-    @Transactional
-    public void delete(StandardHistory standardHistory) {
-        standardHistoryDao.delete(standardHistory);
-    }
-
-    public List<StandardHistory> getHistoryByScorer(Integer examId, String subjectCode, Integer blockId, Integer scorer) {
-        List<StandardLibrary> list = libraryDao.findByExamIdAndBlockIdAndSubjectCode(examId, blockId, subjectCode);
-        if (list != null && list.size() > 0) {
-            return standardHistoryDao.findByLibraryIdAndScorer(list.get(0).getId(), scorer);
-        } else {
-            return null;
-        }
-    }
-
-    public List<StandardHistory> findByExamIdAndSubjectCodeAndBlockId(Integer examId, String subjectCode, Integer blockId) {
-        List<StandardLibrary> list = libraryDao.findByExamIdAndBlockIdAndSubjectCode(examId, blockId, subjectCode);
-        if (list != null && list.size() > 0) {
-            return standardHistoryDao.findByLibraryId(list.get(0).getId());
-        } else {
-            return null;
-        }
-    }
-
-    public List<StandardHistory> findByLibraryId(int libraryId) {
-        return standardHistoryDao.findByLibraryId(libraryId);
-    }
-
-    @Override
-    public List<StandardHistory> findByScorer(Integer scorerId) {
-        return standardHistoryDao.findByScorer(scorerId);
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/impl/StandardLibraryServiceImpl.java

@@ -1,188 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service.impl;
-
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Random;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import cn.com.qmth.stmms.biz.distributpaper.dao.FormallyLibraryDao;
-import cn.com.qmth.stmms.biz.distributpaper.dao.StandardLibraryDao;
-import cn.com.qmth.stmms.biz.distributpaper.model.FormallyLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.model.StandardLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.service.StandardLibraryService;
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-import cn.com.qmth.stmms.biz.exam.service.SubjectiveBlockService;
-import cn.com.qmth.stmms.biz.subjectheader.query.StandardLibrarySearchQuery;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-@Service
-public class StandardLibraryServiceImpl implements StandardLibraryService {
-
-    @Autowired
-    private StandardLibraryDao standardLibraryDao;
-
-    @Autowired
-    private FormallyLibraryDao formallyLibraryDao;
-
-    @Autowired
-    private SubjectiveBlockService subjectiveBlockService;
-
-    @Transactional
-    public StandardLibrary save(StandardLibrary standardLibrary) {
-        return standardLibraryDao.save(standardLibrary);
-    }
-
-    public StandardLibrary findById(Integer id) {
-        StandardLibrary standardLibrary = standardLibraryDao.findOne(id);
-        return buildStandardLibrary(standardLibrary);
-    }
-
-    @Transactional
-    public void deleteById(Integer id) {
-        standardLibraryDao.delete(id);
-    }
-
-    @Transactional
-    public void delete(StandardLibrary standardLibrary) {
-        standardLibraryDao.delete(standardLibrary);
-    }
-
-    public List<StandardLibrary> findByExamIdAndBlockId(Integer examId, Integer blockId) {
-        List<StandardLibrary> list = standardLibraryDao.findByExamIdAndBlockId(examId, blockId);
-        for (StandardLibrary standardLibrary : list) {
-            buildStandardLibrary(standardLibrary);
-        }
-        return list;
-    }
-
-    public StandardLibrary findByBlockIdAndSecretNo(Integer blockId, Integer secretNo) {
-        List<StandardLibrary> list = standardLibraryDao.findByBlockIdAndSecretNo(blockId, secretNo);
-        return list != null && list.size() > 0 ? list.get(0) : null;
-    }
-
-    @Transactional
-    public StandardLibrary incrGetCount(Integer id) {
-        standardLibraryDao.incrGetCount(id);
-        return findById(id);
-    }
-
-    @Override
-    public StandardLibrarySearchQuery findByQuery(final StandardLibrarySearchQuery query) {
-        Page<StandardLibrary> result = standardLibraryDao.findAll(new Specification<StandardLibrary>() {
-
-            @Override
-            public Predicate toPredicate(Root<StandardLibrary> root, CriteriaQuery<?> cQuery, CriteriaBuilder cb) {
-                List<Predicate> predicates = new LinkedList<Predicate>();
-                // EntityType<CaseLibrary> ci_ = root.getModel();
-
-                if (query.getExamId() != null) {
-                    predicates.add(cb.equal(root.get("examId"), query.getExamId()));
-                }
-                if (StringUtils.isNotEmpty(query.getSubjectCode())) {
-                    predicates.add(cb.equal(root.get("subjectCode"), query.getSubjectCode()));
-                }
-                if (query.getBlockId() != null) {
-                    predicates.add(cb.equal(root.get("blockId"), query.getBlockId()));
-                }
-
-                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
-                        .size()]));
-            }
-        }, query);
-        for (StandardLibrary standardLibrary : result) {
-            buildStandardLibrary(standardLibrary);
-        }
-        query.setResult(result.getContent());
-        query.setTotalCount(result.getTotalElements());
-        query.setTotalPage(result.getTotalPages());
-        return query;
-    }
-
-    @Override
-    @Transactional
-    public void example(int examId, String subjectCode, int blockId, int count, int subjectheaderId) {
-        List<FormallyLibrary> libList = formallyLibraryDao.findByExamIdAndSubjectCodeAndBlockId(examId, subjectCode,
-                blockId);
-        int size = libList.size();
-        int[] random = random(count, size);
-
-        for (int i : random) {
-            FormallyLibrary formally = libList.get(i);
-            StandardLibrary standardLibrary = new StandardLibrary();
-            standardLibrary.setBlockId(formally.getBlockId());
-            standardLibrary.setExamId(formally.getExamId());
-            standardLibrary.setGetCount(0);
-            standardLibrary.setPicCount(formally.getPicCount());
-            standardLibrary.setCreator(subjectheaderId);
-            standardLibrary.setCreateTime(new Date());
-            standardLibrary.setCampusCode(formally.getCampusCode());
-            standardLibrary.setSecretNo(formally.getSecretNo());
-            standardLibrary.setStatus(LibraryStatus.WAITING);
-            standardLibrary.setSubjectCode(formally.getSubjectCode());
-            standardLibraryDao.save(standardLibrary);
-        }
-    }
-
-    private int[] random(int count, int size) {
-        int random[];
-        if (count < 10) {
-            random = new int[count];
-        } else {
-            random = new int[10];
-        }
-        // 全部初始化为-1
-        for (int i = 0; i < random.length; i++) {
-            random[i] = -1;
-        }
-
-        if (count > 0) {
-            Random rand = new Random();
-            int num = 0;
-            for (int i = 0; i < random.length; i++) {
-                do {
-                    num = rand.nextInt(size);
-                } while (!getDistinctNum(num, random));
-                random[i] = num;
-
-            }
-        }
-        return random;
-    }
-
-    private boolean getDistinctNum(int num, int[] random) {
-        boolean result = false;
-        for (int i = 0; i < random.length; i++) {
-            if (num == random[i]) {
-                result = false;
-                break;
-            } else {
-                result = true;
-            }
-        }
-        return result;
-    }
-
-    private StandardLibrary buildStandardLibrary(StandardLibrary standardLibrary) {
-        if (standardLibrary.getBlockId() != null) {
-            SubjectiveBlock subjectiveBlock = subjectiveBlockService.findBlockById(standardLibrary.getBlockId(), true);
-            standardLibrary.setSubjectiveBlock(subjectiveBlock);
-        }
-        return standardLibrary;
-    }
-
-    public List<StandardLibrary> findByBlockId(int blockId) {
-        return standardLibraryDao.findByBlockId(blockId);
-    }
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/impl/TryHistoryServiceImpl.java

@@ -1,149 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service.impl;
-
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.metamodel.EntityType;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import cn.com.qmth.stmms.biz.distributpaper.dao.TryHistoryDao;
-import cn.com.qmth.stmms.biz.distributpaper.dao.TryLibraryDao;
-import cn.com.qmth.stmms.biz.distributpaper.model.TryHistory;
-import cn.com.qmth.stmms.biz.distributpaper.model.TryLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.query.TryHistorySearchQuery;
-import cn.com.qmth.stmms.biz.distributpaper.service.TryHistoryService;
-import cn.com.qmth.stmms.biz.exam.model.Marker;
-import cn.com.qmth.stmms.biz.exam.service.MarkerService;
-
-@Service
-public class TryHistoryServiceImpl implements TryHistoryService {
-
-    @Autowired
-    private TryLibraryDao tryLibraryDao;
-
-    @Autowired
-    private TryHistoryDao tryHistoryDao;
-
-    @Autowired
-    private MarkerService markerService;
-
-    @Transactional
-    public TryHistory save(TryHistory tryHistory) {
-        return tryHistoryDao.save(tryHistory);
-    }
-
-    public TryHistory findById(Integer id) {
-        return tryHistoryDao.findOne(id);
-    }
-
-    @Transactional
-    public void deleteById(Integer id) {
-        tryHistoryDao.delete(id);
-    }
-
-    @Transactional
-    public void delete(TryHistory tryHistory) {
-        tryHistoryDao.delete(tryHistory);
-    }
-
-    public List<TryHistory> getHistoryByScorer(Integer examId, Integer subjectId, Integer blockId, Integer scorer) {
-        List<TryLibrary> libList = tryLibraryDao.findByExamIdAndBlockId(examId, blockId);
-        if (libList.size() > 0) {
-            TryLibrary lib = libList.get(0);
-            return tryHistoryDao.findByLibraryIdAndScorer(lib.getId(), scorer);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public List<TryHistory> findByLibraryId(int libraryId) {
-        List<TryHistory> list = tryHistoryDao.findByLibraryId(libraryId, new Sort(Direction.DESC, "scoreTime"));
-        for (TryHistory history : list) {
-            buildTryHistory(history);
-        }
-        return list;
-    }
-
-    @Override
-    public TryHistory findLastByLibraryId(int libraryId) {
-        TryHistorySearchQuery query = new TryHistorySearchQuery();
-        query.setLibraryId(libraryId);
-        query.setSort(new Sort(Direction.DESC, "scoreTime"));
-        query.setPageNumber(1);
-        query.setPageSize(1);
-        query = findByQuery(query);
-        if (query.getCurrentCount() > 0) {
-            return query.getResult().get(0);
-        } else {
-            return null;
-        }
-    }
-
-    public TryHistorySearchQuery findByQuery(final TryHistorySearchQuery query) {
-        Page<TryHistory> result = tryHistoryDao.findAll(new Specification<TryHistory>() {
-
-            @Override
-            public Predicate toPredicate(Root<TryHistory> root, CriteriaQuery<?> cQuery, CriteriaBuilder cb) {
-                List<Predicate> predicates = new LinkedList<Predicate>();
-                EntityType<TryHistory> ci_ = root.getModel();
-                if (query.getLibraryId() != null) {
-                    predicates.add(cb.equal(root.get("libraryId"), query.getLibraryId()));
-                }
-                if (query.getStatus() != null) {
-                    predicates.add(cb.equal(root.get("status"), query.getStatus()));
-                }
-                if (query.getPaperNumber() != null) {
-                    predicates.add(cb.equal(root.get("paperNumber"), query.getPaperNumber()));
-                }
-                if (query.getBlockId() != null) {
-                    predicates.add(cb.equal(root.get("blockId"), query.getBlockId()));
-                }
-                if (query.getIsChecked() != null) {
-                    predicates.add(cb.equal(root.get("isChecked"), query.getIsChecked()));
-                }
-                // 发放时间处理
-                Predicate issueDate;
-
-                if (query.getStartTime() != null && query.getEndTime() != null) {
-                    Expression<Date> start = cb.literal(query.getStartTime());
-                    Expression<Date> end = cb.literal(query.getEndTime());
-                    issueDate = cb.between(root.get(ci_.getSingularAttribute("scoreTime", Date.class)), start, end);
-                    predicates.add(issueDate);
-                }
-
-                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
-                        .size()]));
-            }
-        }, query);
-
-        query.setResult(result.getContent());
-        query.setTotalCount(result.getTotalElements());
-        query.setTotalPage(result.getTotalPages());
-        List<TryHistory> list = query.getResult();
-        for (TryHistory history : list) {
-            buildTryHistory(history);
-        }
-        return query;
-    }
-
-    private TryHistory buildTryHistory(TryHistory tryHistory) {
-        Marker marker = markerService.findById(tryHistory.getScorer());
-        tryHistory.setMarker(marker);
-        return tryHistory;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/distributpaper/service/impl/TryLibraryServiceImpl.java

@@ -1,137 +0,0 @@
-package cn.com.qmth.stmms.biz.distributpaper.service.impl;
-
-import java.util.ArrayList;
-import java.util.Date;
-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.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-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.distributpaper.dao.TryLibraryDao;
-import cn.com.qmth.stmms.biz.distributpaper.model.TryLibrary;
-import cn.com.qmth.stmms.biz.distributpaper.query.TryLibrarySearchQuery;
-import cn.com.qmth.stmms.biz.distributpaper.service.TryLibraryService;
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-import cn.com.qmth.stmms.biz.exam.service.SubjectiveBlockService;
-import cn.com.qmth.stmms.common.enums.ClassType;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-@Service
-public class TryLibraryServiceImpl extends BaseQueryService<TryLibrary> implements TryLibraryService {
-
-    @Autowired
-    private TryLibraryDao tryLibraryDao;
-
-    @Autowired
-    private SubjectiveBlockService subjectiveBlockService;
-
-    @Transactional
-    public TryLibrary save(TryLibrary tryLibrary) {
-        return tryLibraryDao.save(tryLibrary);
-    }
-
-    public TryLibrary findById(Integer id) {
-        return tryLibraryDao.findOne(id);
-    }
-
-    @Transactional
-    public void deleteById(Integer id) {
-        tryLibraryDao.delete(id);
-    }
-
-    @Transactional
-    public void delete(TryLibrary tryLibrary) {
-        tryLibraryDao.delete(tryLibrary);
-    }
-
-    public List<TryLibrary> findByExamIdAndBlockId(Integer examId, Integer blockId) {
-        return tryLibraryDao.findByExamIdAndBlockId(examId, blockId);
-    }
-
-    public List<TryLibrary> findByBlockIdAndSecretNo(Integer blockId, Integer secretNo) {
-        return tryLibraryDao.findByBlockIdAndSecretNo(blockId, secretNo);
-    }
-
-    public TryLibrarySearchQuery findByQuery(final TryLibrarySearchQuery query) {
-        checkQuery(query);
-
-        Page<TryLibrary> result = tryLibraryDao.findAll(new Specification<TryLibrary>() {
-
-            @Override
-            public Predicate toPredicate(Root<TryLibrary> root, CriteriaQuery<?> cQuery, CriteriaBuilder cb) {
-                List<Predicate> predicates = new LinkedList<Predicate>();
-                if (query.getExamId() > 0) {
-                    predicates.add(cb.equal(root.get("examId"), query.getExamId()));
-                }
-                if (query.getSubjectId() > 0) {
-                    predicates.add(cb.equal(root.get("subjectId"), query.getSubjectId()));
-                }
-                if (query.getClassType() != null) {
-                    predicates.add(cb.equal(root.get("classType").as(ClassType.class), query.getClassType()));
-                }
-                if (query.getBlockId() > 0) {
-                    predicates.add(cb.equal(root.get("blockId"), query.getBlockId()));
-                }
-                if (query.getSecretNo() > 0) {
-                    predicates.add(cb.equal(root.get("secretNo"), query.getSecretNo()));
-                }
-                if (query.getGetter() > 0) {
-                    predicates.add(cb.equal(root.get("getter"), query.getGetter()));
-                }
-                if (query.getStatus() != null) {
-                    predicates.add(cb.equal(root.get("status").as(LibraryStatus.class), query.getStatus()));
-                }
-                if (query.getMaxGetTime() != null) {
-                    predicates.add(cb.lessThanOrEqualTo(root.get("getTime").as(Date.class), query.getMaxGetTime()));
-                }
-                if (query.getMinGetTime() != null) {
-                    predicates.add(cb.greaterThan(root.get("getTime").as(Date.class), query.getMinGetTime()));
-                }
-                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
-                        .size()]));
-            }
-
-        }, query);
-        fillResult(result, query);
-        return query;
-    }
-
-    @Override
-    public List<TryLibrary> randomCheck(int examId, String subjectCode) {
-        List<SubjectiveBlock> blockList = subjectiveBlockService.findBlockByExamIdAndSubjectCode(examId,subjectCode);
-        List<TryLibrary> list = new ArrayList<TryLibrary>();
-        for (SubjectiveBlock block : blockList) {
-            List<TryLibrary> tryList = tryLibraryDao.findByExamIdAndBlockIdAndStatusAndIsChecked(examId, block.getId(),
-                    LibraryStatus.MARKED, false);
-
-            list.addAll(tryList);
-        }
-        return list;
-
-    }
-
-    public List<TryLibrary> findByExamIdAndBlockIdAndStatus(int examId, int blockId, LibraryStatus status) {
-        return tryLibraryDao.findByExamIdAndBlockIdAndStatus(examId, blockId, status);
-    }
-
-    public List<TryLibrary> findByExamIdAndBlockIdAndGetterAndStatus(int examId, int blockId, int getter,
-            LibraryStatus status) {
-        return tryLibraryDao.findByExamIdAndBlockIdAndGetterAndStatus(examId, blockId, getter, status);
-    }
-
-    @Override
-    public List<TryLibrary> findByExamIdAndSubjectCodeAndBlockIdAndSecretNoAndStatus(int examId,
-            String subjectCode, int blockId, int secretNo, LibraryStatus status) {
-        return tryLibraryDao.findByExamIdAndSubjectCodeAndBlockIdAndSecretNoAndStatus(examId, subjectCode, blockId, secretNo, status);
-    }
-}

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

@@ -1,6 +1,5 @@
 package cn.com.qmth.stmms.biz.exam.dao;
 
-
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
@@ -9,24 +8,22 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 import cn.com.qmth.stmms.biz.exam.model.ExamSubjectPaper;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-
-public interface ExamSubjectPaperDao extends PagingAndSortingRepository<ExamSubjectPaper, Integer>,
-        JpaSpecificationExecutor<ExamSubjectPaper> {
-	
-	@Query(value = "select GROUP_CONCAT(b.main_number SEPARATOR ';') mainNumber from ( select p.main_number from eb_exam_subject_paper p where 1=1"
-			+ " and p.exam_id = ?1 and p.`code` = ?2 GROUP BY p.main_number) b",nativeQuery=true)
-	public List<String> getMainNumbersByExamIdAndCode(int examId,String subjectCode);
-	
-	@Query(value = "select GROUP_CONCAT(b.main_number SEPARATOR ';') MainNumber from ( select p.main_number from eb_exam_subject_paper p where 1=1"
-			+ " and p.exam_id = ?1 and p.`code` = ?2 and p.is_objective = ?3) b",nativeQuery=true)
-	public List<String> getMainNumbersByExamIdAndCodeAndType(int examId,String subjectCode,int objective);
-	
-	
+
+public interface ExamSubjectPaperDao
+        extends PagingAndSortingRepository<ExamSubjectPaper, Integer>, JpaSpecificationExecutor<ExamSubjectPaper> {
+
+    @Query(value = "select GROUP_CONCAT(b.main_number SEPARATOR ';') mainNumber from ( select p.main_number from eb_exam_subject_paper p where 1=1"
+            + " and p.exam_id = ?1 and p.`code` = ?2 GROUP BY p.main_number) b", nativeQuery = true)
+    public List<String> getMainNumbersByExamIdAndCode(int examId, String subjectCode);
+
+    @Query(value = "select GROUP_CONCAT(b.main_number SEPARATOR ';') MainNumber from ( select p.main_number from eb_exam_subject_paper p where 1=1"
+            + " and p.exam_id = ?1 and p.`code` = ?2 and p.is_objective = ?3) b", nativeQuery = true)
+    public List<String> getMainNumbersByExamIdAndCodeAndType(int examId, String subjectCode, int objective);
+
     @Modifying
     @Query("delete from ExamSubjectPaper q where q.examId=?1 and q.code=?2 and q.objective=?3")
     public void deleteByExamAndCodeAndObjective(int examId, String subjectCode, int objective);
-    
+
     @Query("select count(*) from ExamSubjectPaper s where s.examId=?1 and s.code=?2 and s.objective=?3")
-    Long getExamSubjectPaperCountBy(Integer examId, String subjectCode,int objective); 
+    Long getExamSubjectPaperCountBy(Integer examId, String subjectCode, int objective);
 }

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

@@ -1,26 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.exam.model.MarkLevel;
-
-public interface MarkLevelDao extends PagingAndSortingRepository<MarkLevel, Integer> {
-
-    @Query("select m from MarkLevel m where m.pk.blockId=?1 and m.pk.stepNumber=?2 order by m.pk.number")
-    public List<MarkLevel> findByBlockIdAndStepNumber(int blockId, int stepNumber);
-
-    @Query("select m from MarkLevel m where m.pk.blockId=?1 and m.pk.stepNumber=?2 and m.pk.number=?3")
-    public List<MarkLevel> findByBlockIdAndStepNumberAndNumber(int blockId, int stepNumber, int levelNumber);
-
-    @Modifying
-    @Query("delete from MarkLevel m where m.pk.blockId=?1 and m.pk.stepNumber=?2")
-    public void deleteByBlockIdAndStepNumber(int blockId, int stepNumber);
-
-    @Modifying
-    @Query("delete from MarkLevel m where m.pk.blockId=?1")
-    public void deleteByBlockId(int blockId);
-}

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

@@ -1,22 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.exam.model.MarkStep;
-
-public interface MarkStepDao extends PagingAndSortingRepository<MarkStep, Integer> {
-
-    @Query("select m from MarkStep m where m.pk.blockId=?1 order by m.pk.number")
-    public List<MarkStep> findByBlockId(int blockId);
-
-    @Query("select m from MarkStep m where m.pk.blockId=?1 and m.pk.number=?2")
-    public List<MarkStep> findByBlockIdAndNumber(int blockId, int number);
-
-    @Modifying
-    @Query("delete from MarkStep m where m.pk.blockId=?1")
-    public void deleteByBlockId(int blockId);
-}

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

@@ -1,31 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.dao;
-
-import java.util.List;
-
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.exam.model.ObjectiveBlock;
-
-public interface ObjectiveBlockDao extends PagingAndSortingRepository<ObjectiveBlock, Integer>,
-        JpaSpecificationExecutor<ObjectiveBlock> {
-
-    @Query("select count(distinct o.number) from ObjectiveBlock o where o.examId=?1 and o.subjectCode=?2")
-    public long countByExamIdAndSubjectCode(int examId, String subjectCode);
-
-    @Query("select count(ms) from ObjectiveBlock ms where ms.id in ( select m.id from ObjectiveBlock m where m.examId=?1 group by m.subjectCode)")
-    public long countSubjectByExamId(int examId);
-
-    public List<ObjectiveBlock> findByExamIdAndSubjectCodeAndNumber(int examId, String subjectCode, int number);
-
-    public List<ObjectiveBlock> findByExamIdAndSubjectCode(int examId, String subjectCode, Sort sort);
-
-    public List<ObjectiveBlock> findByExamId(int examId);
-
-    @Modifying
-    @Query("delete from ObjectiveBlock o where o.examId=?1 and o.subjectCode=?2")
-    public void deleteByExamIdAndSubjectCode(int examId, String subjectCode);
-}

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

@@ -1,22 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.exam.model.ObjectiveQuestion;
-
-public interface ObjectiveQuestionDao extends PagingAndSortingRepository<ObjectiveQuestion, Integer> {
-
-    @Query("select q from ObjectiveQuestion q where q.pk.blockId=?1 order by q.pk.number asc")
-    public List<ObjectiveQuestion> findByBlockId(int blockId);
-
-    @Query("select q from ObjectiveQuestion q where q.pk.blockId=?1 and q.pk.number=?2")
-    public List<ObjectiveQuestion> findByBlockIdAndNumber(int blockId, int number);
-
-    @Modifying
-    @Query("delete from ObjectiveQuestion q where q.pk.blockId=?1")
-    public void deleteByBlockId(int blockId);
-}

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

@@ -1,32 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-
-public interface SubjectiveBlockDao extends PagingAndSortingRepository<SubjectiveBlock, Integer>,
-        JpaSpecificationExecutor<SubjectiveBlock> {
-
-    @Query("select count(o) from SubjectiveBlock o where o.examId=?1 and o.subjectCode=?2")
-    public long countByExamIdAndSubjectCode(int examId, String subjectCode);
-
-    @Query("select count(ms) from SubjectiveBlock ms where ms.id in ( select m.id from SubjectiveBlock m where m.examId=?1 group by m.subjectCode)")
-    public long countSubjectByExamId(int examId);
-
-    @Query("select o from SubjectiveBlock o where o.examId=?1 and o.subjectCode=?2 order by o.number")
-    public List<SubjectiveBlock> findByExamIdAndSubjectCode(int examId, String subjectCode);
-
-    public List<SubjectiveBlock> findByExamId(int examId);
-
-    public List<SubjectiveBlock> findByExamIdAndSubjectCodeAndNumber(int examId, String subjectCode, int number);
-
-    @Modifying
-    @Query("delete from SubjectiveBlock s where s.examId=?1 and s.subjectCode=?2")
-    public void deleteByExamIdAndSubjectCode(int examId, String subjectCode);
-
-}

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

@@ -13,8 +13,6 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.hibernate.annotations.GenericGenerator;
-
 import cn.com.qmth.stmms.common.enums.ExamStatus;
 
 @Entity

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

@@ -158,6 +158,9 @@ public class ExamStudent implements Serializable {
     @Column(name = "is_absent")
     private boolean absent;
 
+    /**
+     * 是否违纪
+     */
     @Column(name = "is_breach")
     private boolean breach;
 
@@ -248,19 +251,19 @@ public class ExamStudent implements Serializable {
 
     @Transient
     private String markTime;
-    
+
     /**
      * 主观题是否已经评卷完成
      */
     @Transient
     private boolean marked;
-    
+
     @Transient
     private int number;
-    
+
     @Transient
     private String markLogin;
-    
+
     @Transient
     private String markName;
 
@@ -643,37 +646,37 @@ public class ExamStudent implements Serializable {
         this.department = department;
     }
 
-	public boolean isMarked() {
-		return marked;
-	}
+    public boolean isMarked() {
+        return marked;
+    }
 
-	public void setMarked(boolean marked) {
-		this.marked = marked;
-	}
+    public void setMarked(boolean marked) {
+        this.marked = marked;
+    }
 
-	public int getNumber() {
-		return number;
-	}
+    public int getNumber() {
+        return number;
+    }
 
-	public void setNumber(int number) {
-		this.number = number;
-	}
+    public void setNumber(int number) {
+        this.number = number;
+    }
 
-	public String getMarkLogin() {
-		return markLogin;
-	}
+    public String getMarkLogin() {
+        return markLogin;
+    }
 
-	public void setMarkLogin(String markLogin) {
-		this.markLogin = markLogin;
-	}
+    public void setMarkLogin(String markLogin) {
+        this.markLogin = markLogin;
+    }
 
-	public String getMarkName() {
-		return markName;
-	}
+    public String getMarkName() {
+        return markName;
+    }
 
-	public void setMarkName(String markName) {
-		this.markName = markName;
-	}
+    public void setMarkName(String markName) {
+        this.markName = markName;
+    }
 
     public String getTagValue() {
         return tagValue;

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

@@ -7,102 +7,137 @@ import java.io.Serializable;
  */
 public class ExamSubjectPaperDTO implements Serializable {
 
-	private static final long serialVersionUID = 2457589654916634924L;
-	//题型名称
-	private String title;
-	//该题的大题号
-	private Integer mainNumber;
-	//该题的小题号
-	private Integer subNumber;
-	//有效个数
-	private Integer count;
-	//该题间隔分数
-	private Double intervalScore;
-	//该题分数
-	private Double socre;
-	//查考答案
-	private String answer;
-	//考试ID
-	private Long examId;
-	//课程代码
-	private String subjectCode;
-	//分数class名字
-	private String scoreClass;
-	//答案class名字
-	private String answerClass;
-    //1：客观；0：主观
+    private static final long serialVersionUID = 2457589654916634924L;
+
+    // 题型名称
+    private String title;
+
+    // 该题的大题号
+    private Integer mainNumber;
+
+    // 该题的小题号
+    private Integer subNumber;
+
+    // 有效个数
+    private Integer count;
+
+    // 该题间隔分数
+    private Double intervalScore;
+
+    // 该题分数
+    private Double socre;
+
+    // 查考答案
+    private String answer;
+
+    // 考试ID
+    private Long examId;
+
+    // 课程代码
+    private String subjectCode;
+
+    // 分数class名字
+    private String scoreClass;
+
+    // 答案class名字
+    private String answerClass;
+
+    // 1：客观；0：主观
     private Integer objective;
-	public String getTitle() {
-		return title;
-	}
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	public Integer getMainNumber() {
-		return mainNumber;
-	}
-	public void setMainNumber(Integer mainNumber) {
-		this.mainNumber = mainNumber;
-	}
-	
-	public Integer getSubNumber() {
-		return subNumber;
-	}
-	public void setSubNumber(Integer subNumber) {
-		this.subNumber = subNumber;
-	}
-	public Integer getCount() {
-		return count;
-	}
-	public void setCount(Integer count) {
-		this.count = count;
-	}
-	public Double getIntervalScore() {
-		return intervalScore;
-	}
-	public void setIntervalScore(Double intervalScore) {
-		this.intervalScore = intervalScore;
-	}
-	public Double getSocre() {
-		return socre;
-	}
-	public void setSocre(Double socre) {
-		this.socre = socre;
-	}
-	public String getAnswer() {
-		return answer;
-	}
-	public void setAnswer(String answer) {
-		this.answer = answer;
-	}
-	public Long getExamId() {
-		return examId;
-	}
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-	public String getSubjectCode() {
-		return subjectCode;
-	}
-	public void setSubjectCode(String subjectCode) {
-		this.subjectCode = subjectCode;
-	}
-	public String getScoreClass() {
-		return scoreClass;
-	}
-	public void setScoreClass(String scoreClass) {
-		this.scoreClass = scoreClass;
-	}
-	public String getAnswerClass() {
-		return answerClass;
-	}
-	public void setAnswerClass(String answerClass) {
-		this.answerClass = answerClass;
-	}
-	public Integer getObjective() {
-		return objective;
-	}
-	public void setObjective(Integer objective) {
-		this.objective = objective;
-	}
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Integer getMainNumber() {
+        return mainNumber;
+    }
+
+    public void setMainNumber(Integer mainNumber) {
+        this.mainNumber = mainNumber;
+    }
+
+    public Integer getSubNumber() {
+        return subNumber;
+    }
+
+    public void setSubNumber(Integer subNumber) {
+        this.subNumber = subNumber;
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
+    public Double getIntervalScore() {
+        return intervalScore;
+    }
+
+    public void setIntervalScore(Double intervalScore) {
+        this.intervalScore = intervalScore;
+    }
+
+    public Double getSocre() {
+        return socre;
+    }
+
+    public void setSocre(Double socre) {
+        this.socre = socre;
+    }
+
+    public String getAnswer() {
+        return answer;
+    }
+
+    public void setAnswer(String answer) {
+        this.answer = answer;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public String getSubjectCode() {
+        return subjectCode;
+    }
+
+    public void setSubjectCode(String subjectCode) {
+        this.subjectCode = subjectCode;
+    }
+
+    public String getScoreClass() {
+        return scoreClass;
+    }
+
+    public void setScoreClass(String scoreClass) {
+        this.scoreClass = scoreClass;
+    }
+
+    public String getAnswerClass() {
+        return answerClass;
+    }
+
+    public void setAnswerClass(String answerClass) {
+        this.answerClass = answerClass;
+    }
+
+    public Integer getObjective() {
+        return objective;
+    }
+
+    public void setObjective(Integer objective) {
+        this.objective = objective;
+    }
 }

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

@@ -1,173 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-@Entity
-@Table(name = "eb_mark_level")
-public class MarkLevel implements Serializable {
-
-    private static final long serialVersionUID = 6710328491557700440L;
-
-    @EmbeddedId
-    private MarkLevelPK pk;
-
-    private String name;
-
-    private Double min;
-
-    private Double max;
-
-    @Transient
-    private double[] scoreList;
-
-    public MarkLevel() {
-        this.pk = new MarkLevelPK();
-    }
-
-    public Integer getBlockId() {
-        return this.pk.getBlockId();
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.pk.setBlockId(blockId);
-    }
-
-    public Integer getStepNumber() {
-        return this.pk.getStepNumber();
-    }
-
-    public void setStepNumber(Integer stepNumber) {
-        this.pk.setStepNumber(stepNumber);
-    }
-
-    public Integer getNumber() {
-        return pk.getNumber();
-    }
-
-    public void setNumber(Integer number) {
-        this.pk.setNumber(number);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Double getMin() {
-        return min;
-    }
-
-    public void setMin(Double min) {
-        this.min = min;
-    }
-
-    public Double getMax() {
-        return max;
-    }
-
-    public void setMax(Double max) {
-        this.max = max;
-    }
-
-    public double[] getScoreList() {
-        return scoreList;
-    }
-
-    public void setScoreList(double[] scoreList) {
-        this.scoreList = scoreList;
-    }
-
-}
-
-@Embeddable
-class MarkLevelPK implements Serializable {
-
-    private static final long serialVersionUID = -5296472857826912303L;
-
-    @Column(name = "block_id")
-    private Integer blockId;
-
-    @Column(name = "step_number")
-    private Integer stepNumber;
-
-    private Integer number;
-
-    public MarkLevelPK() {
-
-    }
-
-    @Override
-    public int hashCode() {
-        final int PRIME = 31;
-        int result = 1;
-        result = PRIME * result + ((blockId == null) ? 0 : blockId.hashCode());
-        result = PRIME * result + ((stepNumber == null) ? 0 : stepNumber.hashCode());
-        result = PRIME * result + ((number == null) ? 0 : number.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        final MarkLevelPK other = (MarkLevelPK) obj;
-        if (blockId == null) {
-            if (other.blockId != null)
-                return false;
-        } else if (!blockId.equals(other.blockId)) {
-            return false;
-        }
-        if (stepNumber == null) {
-            if (other.stepNumber != null)
-                return false;
-        } else if (!stepNumber.equals(other.stepNumber)) {
-            return false;
-        }
-        if (number == null) {
-            if (other.number != null)
-                return false;
-        } else if (!number.equals(other.number)) {
-            return false;
-        }
-        return true;
-    }
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public Integer getStepNumber() {
-        return stepNumber;
-    }
-
-    public void setStepNumber(Integer stepNumber) {
-        this.stepNumber = stepNumber;
-    }
-
-}

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

@@ -1,261 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.model;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import org.apache.commons.lang.StringUtils;
-
-@Entity
-@Table(name = "eb_mark_step")
-public class MarkStep implements Serializable {
-
-    private static final long serialVersionUID = -4181588561648925132L;
-
-    @EmbeddedId
-    private MarkStepPK pk;
-
-    @Column(name = "title")
-    private String title;
-
-    @Column(name = "has_level")
-    private boolean hasLevel;
-
-    @Column(name = "total_score")
-    private Double totalScore;
-
-    @Column(name = "max")
-    private Double max;
-
-    @Column(name = "min")
-    private Double min;
-
-    @Column(name = "default_score")
-    private Double defaultScore;
-
-    @Column(name = "score_interval")
-    private Double interval;
-
-    @Column(name = "score_list")
-    private String scoreList;
-
-    private String remark;
-
-    @Transient
-    private List<MarkLevel> markLevelList;
-
-    public MarkStep() {
-        this.pk = new MarkStepPK();
-    }
-
-    public Integer getBlockId() {
-        return pk.getBlockId();
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.pk.setBlockId(blockId);
-    }
-
-    public Integer getNumber() {
-        return pk.getNumber();
-    }
-
-    public void setNumber(Integer number) {
-        this.pk.setNumber(number);
-    }
-
-    public boolean isHasLevel() {
-        return hasLevel;
-    }
-
-    public void setHasLevel(boolean hasLevel) {
-        this.hasLevel = hasLevel;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public Double getMax() {
-        return max;
-    }
-
-    public void setMax(Double max) {
-        this.max = max;
-    }
-
-    public Double getMin() {
-        return min;
-    }
-
-    public void setMin(Double min) {
-        this.min = min;
-    }
-
-    public Double getDefaultScore() {
-        return defaultScore;
-    }
-
-    public void setDefaultScore(Double defaultScore) {
-        this.defaultScore = defaultScore;
-    }
-
-    public double[] getScoreArray() {
-        String[] values = StringUtils.split(StringUtils.trimToEmpty(scoreList), ",");
-        if (values != null && values.length > 0) {
-            List<Double> list = new ArrayList<Double>(values.length);
-            for (String value : values) {
-                try {
-                    list.add(Double.valueOf(value));
-                } catch (Exception e) {
-                    continue;
-                }
-            }
-            int length = list.size();
-            if (length > 0) {
-                double[] array = new double[length];
-                for (int i = 0; i < length; i++) {
-                    array[i] = list.get(i);
-                }
-                return array;
-            }
-        }
-        return null;
-    }
-
-    public String getScoreList() {
-        return scoreList;
-    }
-
-    public void setScoreList(String scoreList) {
-        this.scoreList = scoreList;
-    }
-
-    public void setScoreList(double[] scoreList) {
-        if (scoreList != null && scoreList.length > 0) {
-            List<String> list = new LinkedList<String>();
-            for (double value : scoreList) {
-                list.add(String.valueOf(value));
-            }
-            this.scoreList = StringUtils.join(list, ",");
-        }
-    }
-
-    public void setScoreList(List<Double> scoreList) {
-        if (scoreList != null && scoreList.size() > 0) {
-            List<String> list = new LinkedList<String>();
-            for (double value : scoreList) {
-                list.add(String.valueOf(value));
-            }
-            this.scoreList = StringUtils.join(list, ",");
-        }
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public List<MarkLevel> getMarkLevelList() {
-        return markLevelList;
-    }
-
-    public void setMarkLevelList(List<MarkLevel> markLevelList) {
-        this.markLevelList = markLevelList;
-    }
-
-    public Double getInterval() {
-        return interval;
-    }
-
-    public void setInterval(Double interval) {
-        this.interval = interval;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-}
-
-@Embeddable
-class MarkStepPK implements Serializable {
-
-    private static final long serialVersionUID = 4051005509820926166L;
-
-    @Column(name = "block_id")
-    private Integer blockId;
-
-    private Integer number;
-
-    public MarkStepPK() {
-
-    }
-
-    @Override
-    public int hashCode() {
-        final int PRIME = 31;
-        int result = 1;
-        result = PRIME * result + ((blockId == null) ? 0 : blockId.hashCode());
-        result = PRIME * result + ((number == null) ? 0 : number.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        final MarkStepPK other = (MarkStepPK) obj;
-        if (blockId == null) {
-            if (other.blockId != null)
-                return false;
-        } else if (!blockId.equals(other.blockId))
-            return false;
-        if (number == null) {
-            if (other.number != null)
-                return false;
-        } else if (!number.equals(other.number))
-            return false;
-        return true;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-}

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

@@ -76,8 +76,8 @@ public class Marker implements Serializable {
     private long currentCount;
 
     @Column(name = "top_count")
-    private String topCount;
-    
+    private Integer topCount;
+
     public Integer getId() {
         return id;
     }
@@ -235,11 +235,11 @@ public class Marker implements Serializable {
         this.mode = mode;
     }
 
-    public String getTopCount() {
+    public Integer getTopCount() {
         return topCount;
     }
 
-    public void setTopCount(String topCount) {
+    public void setTopCount(Integer topCount) {
         this.topCount = topCount;
     }
 }

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

@@ -1,47 +1,61 @@
 package cn.com.qmth.stmms.biz.exam.model;
 
-import cn.com.qmth.stmms.common.annotation.ExcelField;
-
 import java.io.Serializable;
 
+import cn.com.qmth.stmms.common.annotation.ExcelField;
+
 public class MarkerDTO implements Serializable {
+
     private static final long serialVersionUID = 9026500878343612005L;
 
-    //评卷员主键
+    // 评卷员主键
     private Integer markerId;
-    //评卷员姓名
+
+    // 评卷员姓名
     private String name;
-    //评卷登录号(旧)
+
+    // 评卷登录号(旧)
     @ExcelField(title = "原评卷员(必填)", align = 2, sort = 20)
     private String loginName;
-    //评卷登录号(新)
+
+    // 评卷登录号(新)
     @ExcelField(title = "新评卷员(必填)", align = 2, sort = 30)
     private String newLoginName;
-    //评卷账号密码
+
+    // 评卷账号密码
     @ExcelField(title = "新评卷员密码(必填)", align = 2, sort = 40)
     private String password;
-    //分配课程数
+
+    // 分配课程数
     private long subjectCount;
-    //完成课程数
+
+    // 完成课程数
     private long finishedCount;
-    //完成数量
+
+    // 完成数量
     private long markedCount;
-    //最高分
+
+    // 最高分
     private Double maxScore;
-    //最低分
+
+    // 最低分
     private Double minScore;
-    //平均分
+
+    // 平均分
     private Double avgScore;
-    //课程代码
+
+    // 课程代码
     @ExcelField(title = "科目代码(必填)", align = 2, sort = 10)
     private String subjectCode;
-    //课程名称
+
+    // 课程名称
     private String subjectName;
-    //回评个数
+
+    // 回评个数
     private long rejectCount;
-    //考试Id
-    private int examId;
 
+    // 考试Id
+    private int examId;
 
     public MarkerDTO() {
     }

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

@@ -1,183 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.model;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-@Entity
-@Table(name = "eb_objective_block")
-public class ObjectiveBlock implements Serializable {
-
-    private static final long serialVersionUID = 4755460059291973325L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    @Column(name = "exam_id")
-    private Integer examId;
-
-    @Column(name = "subject_code")
-    private String subjectCode;
-
-    @Column(name = "number")
-    private Integer number;
-
-    @Column(name = "title")
-    private String title;
-
-    @Column(name = "question_score")
-    private Double questionScore;
-
-    @Column(name = "question_count")
-    private Integer questionCount;
-
-    @Column(name = "is_single")
-    private boolean single;
-
-    @Column(name = "option_count")
-    private Integer optionCount;
-
-    @Column(name = "miss_score")
-    private Double missScore;
-
-    @Column(name = "is_selective")
-    private boolean isSelective;
-
-    @Column(name = "select_count")
-    private Integer selectCount;
-
-    @Transient
-    private List<ObjectiveQuestion> questionList;
-
-    @Transient
-    private ExamSubject examSubject;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public Integer getOptionCount() {
-        return optionCount;
-    }
-
-    public void setOptionCount(Integer optionCount) {
-        this.optionCount = optionCount;
-    }
-
-    public boolean isSelective() {
-        return isSelective;
-    }
-
-    public void setSelective(boolean isSelective) {
-        this.isSelective = isSelective;
-    }
-
-    public Integer getSelectCount() {
-        return selectCount;
-    }
-
-    public void setSelectCount(Integer selectCount) {
-        this.selectCount = selectCount;
-    }
-
-    public List<ObjectiveQuestion> getQuestionList() {
-        return questionList;
-    }
-
-    public void setQuestionList(List<ObjectiveQuestion> questionList) {
-        this.questionList = questionList;
-    }
-
-    public Double getMissScore() {
-        return missScore;
-    }
-
-    public void setMissScore(Double missScore) {
-        this.missScore = missScore;
-    }
-
-    public ExamSubject getExamSubject() {
-        return examSubject;
-    }
-
-    public void setExamSubject(ExamSubject examSubject) {
-        this.examSubject = examSubject;
-    }
-
-    public double getTotalScore() {
-        return questionScore * (isSelective ? selectCount : questionCount);
-    }
-
-    public Integer getQuestionCount() {
-        return questionCount;
-    }
-
-    public void setQuestionCount(Integer questionCount) {
-        this.questionCount = questionCount;
-    }
-
-    public Double getQuestionScore() {
-        return questionScore;
-    }
-
-    public void setQuestionScore(Double questionScore) {
-        this.questionScore = questionScore;
-    }
-
-    public void updateQuestionCount() {
-        if (this.questionList != null) {
-            this.questionCount = this.questionList.size();
-        }
-    }
-
-    public boolean isSingle() {
-        return single;
-    }
-
-    public void setSingle(boolean single) {
-        this.single = single;
-    }
-}

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

@@ -1,122 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "eb_objective_question")
-public class ObjectiveQuestion implements Serializable {
-
-    private static final long serialVersionUID = 3741809791151768467L;
-
-    @EmbeddedId
-    private ObjectiveQuestionPK pk;
-
-    private String title;
-
-    private String answer;
-
-    public ObjectiveQuestion() {
-        this.pk = new ObjectiveQuestionPK();
-    }
-
-    public Integer getBlockId() {
-        return pk.getBlockId();
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.pk.setBlockId(blockId);
-    }
-
-    public Integer getNumber() {
-        return pk.getNumber();
-    }
-
-    public void setNumber(Integer number) {
-        this.pk.setNumber(number);
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getAnswer() {
-        return answer;
-    }
-
-    public void setAnswer(String answer) {
-        this.answer = answer;
-    }
-
-}
-
-@Embeddable
-class ObjectiveQuestionPK implements Serializable {
-
-    private static final long serialVersionUID = 7792928307824264023L;
-
-    @Column(name = "block_id")
-    private Integer blockId;
-
-    private Integer number;
-
-    public ObjectiveQuestionPK() {
-
-    }
-
-    @Override
-    public int hashCode() {
-        final int PRIME = 31;
-        int result = 1;
-        result = PRIME * result + ((blockId == null) ? 0 : blockId.hashCode());
-        result = PRIME * result + ((number == null) ? 0 : number.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        final ObjectiveQuestionPK other = (ObjectiveQuestionPK) obj;
-        if (blockId == null) {
-            if (other.blockId != null)
-                return false;
-        } else if (!blockId.equals(other.blockId))
-            return false;
-        if (number == null) {
-            if (other.number != null)
-                return false;
-        } else if (!number.equals(other.number))
-            return false;
-        return true;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-}

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

@@ -1,285 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.model;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-@Entity
-@Table(name = "eb_subjective_block")
-public class SubjectiveBlock implements Serializable {
-
-    private static final long serialVersionUID = 3197160699047369929L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    @Column(name = "exam_id")
-    private Integer examId;
-
-    @Column(name = "subject_code")
-    private String subjectCode;
-
-    @Column(name = "number")
-    private Integer number;
-
-    @Column(name = "title ")
-    private String title;
-
-    @Column(name = "total_score")
-    private Double totalScore;
-
-    @Column(name = "mistake_value")
-    private Double mistakeValue;
-
-    @Column(name = "re_mark_percent")
-    private Double reMarkPercent;
-
-    @Column(name = "mark_self_frequency")
-    private Integer markSelfFrequency;
-
-    @Column(name = "standard_frequency")
-    private Integer standardFrequency;
-
-    @Column(name = "is_avg")
-    private boolean avg;
-
-    @Column(name = "picture_config")
-    private String pictureConfig;
-
-    @Column(name = "selective_group_id")
-    private Integer selectiveGroupId;
-
-    @Column(name = "selective_group_index")
-    private Integer selectiveGroupIndex;
-
-    @Column(name = "step_count")
-    private Integer stepCount;
-
-    @Transient
-    private Integer selectiveGroupNumber;
-
-    @Transient
-    private List<MarkStep> markStepList;
-
-    @Transient
-    private long markerCount;
-
-    @Transient
-    private long totalCount;
-
-    @Transient
-    private long markedCount;
-
-    @Transient
-    private String markedPercent;
-
-    @Transient
-    private int toDispatchedCount;
-
-    @Transient
-    private ExamSubject examSubject;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public Double getMistakeValue() {
-        return mistakeValue;
-    }
-
-    public void setMistakeValue(Double mistakeValue) {
-        this.mistakeValue = mistakeValue;
-    }
-
-    public Double getReMarkPercent() {
-        return reMarkPercent;
-    }
-
-    public void setReMarkPercent(Double reMarkPercent) {
-        this.reMarkPercent = reMarkPercent;
-    }
-
-    public Integer getMarkSelfFrequency() {
-        return markSelfFrequency;
-    }
-
-    public void setMarkSelfFrequency(Integer markSelfFrequency) {
-        this.markSelfFrequency = markSelfFrequency;
-    }
-
-    public Integer getStandardFrequency() {
-        return standardFrequency;
-    }
-
-    public void setStandardFrequency(Integer standardFrequency) {
-        this.standardFrequency = standardFrequency;
-    }
-
-    public Integer getSelectiveGroupId() {
-        return selectiveGroupId;
-    }
-
-    public void setSelectiveGroupId(Integer selectiveGroupId) {
-        this.selectiveGroupId = selectiveGroupId;
-    }
-
-    public List<MarkStep> getMarkStepList() {
-        return markStepList;
-    }
-
-    public void setMarkStepList(List<MarkStep> markStepList) {
-        this.markStepList = markStepList;
-    }
-
-    public long getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(long totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public int getToDispatchedCount() {
-        return toDispatchedCount;
-    }
-
-    public void setToDispatchedCount(int toDispatchedCount) {
-        this.toDispatchedCount = toDispatchedCount;
-    }
-
-    public Integer getSelectiveGroupNumber() {
-        return selectiveGroupNumber;
-    }
-
-    public void setSelectiveGroupNumber(Integer selectiveGroupNumber) {
-        this.selectiveGroupNumber = selectiveGroupNumber;
-    }
-
-    public Integer getSelectiveGroupIndex() {
-        return selectiveGroupIndex;
-    }
-
-    public void setSelectiveGroupIndex(Integer selectiveGroupIndex) {
-        this.selectiveGroupIndex = selectiveGroupIndex;
-    }
-
-    public String getPictureConfig() {
-        return pictureConfig;
-    }
-
-    public void setPictureConfig(String pictureConfig) {
-        this.pictureConfig = pictureConfig;
-    }
-
-    public ExamSubject getExamSubject() {
-        return examSubject;
-    }
-
-    public void setExamSubject(ExamSubject examSubject) {
-        this.examSubject = examSubject;
-    }
-
-    public void updateTotalScore() {
-        if (markStepList != null && markStepList.size() > 0) {
-            double score = 0d;
-            int count = 0;
-            for (MarkStep step : markStepList) {
-                score += step.getTotalScore();
-                count++;
-            }
-            this.totalScore = score;
-            this.stepCount = count;
-        }
-    }
-
-    public long getMarkedCount() {
-        return markedCount;
-    }
-
-    public void setMarkedCount(long markedCount) {
-        this.markedCount = markedCount;
-    }
-
-    public String getMarkedPercent() {
-        return markedPercent;
-    }
-
-    public void setMarkedPercent(String markedPercent) {
-        this.markedPercent = markedPercent;
-    }
-
-    public long getMarkerCount() {
-        return markerCount;
-    }
-
-    public void setMarkerCount(long markerCount) {
-        this.markerCount = markerCount;
-    }
-
-    public boolean isAvg() {
-        return avg;
-    }
-
-    public void setAvg(boolean avg) {
-        this.avg = avg;
-    }
-
-    public Integer getStepCount() {
-        return stepCount;
-    }
-
-    public void setStepCount(Integer stepCount) {
-        this.stepCount = stepCount;
-    }
-}

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

@@ -1,28 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.query;
-
-import cn.com.qmth.stmms.biz.common.BaseQuery;
-import cn.com.qmth.stmms.biz.exam.model.ObjectiveBlock;
-
-public class ObjectiveBlockSearchQuery extends BaseQuery<ObjectiveBlock> {
-
-    private Integer examId;
-
-    private String subjectCode;
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-}

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

@@ -1,45 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.query;
-
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-
-import cn.com.qmth.stmms.biz.common.BaseQuery;
-import cn.com.qmth.stmms.biz.subjectheader.model.SubjectHeader;
-
-public class SubjectHeaderSearchQuery extends BaseQuery<SubjectHeader> {
-
-    private int examId;
-
-    private String subjectCode;
-
-    private String loginName;
-
-    public void orderByLoginName() {
-        setSort(new Sort(Direction.ASC, "loginName"));
-    }
-
-    public int getExamId() {
-        return examId;
-    }
-
-    public void setExamId(int examId) {
-        this.examId = examId;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-}

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

@@ -1,28 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.query;
-
-import cn.com.qmth.stmms.biz.common.BaseQuery;
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-
-public class SubjectiveBlockSearchQuery extends BaseQuery<SubjectiveBlock> {
-
-    private Integer examId;
-
-    private String subjectCode;
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-}

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

@@ -1,21 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.exam.model.MarkLevel;
-import cn.com.qmth.stmms.biz.exam.model.MarkStep;
-
-public interface MarkLevelService {
-
-    public MarkLevel save(MarkLevel markLevel);
-
-    public void delete(MarkLevel markLevel);
-
-    public List<MarkLevel> findByBlockIdAndStepNumber(int blockId, int stepNumber);
-
-    public List<MarkLevel> findByStep(MarkStep step);
-
-    public void deleteByBlockIdAndStepNumber(int blockId, int stepNumber);
-
-    public void deleteByBlockId(int blockId);
-}

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

@@ -1,22 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.exam.model.MarkStep;
-
-public interface MarkStepService {
-
-    MarkStep save(MarkStep markStep);
-
-    MarkStep findById(int id);
-
-    void deleteById(int id);
-
-    void delete(MarkStep markStep);
-
-    public void deleteByBlockId(int blockId);
-
-    List<MarkStep> findByBlockId(int blockId);
-
-    List<MarkStep> findByBlockId(int blockId, boolean withLevel);
-}

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

@@ -1,61 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.exam.model.ObjectiveBlock;
-import cn.com.qmth.stmms.biz.exam.model.ObjectiveQuestion;
-import cn.com.qmth.stmms.biz.exam.query.ObjectiveBlockSearchQuery;
-
-public interface ObjectiveBlockService {
-
-    ObjectiveBlock saveBlock(ObjectiveBlock objectiveBlock);
-
-    /**
-     * 根据考试ID，学科CODE，文理科统计客观大题的数量
-     * 
-     * @param examId
-     * @param subjectCode
-     * @return
-     */
-    long countBlockByExamIdAndSubjectCode(int examId, String subjectCode);
-
-    /**
-     * 统计某次考试已设置的科目数量，按subjectId和classType分组
-     * 
-     * @param examId
-     * @return
-     */
-    public long countSubjectByExamId(int examId);
-
-    /**
-     * 根据考试ID、学科CODE查询客观题块
-     * 
-     * @param examId
-     * @param subjectCode
-     * @return
-     */
-    List<ObjectiveBlock> findBlockByExamIdAndSubjectCode(int examId, String subjectCode);
-
-    /**
-     * 根据考试ID、学科CODE删除客观题块
-     * 
-     * @param examId
-     * @param subjectCode
-     */
-    void deleteBlockByExamIdAndSubjectCode(int examId, String subjectCode);
-
-    void deleteBlock(ObjectiveBlock objectiveBlock);
-
-    List<ObjectiveBlock> findBlockByExamId(int examId);
-
-    List<ObjectiveBlock> findBlockByExamIdAndSubjectCode(int examId, String subjectCode, boolean withQuestion);
-
-    ObjectiveBlockSearchQuery findByQuery(ObjectiveBlockSearchQuery query);
-
-    public List<ObjectiveQuestion> findQuestionByBlockId(int blockId);
-
-    ObjectiveBlock findBlockByExamIdAndSubjectCodeAndNumber(int examId, String subjectCode, int number);
-
-    ObjectiveBlock findBlockById(int blockId, boolean withQuestion);
-
-}

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

@@ -1,19 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.service;
-
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-
-/**
- * 针对单个block的增删改查核心service，方法附带缓存支持
- * 
- * @author luoshi
- * 
- */
-public interface SubjectiveBlockCoreService {
-
-    SubjectiveBlock saveBlock(SubjectiveBlock subjectiveBlock);
-
-    public void deleteBlockById(int id);
-
-    SubjectiveBlock findBlockById(int id);
-
-}

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

@@ -1,36 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-import cn.com.qmth.stmms.biz.exam.query.SubjectiveBlockSearchQuery;
-
-public interface SubjectiveBlockService {
-
-    public SubjectiveBlock saveBlock(SubjectiveBlock block);
-
-    public void deleteBlockById(int blockId);
-
-    public void deleteBlockByExamIdAndSubjectCode(int examId, String subjectCode);
-
-    public long countBlockByExamIdAndSubjectCode(int examId, String subjectCode);
-
-    public long countSubjectByExamId(int examId);
-
-    public List<SubjectiveBlock> findBlockByExamIdAndSubjectCode(int examId, String subjectCode);
-
-    public SubjectiveBlock findBlockByExamIdAndSubjectCodeAndNumber(int examId, String subjectCode, int number,
-            boolean withStep);
-
-    public List<SubjectiveBlock> findBlockByExamIdAndMultiSubjectCode(int examId, String subjectCodes);
-
-    public List<SubjectiveBlock> findBlockByExamIdAndSubjectCode(int examId, String subjectCode, boolean withStep);
-
-    public List<SubjectiveBlock> findBlockByExamId(int examId);
-
-    public SubjectiveBlock findBlockById(int blockId);
-
-    public SubjectiveBlock findBlockById(int blockId, boolean withStep);
-
-    public SubjectiveBlockSearchQuery findByQuery(final SubjectiveBlockSearchQuery query);
-}

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

@@ -1,84 +0,0 @@
-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.exam.dao.MarkLevelDao;
-import cn.com.qmth.stmms.biz.exam.model.MarkLevel;
-import cn.com.qmth.stmms.biz.exam.model.MarkStep;
-import cn.com.qmth.stmms.biz.exam.service.MarkLevelService;
-import cn.com.qmth.stmms.biz.exam.service.MarkStepService;
-
-@Service
-public class MarkLevelServiceImpl implements MarkLevelService {
-
-    @Autowired
-    private MarkLevelDao markLevelDao;
-
-    @Autowired
-    private MarkStepService markStepService;
-
-    @Transactional
-    public MarkLevel save(MarkLevel markLevel) {
-        return markLevelDao.save(markLevel);
-    }
-
-    @Transactional
-    public void delete(MarkLevel markLevel) {
-        markLevelDao.delete(markLevel);
-    }
-
-    public List<MarkLevel> findByStep(MarkStep step) {
-        if (step != null) {
-            List<MarkLevel> mList = markLevelDao.findByBlockIdAndStepNumber(step.getBlockId(),
-                    step.getNumber());
-            for (MarkLevel markLevel : mList) {
-                buildScoreList(markLevel);
-            }
-            return mList;
-        }
-        return null;
-    }
-
-    public List<MarkLevel> findByBlockIdAndStepNumber(int blockId, int stepNumber) {
-        return markLevelDao.findByBlockIdAndStepNumber(blockId, stepNumber);
-    }
-
-    @Transactional
-    public void deleteByBlockIdAndStepNumber(int blockId, int stepNumber) {
-        markLevelDao.deleteByBlockIdAndStepNumber(blockId, stepNumber);
-    }
-
-    @Transactional
-    public void deleteByBlockId(int blockId) {
-        markLevelDao.deleteByBlockId(blockId);
-    }
-
-    private MarkLevel buildScoreList(MarkLevel markLevel) {
-        List<MarkStep> mList = markStepService.findByBlockId(markLevel.getBlockId());
-        double[] scoreArray = null;
-        List<Double> scoreList = new ArrayList<Double>();
-        for (MarkStep markStep : mList) {
-            if (markStep.getNumber().intValue() == markLevel.getStepNumber().intValue()) {
-                scoreArray = markStep.getScoreArray();
-                double min = markLevel.getMin();
-                double max = markLevel.getMax();
-                for (int i = 0; i < scoreArray.length; i++) {
-                    if (scoreArray[i] >= min && scoreArray[i] <= max) {
-                        scoreList.add(scoreArray[i]);
-                    }
-                }
-                double[] score = new double[scoreList.size()];
-                for (int i = 0; i < scoreList.size(); i++) {
-                    score[i] = scoreList.get(i);
-                }
-                markLevel.setScoreList(score);
-            }
-        }
-        return markLevel;
-    }
-}

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

@@ -1,82 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.service.impl;
-
-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.exam.dao.MarkStepDao;
-import cn.com.qmth.stmms.biz.exam.model.MarkLevel;
-import cn.com.qmth.stmms.biz.exam.model.MarkStep;
-import cn.com.qmth.stmms.biz.exam.service.MarkLevelService;
-import cn.com.qmth.stmms.biz.exam.service.MarkStepService;
-
-@Service
-public class MarkStepServiceImpl implements MarkStepService {
-
-    @Autowired
-    private MarkStepDao markStepDao;
-
-    @Autowired
-    private MarkLevelService markLevelService;
-
-    @Transactional
-    public MarkStep save(MarkStep step) {
-        step.setHasLevel(step.getMarkLevelList() != null && step.getMarkLevelList().size() > 0);
-        if (step.getMarkLevelList() != null) {
-            markLevelService.deleteByBlockIdAndStepNumber(step.getBlockId(), step.getNumber());
-            int number = 0;
-            for (MarkLevel level : step.getMarkLevelList()) {
-                level.setBlockId(step.getBlockId());
-                level.setStepNumber(step.getNumber());
-                level.setNumber(++number);
-                markLevelService.save(level);
-            }
-        }
-        return markStepDao.save(step);
-    }
-
-    public MarkStep findById(int id) {
-        MarkStep markStep = markStepDao.findOne(id);
-        return buildMarkStep(markStep);
-    }
-
-    @Transactional
-    public void deleteById(int id) {
-        markStepDao.delete(id);
-    }
-
-    @Transactional
-    public void delete(MarkStep markStep) {
-        markStepDao.delete(markStep);
-    }
-
-    @Transactional
-    public void deleteByBlockId(int blockId) {
-        markStepDao.deleteByBlockId(blockId);
-        markLevelService.deleteByBlockId(blockId);
-    }
-
-    public List<MarkStep> findByBlockId(int blockId) {
-        return findByBlockId(blockId, false);
-    }
-
-    public List<MarkStep> findByBlockId(int blockId, boolean withLevel) {
-        List<MarkStep> list = markStepDao.findByBlockId(blockId);
-        if (withLevel && list != null) {
-            for (MarkStep step : list) {
-                if (step.isHasLevel()) {
-                    step.setMarkLevelList(markLevelService.findByStep(step));
-                }
-            }
-        }
-        return list;
-    }
-
-    private MarkStep buildMarkStep(MarkStep markStep) {
-        List<MarkLevel> markLevelList = markLevelService.findByStep(markStep);
-        markStep.setMarkLevelList(markLevelList);
-        return markStep;
-    }
-}

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

@@ -1,154 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.service.impl;
-
-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;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.jpa.domain.Specification;
-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.ObjectiveBlockDao;
-import cn.com.qmth.stmms.biz.exam.dao.ObjectiveQuestionDao;
-import cn.com.qmth.stmms.biz.exam.model.ObjectiveBlock;
-import cn.com.qmth.stmms.biz.exam.model.ObjectiveQuestion;
-import cn.com.qmth.stmms.biz.exam.query.ObjectiveBlockSearchQuery;
-import cn.com.qmth.stmms.biz.exam.service.ObjectiveBlockService;
-
-@Service
-public class ObjectiveBlockServiceImpl extends BaseQueryService<ObjectiveBlock> implements ObjectiveBlockService {
-
-    @Autowired
-    private ObjectiveBlockDao objectiveBlockDao;
-
-    @Autowired
-    private ObjectiveQuestionDao objectiveQuestionDao;
-
-    private Sort NUMBER_SORT = new Sort(Direction.ASC, "number");
-
-    @Override
-    public List<ObjectiveBlock> findBlockByExamIdAndSubjectCode(int examId, String subjectCode, boolean withQuestion) {
-        List<ObjectiveBlock> list = objectiveBlockDao.findByExamIdAndSubjectCode(examId, subjectCode, NUMBER_SORT);
-        if (withQuestion && list != null) {
-            for (ObjectiveBlock block : list) {
-                block.setQuestionList(findQuestionByBlockId(block.getId()));
-            }
-        }
-        return list;
-    }
-
-    @Override
-    public ObjectiveBlock findBlockById(int blockId, boolean withQuestion) {
-        ObjectiveBlock block = objectiveBlockDao.findOne(blockId);
-        if (block != null && withQuestion) {
-            block.setQuestionList(objectiveQuestionDao.findByBlockId(blockId));
-        }
-        return block;
-    }
-
-    public List<ObjectiveQuestion> findQuestionByBlockId(int blockId) {
-        return objectiveQuestionDao.findByBlockId(blockId);
-    }
-
-    @Override
-    public List<ObjectiveBlock> findBlockByExamId(int examId) {
-        return objectiveBlockDao.findByExamId(examId);
-    }
-
-    public long countSubjectByExamId(int examId) {
-        return objectiveBlockDao.countSubjectByExamId(examId);
-    }
-
-    @Transactional
-    public ObjectiveBlock saveBlock(ObjectiveBlock block) {
-        if (block.getId() != null && block.getId() > 0) {
-            return saveBlockAndQuestion(block);
-        } else {
-            ObjectiveBlock previous = findBlockByExamIdAndSubjectCodeAndNumber(block.getExamId(),
-                    block.getSubjectCode(), block.getNumber());
-            if (previous != null) {
-                block.setId(previous.getId());
-            }
-            return saveBlockAndQuestion(block);
-        }
-    }
-
-    @Transactional
-    private ObjectiveBlock saveBlockAndQuestion(ObjectiveBlock block) {
-        ObjectiveBlock item = objectiveBlockDao.save(block);
-        if (block.getQuestionList() != null) {
-            objectiveQuestionDao.deleteByBlockId(item.getId());
-            // int number = 0;
-            for (ObjectiveQuestion question : block.getQuestionList()) {
-                // question.setNumber(++number);
-                question.setBlockId(item.getId());
-                objectiveQuestionDao.save(question);
-            }
-        }
-        return item;
-    }
-
-    @Override
-    public long countBlockByExamIdAndSubjectCode(int examId, String subjectCode) {
-        return objectiveBlockDao.countByExamIdAndSubjectCode(examId, subjectCode);
-    }
-
-    @Override
-    public List<ObjectiveBlock> findBlockByExamIdAndSubjectCode(int examId, String subjectCode) {
-        return objectiveBlockDao.findByExamIdAndSubjectCode(examId, subjectCode, NUMBER_SORT);
-    }
-
-    @Override
-    public ObjectiveBlock findBlockByExamIdAndSubjectCodeAndNumber(int examId, String subjectCode, int number) {
-        List<ObjectiveBlock> list = objectiveBlockDao.findByExamIdAndSubjectCodeAndNumber(examId, subjectCode, number);
-        return list != null && list.size() > 0 ? list.get(0) : null;
-    }
-
-    @Transactional
-    public void deleteBlockByExamIdAndSubjectCode(int examId, String subjectCode) {
-        List<ObjectiveBlock> list = findBlockByExamIdAndSubjectCode(examId, subjectCode);
-        if (list != null) {
-            for (ObjectiveBlock block : list) {
-                deleteBlock(block);
-            }
-        }
-    }
-
-    @Transactional
-    public void deleteBlock(ObjectiveBlock objectiveBlock) {
-        objectiveQuestionDao.deleteByBlockId(objectiveBlock.getId());
-        objectiveBlockDao.delete(objectiveBlock);
-    }
-
-    public ObjectiveBlockSearchQuery findByQuery(final ObjectiveBlockSearchQuery query) {
-        checkQuery(query);
-        Page<ObjectiveBlock> result = objectiveBlockDao.findAll(new Specification<ObjectiveBlock>() {
-
-            @Override
-            public Predicate toPredicate(Root<ObjectiveBlock> root, CriteriaQuery<?> cQuery, CriteriaBuilder cb) {
-                List<Predicate> predicates = new LinkedList<Predicate>();
-                if (query.getExamId() != null) {
-                    predicates.add(cb.equal(root.get("examId"), query.getExamId()));
-                }
-                if (StringUtils.isNotEmpty(query.getSubjectCode())) {
-                    predicates.add(cb.equal(root.get("subjectCode"), query.getSubjectCode()));
-                }
-                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
-                        .size()]));
-            }
-        }, query);
-        fillResult(result, query);
-        return query;
-    }
-
-}

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

@@ -1,52 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import cn.com.qmth.stmms.biz.exam.dao.SubjectiveBlockDao;
-import cn.com.qmth.stmms.biz.exam.model.MarkStep;
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-import cn.com.qmth.stmms.biz.exam.service.MarkStepService;
-import cn.com.qmth.stmms.biz.exam.service.SubjectiveBlockCoreService;
-
-@Service("subjectiveBlockCoreService")
-public class SubjectiveBlockCoreServiceImpl implements SubjectiveBlockCoreService {
-
-    @Autowired
-    private MarkStepService markStepService;
-
-    @Autowired
-    private SubjectiveBlockDao subjectiveBlockDao;
-
-    @Transactional
-    // @CachePut(value = "subjective_block_cache", key = "#block.id", condition
-    // = "#block!=null && #block.id!=null")
-    public SubjectiveBlock saveBlock(SubjectiveBlock block) {
-        SubjectiveBlock item = subjectiveBlockDao.save(block);
-        if (block.getMarkStepList() != null) {
-            markStepService.deleteByBlockId(item.getId());
-            // int number = 0;
-            for (MarkStep step : block.getMarkStepList()) {
-                step.setBlockId(item.getId());
-                // step.setNumber(++number);
-                markStepService.save(step);
-            }
-        }
-        return item;
-    }
-
-    @Transactional
-    // @CacheEvict(value = "subjective_block_cache", key = "#blockId",
-    // beforeInvocation = true)
-    public void deleteBlockById(int blockId) {
-        markStepService.deleteByBlockId(blockId);
-        subjectiveBlockDao.delete(blockId);
-    }
-
-    // @Cacheable(value = "subjective_block_cache", key = "#blockId")
-    public SubjectiveBlock findBlockById(int blockId) {
-        return subjectiveBlockDao.findOne(blockId);
-    }
-
-}

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

@@ -1,154 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.service.impl;
-
-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;
-import org.springframework.data.jpa.domain.Specification;
-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.SubjectiveBlockDao;
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-import cn.com.qmth.stmms.biz.exam.query.SubjectiveBlockSearchQuery;
-import cn.com.qmth.stmms.biz.exam.service.MarkStepService;
-import cn.com.qmth.stmms.biz.exam.service.SubjectiveBlockCoreService;
-import cn.com.qmth.stmms.biz.exam.service.SubjectiveBlockService;
-
-@Service("subjectiveBlockService")
-public class SubjectiveBlockServiceImpl extends BaseQueryService<SubjectiveBlock> implements SubjectiveBlockService {
-
-    @Autowired
-    private MarkStepService markStepService;
-
-    @Autowired
-    private SubjectiveBlockDao subjectiveBlockDao;
-
-    @Autowired
-    private SubjectiveBlockCoreService subjectBlockCoreService;
-
-    @Transactional
-    public SubjectiveBlock saveBlock(SubjectiveBlock block) {
-        if (block.getId() != null && block.getId() > 0) {
-            return subjectBlockCoreService.saveBlock(block);
-        } else {
-            SubjectiveBlock previous = findBlockByExamIdAndSubjectCodeAndNumber(block.getExamId(),
-                    block.getSubjectCode(), block.getNumber(), false);
-            if (previous != null) {
-                block.setId(previous.getId());
-            }
-            return subjectBlockCoreService.saveBlock(block);
-        }
-    }
-
-    @Transactional
-    public void deleteBlockById(int blockId) {
-        subjectBlockCoreService.deleteBlockById(blockId);
-    }
-
-    @Transactional
-    public void deleteBlockByExamIdAndSubjectCode(int examId, String subjectCode) {
-        List<SubjectiveBlock> list = findBlockByExamIdAndSubjectCode(examId, subjectCode);
-        if (list != null) {
-            for (SubjectiveBlock block : list) {
-                deleteBlockById(block.getId());
-            }
-        }
-    }
-
-    public long countBlockByExamIdAndSubjectCode(int examId, String subjectCode) {
-        return subjectiveBlockDao.countByExamIdAndSubjectCode(examId, subjectCode);
-    }
-
-    public long countSubjectByExamId(int examId) {
-        return subjectiveBlockDao.countSubjectByExamId(examId);
-    }
-
-    public List<SubjectiveBlock> findBlockByExamIdAndSubjectCode(int examId, String subjectCode) {
-        return subjectiveBlockDao.findByExamIdAndSubjectCode(examId, subjectCode);
-    }
-
-    public List<SubjectiveBlock> findBlockByExamIdAndSubjectCode(int examId, String subjectCode, boolean withStep) {
-        List<SubjectiveBlock> list = subjectiveBlockDao.findByExamIdAndSubjectCode(examId, subjectCode);
-        if (list != null && withStep) {
-            for (SubjectiveBlock subjectiveBlock : list) {
-                subjectiveBlock.setMarkStepList(markStepService.findByBlockId(subjectiveBlock.getId(), true));
-            }
-        }
-        return list;
-    }
-
-    public SubjectiveBlock findBlockByExamIdAndSubjectCodeAndNumber(int examId, String subjectCode, int number,
-            boolean withStep) {
-        SubjectiveBlock block = null;
-        List<SubjectiveBlock> list = subjectiveBlockDao
-                .findByExamIdAndSubjectCodeAndNumber(examId, subjectCode, number);
-        if (list != null && list.size() > 0) {
-            block = list.get(0);
-            if (withStep) {
-                block.setMarkStepList(markStepService.findByBlockId(block.getId(), true));
-            }
-        }
-        return block;
-    }
-
-    public List<SubjectiveBlock> findBlockByExamIdAndMultiSubjectCode(int examId, String subjectCodes) {
-        String[] codeList = StringUtils.split(subjectCodes, ",");
-        List<SubjectiveBlock> list = new LinkedList<SubjectiveBlock>();
-        if (codeList != null && codeList.length > 0) {
-            for (String code : codeList) {
-                List<SubjectiveBlock> result = findBlockByExamIdAndSubjectCode(examId, code);
-                if (result != null) {
-                    list.addAll(result);
-                }
-            }
-        }
-        return list;
-    }
-
-    public List<SubjectiveBlock> findBlockByExamId(int examId) {
-        return subjectiveBlockDao.findByExamId(examId);
-    }
-
-    public SubjectiveBlock findBlockById(int blockId) {
-        return subjectBlockCoreService.findBlockById(blockId);
-    }
-
-    public SubjectiveBlock findBlockById(int blockId, boolean withStep) {
-        SubjectiveBlock block = subjectBlockCoreService.findBlockById(blockId);
-        if (block != null && withStep) {
-            block.setMarkStepList(markStepService.findByBlockId(block.getId(), true));
-        }
-        return block;
-    }
-
-    public SubjectiveBlockSearchQuery findByQuery(final SubjectiveBlockSearchQuery query) {
-        checkQuery(query);
-        Page<SubjectiveBlock> result = subjectiveBlockDao.findAll(new Specification<SubjectiveBlock>() {
-
-            @Override
-            public Predicate toPredicate(Root<SubjectiveBlock> root, CriteriaQuery<?> cQuery, CriteriaBuilder cb) {
-                List<Predicate> predicates = new LinkedList<Predicate>();
-                if (query.getExamId() != null) {
-                    predicates.add(cb.equal(root.get("examId"), query.getExamId()));
-                }
-                if (StringUtils.isNotEmpty(query.getSubjectCode())) {
-                    predicates.add(cb.equal(root.get("subjectCode"), query.getSubjectCode()));
-                }
-                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
-                        .size()]));
-            }
-        }, query);
-        fillResult(result, query);
-        return query;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/dao/MarkLibraryDao.java

@@ -2,9 +2,6 @@ package cn.com.qmth.stmms.biz.mark.dao;
 
 import java.util.List;
 
-import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
-import cn.com.qmth.stmms.biz.exam.model.Marker;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -14,8 +11,8 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 import cn.com.qmth.stmms.biz.mark.model.MarkLibrary;
 import cn.com.qmth.stmms.common.enums.LibraryStatus;
 
-public interface MarkLibraryDao extends PagingAndSortingRepository<MarkLibrary, Integer>,
-        JpaSpecificationExecutor<MarkLibrary> {
+public interface MarkLibraryDao
+        extends PagingAndSortingRepository<MarkLibrary, Integer>, JpaSpecificationExecutor<MarkLibrary> {
 
     List<MarkLibrary> findByExamId(int examId, Pageable page);
 
@@ -71,19 +68,19 @@ public interface MarkLibraryDao extends PagingAndSortingRepository<MarkLibrary,
     void deleteByExamId(int examId);
 
     @Query(value = "select max(f.markerScore),min(f.markerScore),avg(f.markerScore),max(f.markerDuration),min(f.markerDuration),avg(f.markerDuration) from MarkLibrary f where f.markerId = ?1 and f.subjectCode = ?2 ")
-	List<Object[]> getMarkerInfo(int markerId, String subjectCode);
+    List<Object[]> getMarkerInfo(int markerId, String subjectCode);
 
-	@Query(value = "select f.markerScore from MarkLibrary f where f.markerId = ?1 and f.subjectCode = ?2 ")
-	List<Double> getAllScore(int markerId, String subjectCode);
+    @Query(value = "select f.markerScore from MarkLibrary f where f.markerId = ?1 and f.subjectCode = ?2 ")
+    List<Double> getAllScore(int markerId, String subjectCode);
 
-	@Query(value = "select f.subjectCode from MarkLibrary f where f.markerId = ?1 and f.status = ?2 GROUP BY f.subjectCode")
-    List<String> findCodeListByMidGBCode(int markerId,LibraryStatus status);
+    @Query(value = "select f.subjectCode from MarkLibrary f where f.markerId = ?1 and f.status = ?2 GROUP BY f.subjectCode")
+    List<String> findCodeListByMidGBCode(int markerId, LibraryStatus status);
 
     @Query("select count(*) from MarkLibrary f where f.markerId=?1 and f.status=?2")
-    long countByMidAndStatus(int markerId,LibraryStatus status);
+    long countByMidAndStatus(int markerId, LibraryStatus status);
 
     @Query("select count(*) from MarkLibrary f where f.markerId=?1 and f.subjectCode = ?2 and f.status=?3")
-    long countByMidAndSubjectCodeStatus(int markerId,String subjectCode,LibraryStatus status);
+    long countByMidAndSubjectCodeStatus(int markerId, String subjectCode, LibraryStatus status);
 
     @Query(value = "select max(f.markerScore),min(f.markerScore),avg(f.markerScore) from MarkLibrary f where f.markerId = ?1 and f.status = ?2 ")
     List<Object[]> getMarkerInfo(int markerId, LibraryStatus status);

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/MarkLibrary.java

@@ -94,6 +94,12 @@ public class MarkLibrary implements Serializable {
     @Column(name = "marker_score_list")
     private String markerScoreList;
 
+    /**
+     * 评卷时长
+     */
+    @Column(name = "marker_duration", nullable = false, columnDefinition = " default 0 ")
+    private long markerDuration;
+
     /**
      * 试卷标记信息
      */
@@ -107,12 +113,6 @@ public class MarkLibrary implements Serializable {
     @Enumerated(EnumType.ORDINAL)
     private LibraryStatus status;
 
-    /**
-     * 评卷时长
-     */
-    @Column(name = "marker_duration", nullable = false, columnDefinition = " default 0 ")
-    private long markerDuration;
-
     public Integer getId() {
         return id;
     }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/MarkSpecialTag.java

@@ -1,6 +1,10 @@
 package cn.com.qmth.stmms.biz.mark.model;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 /**
  * @ClassName MarkSpecialTag
@@ -12,15 +16,20 @@ import javax.persistence.*;
 @Entity
 @Table(name = "m_special_tag")
 public class MarkSpecialTag {
+
     @Id
     @GeneratedValue
     private Integer id;
+
     @Column(name = "library_id", nullable = false)
     private Integer libraryId;
+
     @Column(name = "tag_name", nullable = false)
     private String tagName;
+
     @Column(name = "position_x", nullable = false)
     private Double positionX;
+
     @Column(name = "position_y", nullable = false)
     private Double positionY;
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/SpecialTagDTO.java

@@ -10,9 +10,13 @@ import java.io.Serializable;
  * @Version 1.0
  */
 public class SpecialTagDTO implements Serializable {
+
     private static final long serialVersionUID = -5424015292124065736L;
+
     private String tagName;
+
     private Double positionX;
+
     private Double positionY;
 
     public SpecialTagDTO() {

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkLibraryServiceImpl.java

@@ -1,9 +1,7 @@
 package cn.com.qmth.stmms.biz.mark.service.Impl;
 
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
@@ -13,7 +11,6 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import cn.com.qmth.stmms.biz.exam.dao.ExamSubjectDao;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -215,36 +212,39 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
         };
     }
 
-	@Override
-	public List<Object[]> getMarkerInfo(Integer markerId,String subjectCode) {
-		return libraryDao.getMarkerInfo(markerId,subjectCode);
-	}
+    @Override
+    public List<Object[]> getMarkerInfo(Integer markerId, String subjectCode) {
+        return libraryDao.getMarkerInfo(markerId, subjectCode);
+    }
 
-	@Override
-	public List<Double> getAllScore(Integer id,String subjectCode) {
-		return libraryDao.getAllScore(id,subjectCode);
-	}
+    @Override
+    public List<Double> getAllScore(Integer id, String subjectCode) {
+        return libraryDao.getAllScore(id, subjectCode);
+    }
 
-	@Override
-    public List<String> getCodeListByMidGBCodeCount(int markerId,LibraryStatus status){
-        return libraryDao.findCodeListByMidGBCode(markerId,status);
+    @Override
+    public List<String> getCodeListByMidGBCodeCount(int markerId, LibraryStatus status) {
+        return libraryDao.findCodeListByMidGBCode(markerId, status);
     }
+
     @Override
-    public long countByMidAndStatus(int markerId,LibraryStatus status){
-        return libraryDao.countByMidAndStatus(markerId,status);
+    public long countByMidAndStatus(int markerId, LibraryStatus status) {
+        return libraryDao.countByMidAndStatus(markerId, status);
     }
+
     @Override
-    public long countByMidAndSubjectCodeStatus(int markerId,String subjectCode,LibraryStatus status){
-        return libraryDao.countByMidAndSubjectCodeStatus(markerId,subjectCode,status);
+    public long countByMidAndSubjectCodeStatus(int markerId, String subjectCode, LibraryStatus status) {
+        return libraryDao.countByMidAndSubjectCodeStatus(markerId, subjectCode, status);
     }
 
     @Override
     public List<Object[]> getMarkerInfo(int markerId, LibraryStatus status) {
-        return libraryDao.getMarkerInfo(markerId,status);
+        return libraryDao.getMarkerInfo(markerId, status);
     }
 
     private Specification<MarkLibrary> buildSpecificationGroupBySubjectCode(final MarkLibrarySearchQuery query) {
         return new Specification<MarkLibrary>() {
+
             @Override
             public Predicate toPredicate(Root<MarkLibrary> root, CriteriaQuery<?> cQuery, CriteriaBuilder cb) {
                 List<Predicate> predicates = new LinkedList<Predicate>();
@@ -263,15 +263,18 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
             }
         };
     }
+
     @Override
     public MarkLibrarySearchQuery findGroupByQuery(final MarkLibrarySearchQuery query) {
         checkQuery(query);
         Page<MarkLibrary> result = libraryDao.findAll(buildSpecificationGroupBySubjectCode(query), query);
-        fillResult(result,query);
+        fillResult(result, query);
         return query;
     }
+
+    @SuppressWarnings("unchecked")
     @Override
-    public MarkLibrarySearchQuery getByCondition(final MarkLibrarySearchQuery query){
+    public MarkLibrarySearchQuery getByCondition(final MarkLibrarySearchQuery query) {
         StringBuffer sql = new StringBuffer("SELECT m.* FROM m_library m WHERE 1=1 and m.status = 3");
         if (StringUtils.isNotBlank(query.getSubjectCode())) {
             sql.append(" and m.subject_code = '").append(query.getSubjectCode()).append("'");
@@ -279,17 +282,18 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
         if (query.getMarkerId() > 0) {
             sql.append(" and  m.marker_id =").append(query.getMarkerId());
         }
-            sql.append(" group by m.subject_code");
-        Query qCount = em.createNativeQuery(sql.toString(),MarkLibrary.class);
+        sql.append(" group by m.subject_code");
+        Query qCount = em.createNativeQuery(sql.toString(), MarkLibrary.class);
         int totalCount = qCount.getResultList().size();
-        int pageNumber = query.getPageNumber()-1;
-        if( pageNumber> 0){
+        int pageNumber = query.getPageNumber() - 1;
+        if (pageNumber > 0) {
             pageNumber = pageNumber * query.getPageSize();
         }
         sql.append(" limit ").append(pageNumber).append(",").append(query.getPageSize());
-        Query q = em.createNativeQuery(sql.toString(),MarkLibrary.class);
-        Page<MarkLibrary> page = new PageImpl<>(q.getResultList(),new PageRequest(query.getPageNumber()-1,query.getPageSize()),totalCount);
-        fillResult(page,query);
+        Query q = em.createNativeQuery(sql.toString(), MarkLibrary.class);
+        Page<MarkLibrary> page = new PageImpl<>(q.getResultList(),
+                new PageRequest(query.getPageNumber() - 1, query.getPageSize()), totalCount);
+        fillResult(page, query);
         return query;
     }
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkSpecialTagServiceImpl.java

@@ -1,14 +1,15 @@
 package cn.com.qmth.stmms.biz.mark.service.Impl;
 
-import cn.com.qmth.stmms.biz.common.BaseQueryService;
-import cn.com.qmth.stmms.biz.mark.dao.MarkSpecialTagDao;
-import cn.com.qmth.stmms.biz.mark.model.MarkSpecialTag;
-import cn.com.qmth.stmms.biz.mark.service.MarkSpecialTagService;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
+import cn.com.qmth.stmms.biz.common.BaseQueryService;
+import cn.com.qmth.stmms.biz.mark.dao.MarkSpecialTagDao;
+import cn.com.qmth.stmms.biz.mark.model.MarkSpecialTag;
+import cn.com.qmth.stmms.biz.mark.service.MarkSpecialTagService;
 
 /**
  * @ClassName MarkSpecialTagServiceImpl
@@ -19,21 +20,24 @@ import java.util.List;
  */
 @Service
 public class MarkSpecialTagServiceImpl extends BaseQueryService<MarkSpecialTag> implements MarkSpecialTagService {
+
     @Autowired
     MarkSpecialTagDao markSpecialTagDao;
 
     @Transactional
     @Override
-    public MarkSpecialTag save(MarkSpecialTag tag){
-      return  markSpecialTagDao.save(tag);
+    public MarkSpecialTag save(MarkSpecialTag tag) {
+        return markSpecialTagDao.save(tag);
     }
+
     @Transactional
     @Override
-    public void deleteByLibraryId(Integer libraryId){
+    public void deleteByLibraryId(Integer libraryId) {
         markSpecialTagDao.deleteByLibraryId(libraryId);
     }
+
     @Override
-    public List<MarkSpecialTag> findByLibraryId(Integer libraryId){
+    public List<MarkSpecialTag> findByLibraryId(Integer libraryId) {
         return markSpecialTagDao.findByLibraryIdOrderByIdAsc(libraryId);
     }
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/TaskServiceImpl.java

@@ -5,10 +5,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import cn.com.qmth.stmms.biz.mark.model.*;
-import cn.com.qmth.stmms.biz.mark.service.MarkSpecialTagService;
 import org.apache.commons.lang.StringUtils;
-import org.hibernate.mapping.Collection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -17,10 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.data.redis.connection.ConnectionUtils;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import cn.com.qmth.stmms.biz.exam.model.ExamQuestion;
 import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
@@ -30,15 +27,22 @@ import cn.com.qmth.stmms.biz.exam.service.ExamQuestionService;
 import cn.com.qmth.stmms.biz.exam.service.ExamStudentPaperService;
 import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
 import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
+import cn.com.qmth.stmms.biz.mark.model.MarkLibrary;
+import cn.com.qmth.stmms.biz.mark.model.MarkSpecialTag;
+import cn.com.qmth.stmms.biz.mark.model.MarkStepDTO;
+import cn.com.qmth.stmms.biz.mark.model.MarkTrack;
+import cn.com.qmth.stmms.biz.mark.model.SpecialTagDTO;
+import cn.com.qmth.stmms.biz.mark.model.Task;
+import cn.com.qmth.stmms.biz.mark.model.TrackDTO;
 import cn.com.qmth.stmms.biz.mark.query.MarkLibrarySearchQuery;
 import cn.com.qmth.stmms.biz.mark.service.MarkLibraryService;
+import cn.com.qmth.stmms.biz.mark.service.MarkSpecialTagService;
 import cn.com.qmth.stmms.biz.mark.service.MarkTrackService;
 import cn.com.qmth.stmms.biz.mark.service.TaskService;
 import cn.com.qmth.stmms.biz.utils.CurrentTaskUtil;
 import cn.com.qmth.stmms.biz.utils.MarkRedisUtil;
 import cn.com.qmth.stmms.common.enums.LibraryStatus;
 import cn.com.qmth.stmms.common.utils.PictureUrlBuilder;
-import org.springframework.util.CollectionUtils;
 
 /**
  * 评卷任务服务实现
@@ -252,16 +256,16 @@ public class TaskServiceImpl implements TaskService, ApplicationContextAware, In
                 }
             }
 
-            SpecialTagDTO [] tagList = task.getTagList();
+            SpecialTagDTO[] tagList = task.getTagList();
             markSpecialTagService.deleteByLibraryId(library.getId());
-            if(tagList != null && tagList.length>0){
-                for(SpecialTagDTO s : tagList){
-                        MarkSpecialTag markSpecialTag = new MarkSpecialTag();
-                        markSpecialTag.setLibraryId(library.getId());
-                        markSpecialTag.setTagName(s.getTagName());
-                        markSpecialTag.setPositionX(s.getPositionX());
-                        markSpecialTag.setPositionY(s.getPositionY());
-                        markSpecialTagService.save(markSpecialTag);
+            if (tagList != null && tagList.length > 0) {
+                for (SpecialTagDTO s : tagList) {
+                    MarkSpecialTag markSpecialTag = new MarkSpecialTag();
+                    markSpecialTag.setLibraryId(library.getId());
+                    markSpecialTag.setTagName(s.getTagName());
+                    markSpecialTag.setPositionX(s.getPositionX());
+                    markSpecialTag.setPositionY(s.getPositionY());
+                    markSpecialTagService.save(markSpecialTag);
                 }
             }
         }
@@ -371,12 +375,12 @@ public class TaskServiceImpl implements TaskService, ApplicationContextAware, In
         }
     }
 
-    public SpecialTagDTO [] getMarkSpecialTagList(Integer libraryId){
-        SpecialTagDTO [] specialTags = null;
-        List<MarkSpecialTag> list =  markSpecialTagService.findByLibraryId(libraryId);
-        if(!CollectionUtils.isEmpty(list)){
-            specialTags = new SpecialTagDTO[list.size()] ;
-            for(int i =0;i<list.size();i++){
+    public SpecialTagDTO[] getMarkSpecialTagList(Integer libraryId) {
+        SpecialTagDTO[] specialTags = null;
+        List<MarkSpecialTag> list = markSpecialTagService.findByLibraryId(libraryId);
+        if (!CollectionUtils.isEmpty(list)) {
+            specialTags = new SpecialTagDTO[list.size()];
+            for (int i = 0; i < list.size(); i++) {
                 SpecialTagDTO specialTagDTO = new SpecialTagDTO();
                 specialTagDTO.setTagName(list.get(i).getTagName());
                 specialTagDTO.setPositionX(list.get(i).getPositionX());
@@ -384,8 +388,7 @@ public class TaskServiceImpl implements TaskService, ApplicationContextAware, In
                 specialTags[i] = specialTagDTO;
             }
         }
-        return  specialTags;
+        return specialTags;
     }
 
-
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/MarkLibraryService.java

@@ -7,7 +7,6 @@ import cn.com.qmth.stmms.biz.exam.model.Marker;
 import cn.com.qmth.stmms.biz.mark.model.MarkLibrary;
 import cn.com.qmth.stmms.biz.mark.query.MarkLibrarySearchQuery;
 import cn.com.qmth.stmms.common.enums.LibraryStatus;
-import org.springframework.data.domain.Page;
 
 public interface MarkLibraryService {
 
@@ -47,19 +46,19 @@ public interface MarkLibraryService {
 
     List<String> findTagSubjectCode(int examId);
 
-	List<Object[]> getMarkerInfo(Integer markerId, String subjectCode);
+    List<Object[]> getMarkerInfo(Integer markerId, String subjectCode);
 
-	List<Double> getAllScore(Integer id,String subjectCode);
+    List<Double> getAllScore(Integer id, String subjectCode);
 
-	List<String> getCodeListByMidGBCodeCount(int markerId,LibraryStatus status);
+    List<String> getCodeListByMidGBCodeCount(int markerId, LibraryStatus status);
 
-	long countByMidAndStatus(int markerId,LibraryStatus status);
+    long countByMidAndStatus(int markerId, LibraryStatus status);
 
     List<Object[]> getMarkerInfo(int markerId, LibraryStatus status);
 
     MarkLibrarySearchQuery findGroupByQuery(final MarkLibrarySearchQuery query);
 
-    long countByMidAndSubjectCodeStatus(int markerId,String subjectCode,LibraryStatus status);
+    long countByMidAndSubjectCodeStatus(int markerId, String subjectCode, LibraryStatus status);
 
     MarkLibrarySearchQuery getByCondition(final MarkLibrarySearchQuery query);
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/MarkSpecialTagService.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.stmms.biz.mark.service;
 
-import cn.com.qmth.stmms.biz.mark.model.MarkSpecialTag;
-
-import javax.persistence.criteria.CriteriaBuilder;
 import java.util.List;
 
+import cn.com.qmth.stmms.biz.mark.model.MarkSpecialTag;
+
 /**
  * @ClassName MarkSpecialTagService
  * @Description TODO
@@ -13,7 +12,10 @@ import java.util.List;
  * @Version 1.0
  */
 public interface MarkSpecialTagService {
+
     public MarkSpecialTag save(MarkSpecialTag tag);
+
     public void deleteByLibraryId(Integer libraryId);
+
     public List<MarkSpecialTag> findByLibraryId(Integer libraryId);
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/dao/ArbitrationHistoryDao.java

@@ -1,19 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.dao;
-
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.subjectheader.model.ArbitrationHistory;
-
-public interface ArbitrationHistoryDao extends
-        PagingAndSortingRepository<ArbitrationHistory, Integer> {
-
-    /*
-     * List<ArbitrationHistory>
-     * findByExamIdAndSubjectIdAndSchoolIdAndStatusAndIsChecked( Integer examId,
-     * Integer subjectId, Integer schoolId, Integer status, boolean isChecked);
-     * 
-     * List<ArbitrationHistory>
-     * findByExamIdAndSubjectIdAndSchoolIdAndBlockId(Integer examId, Integer
-     * subjectId, Integer schoolId, Integer blockId);
-     */
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/dao/ArbitrationLibraryDao.java

@@ -1,20 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.subjectheader.model.ArbitrationLibrary;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-import cn.com.qmth.stmms.common.enums.LibraryType;
-
-public interface ArbitrationLibraryDao extends PagingAndSortingRepository<ArbitrationLibrary, Integer>,
-        JpaSpecificationExecutor<ArbitrationLibrary> {
-
-    List<ArbitrationLibrary> findByExamIdAndSubjectCodeAndTypeAndStatus(Integer examId, String subjectCode, LibraryType type, LibraryStatus status);
-
-    List<ArbitrationLibrary> findByExamIdAndBlockIdAndTypeAndStatus(Integer examId,
-            Integer subjectiveBlockId, LibraryType formally, LibraryStatus waiting);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/dao/RandomHistoryDao.java

@@ -1,8 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.dao;
-
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.subjectheader.model.RandomHistory;
-
-public interface RandomHistoryDao extends PagingAndSortingRepository<RandomHistory, Integer> {
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/dao/RandomLibraryDao.java

@@ -1,10 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.dao;
-
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.subjectheader.model.RandomLibrary;
-
-public interface RandomLibraryDao extends PagingAndSortingRepository<RandomLibrary, Integer>,
-        JpaSpecificationExecutor<RandomLibrary> {
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/dao/SubjectHeaderDao.java

@@ -1,31 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.subjectheader.model.SubjectHeader;
-
-public interface SubjectHeaderDao extends PagingAndSortingRepository<SubjectHeader, Integer>,
-        JpaSpecificationExecutor<SubjectHeader> {
-
-    @Query("select count(ms) from SubjectHeader ms where ms.examId=?1")
-    public long countByExamId(int examId);
-
-    @Query("select count(m) from SubjectHeader m where m.examId=?1 and m.subjectCode=?2 ")
-    public long countByExamIdAndSubjectCode(int examId, String subjectCode);
-
-    public List<SubjectHeader> findByExamId(int examId);
-
-    public List<SubjectHeader> findByExamIdAndSubjectCode(int examId, String subjectCode);
-
-    public List<SubjectHeader> findByLoginName(String loginName);
-
-    @Modifying
-    @Query("delete from SubjectHeader m where m.examId=?1 and m.subjectCode=?2")
-    public void deleteByExamIdAndSubjectCode(int examid, String subjectCode);
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/model/ArbitrationHistory.java

@@ -1,144 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.model;
-
-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.LibraryStatus;
-
-@Entity
-@Table(name = "m_arbitration_history")
-public class ArbitrationHistory implements Serializable {
-
-    private static final long serialVersionUID = 3682869512838881218L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 问题卷库ID
-     */
-    @Column(name = "library_id")
-    private Integer libraryId;
-
-    /**
-     * 总得分
-     */
-    @Column(name = "total_score")
-    private Double totalScore;
-
-    /**
-     * 分值列表
-     */
-    @Column(name = "score_list")
-    private String scoreList;
-
-    /**
-     * 所花时间，以秒为单位
-     */
-    @Column(name = "spent")
-    private Long spent;
-
-    @Enumerated(EnumType.ORDINAL)
-    @Column(name = "status")
-    private LibraryStatus status;
-
-    /**
-     * 提交人
-     */
-    @Column(name = "submitter")
-    private Integer submitter;
-
-    /**
-     * 领卷时间
-     */
-    @Column(name = "submit_time")
-    private Date submitTime;
-
-    /**
-     * 类型：0：样卷1：试评2：正评
-     */
-    @Column(name = "type")
-    private Integer type;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getLibraryId() {
-        return libraryId;
-    }
-
-    public void setLibraryId(Integer libraryId) {
-        this.libraryId = libraryId;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public String getScoreList() {
-        return scoreList;
-    }
-
-    public void setScoreList(String scoreList) {
-        this.scoreList = scoreList;
-    }
-
-    public Long getSpent() {
-        return spent;
-    }
-
-    public void setSpent(Long spent) {
-        this.spent = spent;
-    }
-
-    public LibraryStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(LibraryStatus status) {
-        this.status = status;
-    }
-
-    public Integer getSubmitter() {
-        return submitter;
-    }
-
-    public void setSubmitter(Integer submitter) {
-        this.submitter = submitter;
-    }
-
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/model/ArbitrationLibrary.java

@@ -1,207 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-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 javax.persistence.Transient;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.FormallyHistory;
-import cn.com.qmth.stmms.biz.distributpaper.model.TryHistory;
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-import cn.com.qmth.stmms.common.enums.LibraryType;
-
-@Entity
-@Table(name = "m_arbitration_library")
-public class ArbitrationLibrary implements Serializable {
-
-    private static final long serialVersionUID = 3640243043219601714L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 学习中心CODE
-     */
-    @Column(name = "campus_code")
-    private String campusCode;
-
-    /**
-     * 考试ID
-     */
-    @Column(name = "exam_id")
-    private Integer examId;
-
-    /**
-     * 科目CODE
-     */
-    @Column(name = "subject_code")
-    private String subjectCode;
-
-    /**
-     * 科目块ID
-     */
-    @Column(name = "block_id")
-    private Integer blockId;
-
-    /**
-     * 密号
-     */
-    @Column(name = "secret_no")
-    private Integer secretNo;
-
-    /**
-     * 类型：0：样卷1：试评2：正评
-     */
-    @Column(name = "type")
-    @Enumerated(EnumType.ORDINAL)
-    private LibraryType type;
-
-    /**
-     * 发生时间
-     */
-    @Column(name = "occur_time")
-    private Date occurTime;
-
-    /**
-     * 状态
-     */
-    @Enumerated(EnumType.ORDINAL)
-    @Column(name = "status")
-    private LibraryStatus status;
-
-    @Transient
-    private SubjectiveBlock subjectiveBlock;
-
-    @Transient
-    private List<TryHistory> tryHistoryList;
-
-    @Transient
-    private List<FormallyHistory> formallyHistoryList;
-
-    private transient String pictureConfig;
-
-    private transient List<String> pictureUrls;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getSecretNo() {
-        return secretNo;
-    }
-
-    public void setSecretNo(Integer secretNo) {
-        this.secretNo = secretNo;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public SubjectiveBlock getSubjectiveBlock() {
-        return subjectiveBlock;
-    }
-
-    public void setSubjectiveBlock(SubjectiveBlock subjectiveBlock) {
-        this.subjectiveBlock = subjectiveBlock;
-    }
-
-    public LibraryType getType() {
-        return type;
-    }
-
-    public void setType(LibraryType type) {
-        this.type = type;
-    }
-
-    public LibraryStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(LibraryStatus status) {
-        this.status = status;
-    }
-
-    public Date getOccurTime() {
-        return occurTime;
-    }
-
-    public void setOccurTime(Date occurTime) {
-        this.occurTime = occurTime;
-    }
-
-    public List<TryHistory> getTryHistoryList() {
-        return tryHistoryList;
-    }
-
-    public void setTryHistoryList(List<TryHistory> tryHistoryList) {
-        this.tryHistoryList = tryHistoryList;
-    }
-
-    public List<FormallyHistory> getFormallyHistoryList() {
-        return formallyHistoryList;
-    }
-
-    public void setFormallyHistoryList(List<FormallyHistory> formallyHistoryList) {
-        this.formallyHistoryList = formallyHistoryList;
-    }
-
-    public String getCampusCode() {
-        return campusCode;
-    }
-
-    public void setCampusCode(String campusCode) {
-        this.campusCode = campusCode;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public String getPictureConfig() {
-        return pictureConfig;
-    }
-
-    public void setPictureConfig(String pictureConfig) {
-        this.pictureConfig = pictureConfig;
-    }
-
-    public List<String> getPictureUrls() {
-        return pictureUrls;
-    }
-
-    public void setPictureUrls(List<String> pictureUrls) {
-        this.pictureUrls = pictureUrls;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/model/RandomHistory.java

@@ -1,149 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.model;
-
-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.LibraryStatus;
-import cn.com.qmth.stmms.common.enums.LibraryType;
-
-@Entity
-@Table(name = "m_random_history")
-public class RandomHistory implements Serializable {
-
-    private static final long serialVersionUID = 7233107543719920269L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 抽查库ID
-     */
-    @Column(name = "library_id")
-    private Integer libraryId;
-
-    /**
-     * 提交人
-     */
-    @Column(name = "submitter")
-    private Integer submitter;
-
-    /**
-     * 领卷时间
-     */
-    @Column(name = "submit_time")
-    private Date submitTime;
-
-    /**
-     * 总得分
-     */
-    @Column(name = "total_score")
-    private Double totalScore;
-
-    /**
-     * 分值列表
-     */
-    @Column(name = "score_list")
-    private String scoreList;
-
-    /**
-     * 所花时间，以秒为单位
-     */
-    @Column(name = "spent")
-    private Long spent;
-
-    /**
-     * 状态：1给分2打回重评
-     */
-    @Enumerated(EnumType.ORDINAL)
-    @Column(name = "status")
-    private LibraryStatus status;
-
-    /**
-     * 类型：1：试评2：正评
-     */
-    @Enumerated(EnumType.ORDINAL)
-    @Column(name = "type")
-    private LibraryType type;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getLibraryId() {
-        return libraryId;
-    }
-
-    public void setLibraryId(Integer libraryId) {
-        this.libraryId = libraryId;
-    }
-
-    public Integer getSubmitter() {
-        return submitter;
-    }
-
-    public void setSubmitter(Integer submitter) {
-        this.submitter = submitter;
-    }
-
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public String getScoreList() {
-        return scoreList;
-    }
-
-    public void setScoreList(String scoreList) {
-        this.scoreList = scoreList;
-    }
-
-    public Long getSpent() {
-        return spent;
-    }
-
-    public void setSpent(Long spent) {
-        this.spent = spent;
-    }
-
-    public LibraryStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(LibraryStatus status) {
-        this.status = status;
-    }
-
-    public LibraryType getType() {
-        return type;
-    }
-
-    public void setType(LibraryType type) {
-        this.type = type;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/model/RandomLibrary.java

@@ -1,233 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-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 javax.persistence.Transient;
-
-import cn.com.qmth.stmms.biz.distributpaper.model.FormallyHistory;
-import cn.com.qmth.stmms.biz.distributpaper.model.TryHistory;
-import cn.com.qmth.stmms.biz.exam.model.Marker;
-import cn.com.qmth.stmms.biz.exam.model.SubjectiveBlock;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-import cn.com.qmth.stmms.common.enums.LibraryType;
-
-@Entity
-@Table(name = "m_random_library")
-public class RandomLibrary implements Serializable {
-
-    private static final long serialVersionUID = -3674108817388842931L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /**
-     * 学校ID
-     */
-    @Column(name = "library_id")
-    private Integer libraryId;
-
-    /**
-     * 密号
-     */
-    @Column(name = "secret_no")
-    private Integer secretNo;
-
-    /**
-     * 块ID
-     */
-    @Column(name = "block_id")
-    private Integer blockId;
-
-    /**
-     * 评卷员ID
-     */
-    @Column(name = "marker_id")
-    private Integer markerId;
-
-    /**
-     * 状态，0：未处理1：已给分2:已打回
-     */
-    @Enumerated(EnumType.ORDINAL)
-    @Column(name = "status")
-    private LibraryStatus status;
-
-    /**
-     * 类型：1：试评2：正评
-     */
-    @Enumerated(EnumType.ORDINAL)
-    @Column(name = "type")
-    private LibraryType type;
-
-    /**
-     * 发生时间
-     */
-    @Column(name = "check_time")
-    private Date checkTime;
-
-    /**
-     * 发生时间
-     */
-    @Column(name = "mark_time")
-    private Date markTime;
-
-    @Transient
-    private Marker marker;
-
-    @Transient
-    private SubjectiveBlock subjectiveBlock;
-
-    @Transient
-    private List<TryHistory> tryHistoryList;
-
-    @Transient
-    private List<FormallyHistory> formallyHistoryList;
-
-    @Transient
-    private String pictureConfig;
-
-    @Transient
-    private List<String> pictureUrls;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public SubjectiveBlock getSubjectiveBlock() {
-        return subjectiveBlock;
-    }
-
-    public void setSubjectiveBlock(SubjectiveBlock subjectiveBlock) {
-        this.subjectiveBlock = subjectiveBlock;
-    }
-
-    public LibraryStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(LibraryStatus status) {
-        this.status = status;
-    }
-
-    public LibraryType getType() {
-        return type;
-    }
-
-    public void setType(LibraryType type) {
-        this.type = type;
-    }
-
-    public Integer getLibraryId() {
-        return libraryId;
-    }
-
-    public void setLibraryId(Integer libraryId) {
-        this.libraryId = libraryId;
-    }
-
-    public Date getCheckTime() {
-        return checkTime;
-    }
-
-    public void setCheckTime(Date checkTime) {
-        this.checkTime = checkTime;
-    }
-
-    public List<TryHistory> getTryHistoryList() {
-        return tryHistoryList;
-    }
-
-    public void setTryHistoryList(List<TryHistory> tryHistoryList) {
-        this.tryHistoryList = tryHistoryList;
-    }
-
-    public List<FormallyHistory> getFormallyHistoryList() {
-        return formallyHistoryList;
-    }
-
-    public void setFormallyHistoryList(List<FormallyHistory> formallyHistoryList) {
-        this.formallyHistoryList = formallyHistoryList;
-    }
-
-    public Integer getSecretNo() {
-        return secretNo;
-    }
-
-    public void setSecretNo(Integer secretNo) {
-        this.secretNo = secretNo;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public Integer getMarkerId() {
-        return markerId;
-    }
-
-    public void setMarkerId(Integer markerId) {
-        this.markerId = markerId;
-    }
-
-    public Date getMarkTime() {
-        return markTime;
-    }
-
-    public void setMarkTime(Date markTime) {
-        this.markTime = markTime;
-    }
-
-    public Marker getMarker() {
-        return marker;
-    }
-
-    public void setMarker(Marker marker) {
-        this.marker = marker;
-    }
-
-    public String getPictureConfig() {
-        return pictureConfig;
-    }
-
-    public void setPictureConfig(String pictureConfig) {
-        this.pictureConfig = pictureConfig;
-    }
-
-    public String getPictureUrls() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("[");
-        if (pictureUrls != null && pictureUrls.size() > 0) {
-            int length = pictureUrls.size();
-            for (int i = 0; i < length; i++) {
-                sb.append("\"").append(pictureUrls.get(i)).append("\"");
-                if (i < (length - 1)) {
-                    sb.append(",");
-                }
-            }
-        }
-        sb.append("]");
-        return sb.toString();
-    }
-
-    public void setPictureUrls(List<String> pictureUrls) {
-        this.pictureUrls = pictureUrls;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/model/SubjectHeader.java

@@ -1,150 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-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 org.apache.commons.lang.StringUtils;
-
-import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
-import cn.com.qmth.stmms.common.annotation.ExcelField;
-
-@Entity
-@Table(name = "eb_subject_header")
-public class SubjectHeader implements Serializable {
-
-    public static final String LOGINNAME_SPLITE = "-";
-
-    private static final long serialVersionUID = -4411296033041898963L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    @Column(name = "exam_id")
-    private Integer examId;
-
-    @Column(name = "subject_code")
-    @ExcelField(title = "科目代码", align = 2, sort = 10)
-    private String subjectCode;
-
-    @Column(name = "login_name")
-    @ExcelField(title = "登录名", align = 2, sort = 20)
-    private String loginName;
-
-    @Column(name = "password")
-    @ExcelField(title = "密码", align = 2, sort = 30)
-    private String password;
-
-    @Column(name = "last_login_ip")
-    private String lastLoginIp;
-
-    @Column(name = "last_login_time")
-    private Date lastLoginTime;
-
-    @Transient
-    private int number;
-
-    @Transient
-    private ExamSubject subject;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getLastLoginIp() {
-        return lastLoginIp;
-    }
-
-    public void setLastLoginIp(String lastLoginIp) {
-        this.lastLoginIp = lastLoginIp;
-    }
-
-    public Date getLastLoginTime() {
-        return lastLoginTime;
-    }
-
-    public void setLastLoginTime(Date lastLoginTime) {
-        this.lastLoginTime = lastLoginTime;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-    public int getNumber() {
-        return number;
-    }
-
-    public void setNumber(int number) {
-        this.number = number;
-    }
-
-    public void buildLoginName(int number) {
-        StringBuilder name = new StringBuilder();
-        name.append(examId).append(LOGINNAME_SPLITE);
-        name.append(subjectCode).append(LOGINNAME_SPLITE);
-        name.append(number);
-        setLoginName(name.toString());
-    }
-
-    public static SubjectHeader parseLoginName(String loginName) {
-        SubjectHeader header = null;
-        try {
-            String[] values = StringUtils.split(loginName, LOGINNAME_SPLITE);
-            header = new SubjectHeader();
-            header.setExamId(Integer.valueOf(values[0]));
-            header.setSubjectCode(values[1]);
-            header.setNumber(Integer.valueOf(values[2]));
-        } catch (Exception e) {
-            header = null;
-        }
-        return header;
-    }
-
-    public ExamSubject getSubject() {
-        return subject;
-    }
-
-    public void setSubject(ExamSubject subject) {
-        this.subject = subject;
-    }
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/query/ArbitrationLibrarySearchQuery.java

@@ -1,102 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.query;
-
-import java.util.Date;
-
-import cn.com.qmth.stmms.biz.common.BaseQuery;
-import cn.com.qmth.stmms.biz.subjectheader.model.ArbitrationLibrary;
-import cn.com.qmth.stmms.common.enums.LibraryStatus;
-import cn.com.qmth.stmms.common.enums.LibraryType;
-
-public class ArbitrationLibrarySearchQuery extends BaseQuery<ArbitrationLibrary> {
-
-    private Integer examId;
-
-    private Integer subjectId;
-
-    private Integer classType;
-
-    private LibraryType type;
-
-    private Integer blockId;
-
-    private Date startTime;
-
-    private Date endTime;
-
-    private Integer secretNo;
-
-    private LibraryStatus status;
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public Integer getSecretNo() {
-        return secretNo;
-    }
-
-    public void setSecretNo(Integer secretNo) {
-        this.secretNo = secretNo;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public LibraryStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(LibraryStatus status) {
-        this.status = status;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public Integer getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(Integer subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public Integer getClassType() {
-        return classType;
-    }
-
-    public void setClassType(Integer classType) {
-        this.classType = classType;
-    }
-
-    public LibraryType getType() {
-        return type;
-    }
-
-    public void setType(LibraryType type) {
-        this.type = type;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/query/CaseLibrarySearchQuery.java

@@ -1,48 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.query;
-
-import cn.com.qmth.stmms.biz.common.BaseQuery;
-import cn.com.qmth.stmms.biz.distributpaper.model.CaseLibrary;
-
-public class CaseLibrarySearchQuery extends BaseQuery<CaseLibrary> {
-
-    private Integer examId;
-
-    private String subjectCode;
-
-    private Integer blockId;
-
-    private Integer count;
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public String getSubjectCode() {
-		return subjectCode;
-	}
-
-	public void setSubjectCode(String subjectCode) {
-		this.subjectCode = subjectCode;
-	}
-
-	public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public Integer getCount() {
-        return count;
-    }
-
-    public void setCount(Integer count) {
-        this.count = count;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/query/ProblemLibrarySearchQuery.java

@@ -1,100 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.query;
-
-import java.util.Date;
-
-import cn.com.qmth.stmms.biz.common.BaseQuery;
-import cn.com.qmth.stmms.biz.distributpaper.model.ProblemLibrary;
-
-public class ProblemLibrarySearchQuery extends BaseQuery<ProblemLibrary> {
-
-    private Integer examId;
-
-    private String subjectCode;
-
-    private Integer submitter;
-
-    private Integer reason;
-
-    private Integer status;
-
-    private Date startTime;
-
-    private Date endTime;
-
-    private Integer paperNumber;
-
-    private Integer blockId;
-
-    public Integer getSubmitter() {
-        return submitter;
-    }
-
-    public void setSubmitter(Integer submitter) {
-        this.submitter = submitter;
-    }
-
-    public Integer getReason() {
-        return reason;
-    }
-
-    public void setReason(Integer reason) {
-        this.reason = reason;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public Integer getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(Integer paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-	public String getSubjectCode() {
-		return subjectCode;
-	}
-
-	public void setSubjectCode(String subjectCode) {
-		this.subjectCode = subjectCode;
-	}
-    
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/query/RandomLibrarySearchQuery.java

@@ -1,83 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.query;
-
-import java.util.Date;
-
-import cn.com.qmth.stmms.biz.common.BaseQuery;
-import cn.com.qmth.stmms.biz.subjectheader.model.RandomLibrary;
-
-public class RandomLibrarySearchQuery extends BaseQuery<RandomLibrary> {
-
-    private Date startTime;
-
-    private Date endTime;
-
-    private Integer secretNo;
-
-    private Integer blockId;
-
-    /**
-     * 类型：1：试评2：正评
-     */
-    private Integer type;
-
-    private Integer markerId;
-
-    private Integer status;
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public Integer getSecretNo() {
-        return secretNo;
-    }
-
-    public void setSecretNo(Integer secretNo) {
-        this.secretNo = secretNo;
-    }
-
-    public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Integer getMarkerId() {
-        return markerId;
-    }
-
-    public void setMarkerId(Integer markerId) {
-        this.markerId = markerId;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/query/StandardLibrarySearchQuery.java

@@ -1,48 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.query;
-
-import cn.com.qmth.stmms.biz.common.BaseQuery;
-import cn.com.qmth.stmms.biz.distributpaper.model.StandardLibrary;
-
-public class StandardLibrarySearchQuery extends BaseQuery<StandardLibrary> {
-
-    private Integer examId;
-
-    private String subjectCode;
-
-    private Integer blockId;
-
-    private Integer count;
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public String getSubjectCode() {
-		return subjectCode;
-	}
-
-	public void setSubjectCode(String subjectCode) {
-		this.subjectCode = subjectCode;
-	}
-
-	public Integer getBlockId() {
-        return blockId;
-    }
-
-    public void setBlockId(Integer blockId) {
-        this.blockId = blockId;
-    }
-
-    public Integer getCount() {
-        return count;
-    }
-
-    public void setCount(Integer count) {
-        this.count = count;
-    }
-
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/subjectheader/service/ArbitrationHistoryService.java

@@ -1,17 +0,0 @@
-package cn.com.qmth.stmms.biz.subjectheader.service;
-
-import cn.com.qmth.stmms.biz.subjectheader.model.ArbitrationHistory;
-
-public interface ArbitrationHistoryService {
-
-    ArbitrationHistory save(ArbitrationHistory arbitrationHistory);
-
-    ArbitrationHistory findById(Integer id);
-
-    void deleteById(Integer id);
-
-    void delete(ArbitrationHistory arbitrationHistory);
-
-    void saveMark(ArbitrationHistory arbitrationHistory);
-
-}