复核工作量导出新增工号；主观分未完成分组标识更新

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/bean/InspectWorkVo.java

@@ -5,29 +5,49 @@ import java.math.BigInteger;
 import cn.com.qmth.stmms.common.annotation.ExcelField;
 
 public class InspectWorkVo {
-	@ExcelField(title = "登录名*", align = 2, sort = 1)
-	private String loginName;
-	@ExcelField(title = "姓名*", align = 2, sort = 2)
-	private String name;
-	@ExcelField(title = "复核数量*", align = 2, sort = 3)
-	private BigInteger work;
-	public String getLoginName() {
-		return loginName;
-	}
-	public void setLoginName(String loginName) {
-		this.loginName = loginName;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public BigInteger getWork() {
-		return work;
-	}
-	public void setWork(BigInteger work) {
-		this.work = work;
-	}
-	
+
+    @ExcelField(title = "登录名*", align = 2, sort = 1)
+    private String loginName;
+
+    @ExcelField(title = "工号", align = 2, sort = 2)
+    private String empno;
+
+    @ExcelField(title = "姓名*", align = 2, sort = 2)
+    private String name;
+
+    @ExcelField(title = "复核数量*", align = 2, sort = 3)
+    private BigInteger work;
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public BigInteger getWork() {
+        return work;
+    }
+
+    public void setWork(BigInteger work) {
+        this.work = work;
+    }
+
+    public String getEmpno() {
+        return empno;
+    }
+
+    public void setEmpno(String empno) {
+        this.empno = empno;
+    }
+
 }

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

@@ -23,30 +23,35 @@ import cn.com.qmth.stmms.biz.exam.service.InspectHistoryService;
 
 @Service("inspectHistoryService")
 public class InspectHistoryServiceImpl extends BaseQueryService<InspectHistory> implements InspectHistoryService {
-	@PersistenceContext
-	private EntityManager entityManager;
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
     @Autowired
     private InspectHistoryDao inspectHistoryDao;
+
     @Autowired
     private ExamStudentService examStudentService;
+
     @Autowired
     private ExamSubjectService examSubjectService;
-    
-    
+
     @Override
     public InspectHistory save(InspectHistory i) {
         return inspectHistoryDao.saveAndFlush(i);
     }
 
-//    @Override
-//    public List<InspectHistory> findByStudentIdLimit3(Integer studentId) {
-//        List<InspectHistory> list = inspectHistoryDao.findByStudentIdLimit3(studentId, 3);
-//        for (InspectHistory inspectHistory : list) {
-//            User user = userDao.findOne(inspectHistory.getInspectorId());
-//            inspectHistory.setInspectorName(user.getLoginName() + "/" + user.getName());
-//        }
-//        return list;
-//    }
+    // @Override
+    // public List<InspectHistory> findByStudentIdLimit3(Integer studentId) {
+    // List<InspectHistory> list =
+    // inspectHistoryDao.findByStudentIdLimit3(studentId, 3);
+    // for (InspectHistory inspectHistory : list) {
+    // User user = userDao.findOne(inspectHistory.getInspectorId());
+    // inspectHistory.setInspectorName(user.getLoginName() + "/" +
+    // user.getName());
+    // }
+    // return list;
+    // }
 
     @Override
     public Integer countByStudentId(Integer studentId) {
@@ -57,8 +62,8 @@ public class InspectHistoryServiceImpl extends BaseQueryService<InspectHistory>
     @Override
     public void deleteByExamIdAndSubjectCode(int examId, String subjectCode) {
         inspectHistoryDao.deleteByExamIdAndSubjectCode(examId, subjectCode);
-        examStudentService.cancelInspect(examId,subjectCode);
-        examSubjectService.resetInspect(examId,subjectCode);
+        examStudentService.cancelInspect(examId, subjectCode);
+        examSubjectService.resetInspect(examId, subjectCode);
     }
 
     @Transactional
@@ -67,61 +72,60 @@ public class InspectHistoryServiceImpl extends BaseQueryService<InspectHistory>
         inspectHistoryDao.deleteByStudentId(studentId);
     }
 
-	@Override
-	public InspectHistory findByStudentIdAndInspectRound(Integer studentId, Integer inspectRound) {
-		return inspectHistoryDao.findByStudentIdAndInspectRound(studentId,inspectRound);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public List<InspectHistory> findByStudentIdIn(List<Integer> sids) {
-		StringBuilder sql = new StringBuilder();
-		sql.append(
-				"select t.id,t.exam_id examId,t.inspect_time inspectTime,t.inspector_id inspectorId,t.student_id studentId,t.subject_code subjectCode,t.inspect_round inspectRound,CONCAT(u.login_name, '/', u.name) inspectorName "
-		+"from eb_inspect_history t  left join b_user u on t.inspector_id=u.id ");
-		sql.append("where t.student_id in(" + StringUtils.join(sids, ",")+")");
-		Query query = entityManager.createNativeQuery(sql.toString());
-		query.unwrap(SQLQuery.class).setResultTransformer(Transformers.aliasToBean(InspectHistory.class));
-		return  query.getResultList();
-	}
-
-	@Transactional
-	@Override
-	public void deleteByStudentIdAndInspectRound(Integer studentId, Integer inspectRound) {
-		inspectHistoryDao.deleteByStudentIdAndInspectRound(studentId,  inspectRound);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public List<InspectWorkVo> findInspectWork(Integer examId) {
-		StringBuilder sql = new StringBuilder();
-		sql.append(
-				" select u.login_name loginName,u.name,count(*) work"
-		+" from eb_inspect_history t  left join b_user u on t.inspector_id=u.id ");
-		sql.append(" where t.exam_id="+examId+" group by u.id order by u.login_name ");
-		Query query = entityManager.createNativeQuery(sql.toString());
-		query.unwrap(SQLQuery.class).setResultTransformer(Transformers.aliasToBean(InspectWorkVo.class));
-		return  query.getResultList();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Boolean existByStudentIdAndUserId(Integer studentId, Integer userId) {
-		StringBuilder sql = new StringBuilder();
-		sql.append(" select r.id from eb_inspect_history r where r.student_id=" + studentId+" and r.inspector_id="+userId);
-		sql.append(" limit 1");
-		Query query = entityManager.createNativeQuery(sql.toString());
-		List<InspectHistory> ret = query.getResultList();
-		if(ret!=null&&ret.size()>0) {
-			return true;
-		}
-		return false;
-	}
-
-	@Transactional
-	@Override
-	public void deleteByExamIdAndSubjectCodeAndInspectRound(Integer examId, String subjectCode, Integer inspectRound) {
-		inspectHistoryDao.deleteByExamIdAndSubjectCodeAndInspectRound(examId, subjectCode, inspectRound);
-	}
-	
+    @Override
+    public InspectHistory findByStudentIdAndInspectRound(Integer studentId, Integer inspectRound) {
+        return inspectHistoryDao.findByStudentIdAndInspectRound(studentId, inspectRound);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<InspectHistory> findByStudentIdIn(List<Integer> sids) {
+        StringBuilder sql = new StringBuilder();
+        sql.append("select t.id,t.exam_id examId,t.inspect_time inspectTime,t.inspector_id inspectorId,t.student_id studentId,t.subject_code subjectCode,t.inspect_round inspectRound,CONCAT(u.login_name, '/', u.name) inspectorName "
+                + "from eb_inspect_history t  left join b_user u on t.inspector_id=u.id ");
+        sql.append("where t.student_id in(" + StringUtils.join(sids, ",") + ")");
+        Query query = entityManager.createNativeQuery(sql.toString());
+        query.unwrap(SQLQuery.class).setResultTransformer(Transformers.aliasToBean(InspectHistory.class));
+        return query.getResultList();
+    }
+
+    @Transactional
+    @Override
+    public void deleteByStudentIdAndInspectRound(Integer studentId, Integer inspectRound) {
+        inspectHistoryDao.deleteByStudentIdAndInspectRound(studentId, inspectRound);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<InspectWorkVo> findInspectWork(Integer examId) {
+        StringBuilder sql = new StringBuilder();
+        sql.append(" select u.login_name loginName,u.empno,u.name,count(*) work"
+                + " from eb_inspect_history t  left join b_user u on t.inspector_id=u.id ");
+        sql.append(" where t.exam_id=" + examId + " group by u.id order by u.login_name ");
+        Query query = entityManager.createNativeQuery(sql.toString());
+        query.unwrap(SQLQuery.class).setResultTransformer(Transformers.aliasToBean(InspectWorkVo.class));
+        return query.getResultList();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Boolean existByStudentIdAndUserId(Integer studentId, Integer userId) {
+        StringBuilder sql = new StringBuilder();
+        sql.append(" select r.id from eb_inspect_history r where r.student_id=" + studentId + " and r.inspector_id="
+                + userId);
+        sql.append(" limit 1");
+        Query query = entityManager.createNativeQuery(sql.toString());
+        List<InspectHistory> ret = query.getResultList();
+        if (ret != null && ret.size() > 0) {
+            return true;
+        }
+        return false;
+    }
+
+    @Transactional
+    @Override
+    public void deleteByExamIdAndSubjectCodeAndInspectRound(Integer examId, String subjectCode, Integer inspectRound) {
+        inspectHistoryDao.deleteByExamIdAndSubjectCodeAndInspectRound(examId, subjectCode, inspectRound);
+    }
+
 }

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

@@ -93,7 +93,7 @@ public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, Jpa
     @Query("select f.markerId, count(f) as markerCount from MarkLibrary f where f.examId=?1 and f.status in (?2) group by f.markerId")
     List<Object[]> countMarkerAndStatus(Integer examId, LibraryStatus... status);
 
-    @Query("select f.markerId, count(f) as markerCount from MarkLibrary f where f.examId=?1 and f.subjectCode in (?2) and f.status in (?3) group by f.markerId")
+    @Query("select f.markerId, count(f) as markerCount from MarkLibrary f where f.examId=?1 and f.subjectCode in (?2) and f.status in (?3) and and f.markerScore != -1 group by f.markerId")
     List<Object[]> countMarkerAndStatusAndSubjectCodeIn(Integer examId, Set<String> codes, LibraryStatus... status);
 
     @Query("select f.markerId, count(f) as markerCount from MarkLibrary f where f.examId=?1 and f.subjectCode=?2 and f.status in (?3) group by f.markerId")

stmms-common/src/main/java/cn/com/qmth/stmms/common/utils/VersionInfo.java

@@ -5,7 +5,7 @@ package cn.com.qmth.stmms.common.utils;
  */
 public class VersionInfo {
 
-    public static final String NAME = "1.3.14";
+    public static final String NAME = "1.3.15";
 
-    public static final String DATE = "20230808";
+    public static final String DATE = "20231101";
 }

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

@@ -86,7 +86,7 @@
 			<tr>
 				<td><input type="checkbox" class="codes" name="codes" value="${result.subject.code}">
 				${result.subject.code}-${result.subject.name}&nbsp;${result.subject.remark}
-				<c:if test="${!result.groupFinish}"><i class="icon-info-sign" title="主观分未完成分组"></i></c:if>
+				<c:if test="${!result.groupFinish}"><img class="icon-info-sign" title="主观分未完成分组" src="${ctxStatic }/images/sgin-icon@2x.png"></img></c:if>
 				</td>
 				<td>${result.subject.uploadCount}</td>
 				<td>