提交修改

servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java

@@ -72,8 +72,6 @@ public class AloneExamApi extends ApiBaseController {
     @Resource
     private IExamPaperService examPapeService;
     
-    
-    
     /**
      * 当前用户的考试任务,AloneExam
      * @param pager
@@ -84,7 +82,7 @@ public class AloneExamApi extends ApiBaseController {
     public JsonResponse<PageList<AloneExam>> findUserPage(Pagination pager, AloneExam dto) {
         try {
         	dto.setAid(getCurrent().getAccountId());
-            PageList<AloneExam> rs = service.findPage(pager.getPageIndex(), pager.getPageSize(), dto, OrderCondition.desc("sysCreateTime"));
+            PageList<AloneExam> rs = service.findPage(pager.getPageIndex(), pager.getPageSize(), dto, null);
             return success(rs);
         } catch (Exception e){
             log.error("查询独立考试答卷列表错误", e);

servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/AloneExam.java

@@ -5,6 +5,7 @@ import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xboe.core.SysConstant;
@@ -115,7 +116,7 @@ public class AloneExam extends IdBaseEntity {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "yyyy--MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Column(name = "start_time")
     private LocalDateTime startTime;
 
@@ -125,5 +126,26 @@ public class AloneExam extends IdBaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Column(name = "end_time")
     private LocalDateTime endTime;
+    
+    @Transient
+    private Float total;
+    
+    public AloneExam() {
+    	
+    }
+    
+    public AloneExam(String id,String aid,String testId,String testName,Integer testDuration,Integer times,Float score,Integer status,LocalDateTime taskTime,LocalDateTime startTime,LocalDateTime endTime) {
+    	this.setId(id);
+    	this.setAid(aid);
+    	this.testId=testId;
+    	this.testName=testName;
+    	this.testDuration=testDuration;
+    	this.times=times;
+    	this.score=score;
+    	this.status=status;
+    	this.taskTime=taskTime;
+    	this.startTime=startTime;
+    	this.endTime=endTime;
+    }
 
 }

servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java

@@ -18,6 +18,7 @@ import com.xboe.module.exam.dao.AloneExamAnswerDao;
 import com.xboe.module.exam.dao.AloneExamDao;
 import com.xboe.module.exam.entity.AloneExam;
 import com.xboe.module.exam.entity.AloneExamAnswer;
+import com.xboe.module.exam.entity.ExamTest;
 import com.xboe.module.exam.service.IAloneExamService;
 
 @Service
@@ -182,29 +183,31 @@ public class AloneExamServiceImpl implements IAloneExamService{
 
 	@Override
 	public PageList<AloneExam> findPage(int pageIndex, int pageSize, AloneExam aea, OrderCondition oc) {
-		QueryBuilder query=QueryBuilder.from(AloneExam.class);
+		QueryBuilder query=QueryBuilder.from(AloneExam.class.getSimpleName()+" a,"+ExamTest.class.getSimpleName()+" t");
+		query.addField("new AloneExam(a.id,a.aid,a.testId,a.testName,a.testDuration,a.times,a.score,a.status,a.taskTime,t.entranceTime,t.deadlineTime)");
 		query.setPageIndex(pageIndex);
 		query.setPageSize(pageSize);
+		query.addFilter(FieldFilters.eqField("a.testId","t.id"));
 		if(oc!=null) {
 			query.addOrder(oc);
 		}else {
-			query.addOrder(OrderCondition.desc("sysCreateTime"));
+			query.addOrder(OrderCondition.desc("a.sysCreateTime"));
 		}
 		if(aea!=null) {
 			if(aea.getStatus()!=null) {
-				query.addFilter(FieldFilters.eq("status",aea.getStatus()));
+				query.addFilter(FieldFilters.eq("a.status",aea.getStatus()));
 			}
 			if(StringUtils.isNotBlank(aea.getTestId())) {
-				query.addFilter(FieldFilters.eq("testId",aea.getTestId()));
+				query.addFilter(FieldFilters.eq("a.testId",aea.getTestId()));
 			}
 			if(StringUtils.isNotBlank(aea.getTestName())) {
-				query.addFilter(FieldFilters.like("testName",aea.getTestName()));
+				query.addFilter(FieldFilters.like("a.testName",aea.getTestName()));
 			}
 			if(StringUtils.isNotBlank(aea.getAid())) {
-				query.addFilter(FieldFilters.eq("aid",aea.getAid()));
+				query.addFilter(FieldFilters.eq("a.aid",aea.getAid()));
 			}
 			if(StringUtils.isNotBlank(aea.getName())) {
-				query.addFilter(FieldFilters.eq("name",aea.getName()));
+				query.addFilter(FieldFilters.eq("a.name",aea.getName()));
 			}
 		}
 		return aeDao.findPage(query.builder());

servers/boe-server-all/src/main/resources/application-dev.properties

@@ -52,7 +52,7 @@ jasypt.encryptor.algorithm=PBEWithMD5AndDES
 jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator
 
 # elasticsearch config
-xboe.elasticsearch.server.ip=127.0.0.1
+xboe.elasticsearch.server.ip=192.168.0.11
 xboe.elasticsearch.server.port=9200
 xboe.elasticsearch.server.user=
 xboe.elasticsearch.server.password=