chenken %!s(int64=7) %!d(string=hai) anos
pai
achega
7981dd2523

+ 3 - 5
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamStudentController.java

@@ -516,15 +516,13 @@ public class ExamStudentController extends ControllerSupport {
 
 	@ApiOperation(value = "学习中心考试进度信息", notes = "学习中心考试进度信息")
 	@GetMapping("/findOrgExamInfos")
-	public ResponseEntity<Object> findOrgExamInfos(String examId, String orgCode) {
+	public ResponseEntity<Object> findOrgExamInfos(String examId, Long orgId) {
 		try {
-			List<OrgExamInfoDTO> orgExamInfoDTOs = examStudentService.findOrgExamInfos(examId,
-					orgCode);
+			List<OrgExamInfoDTO> orgExamInfoDTOs = examStudentService.findOrgExamInfos(examId,orgId);
 			return new ResponseEntity<Object>(orgExamInfoDTOs, HttpStatus.OK);
 		} catch (Exception e) {
 			e.printStackTrace();
-			return new ResponseEntity(new ErrorMsg(e.getMessage()),
-					HttpStatus.INTERNAL_SERVER_ERROR);
+			return new ResponseEntity(new ErrorMsg(e.getMessage()),HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 

+ 6 - 4
examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamStudentServiceImpl.java

@@ -750,17 +750,19 @@ public class ExamStudentServiceImpl implements ExamStudentService {
 	 * @param orgCode
 	 * @return
 	 */
-	public List<OrgExamInfoDTO> findOrgExamInfos(String examId, String orgCode) {
+	public List<OrgExamInfoDTO> findOrgExamInfos(String examId, Long orgId) {
 		if (StringUtils.isBlank(examId)) {
 			return null;
 		}
 		StringBuilder sql = new StringBuilder();
-		sql.append("select t.org_id orgid," + " t.org_code orgcode," + " t.org_name orgname,"
+		sql.append("select t.org_id orgid," 
+				+ " t.org_code orgcode," 
+				+ " t.org_name orgname,"
 				+ " count(t.id) allNum,"
 				+ " sum(case when t.finished = 1 then 1 else  0 end) completedNum "
 				+ " from ecs_exam_student  t" + " where t.exam_id = ?");
-		if (StringUtils.isNotBlank(orgCode)) {
-			sql.append(" and t.org_code = '" + orgCode + "'");
+		if (orgId != null) {
+			sql.append(" and t.org_id = "+orgId);
 		}
 		sql.append(" group by t.org_id, t.org_name order by t.org_id");
 		return jdbcTemplate.query(sql.toString(), new Object[]{examId},