瀏覽代碼

提交导出设置BUG

chenken 8 年之前
父節點
當前提交
c6eb13fc5e

+ 0 - 5
cqb-paper/src/main/java/com/qmth/cqb/paper/model/ExtractConfig.java

@@ -107,11 +107,6 @@ public class ExtractConfig implements Serializable {
     	this.courseCode = course_code;
 	}
     
-    public ExtractConfig(String examType,Long examId){
-    	this.examType = examType;
-    	this.examId = examId;
-    }
-
 	public Long getExamId() {
         return examId;
     }

+ 16 - 13
cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/ExportStructureServiceImpl.java

@@ -14,6 +14,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
@@ -51,6 +55,9 @@ public class ExportStructureServiceImpl implements ExportStructureService {
 	@Autowired
 	private ExtractConfigRepo extractConfigRepo;
 	
+	@Autowired
+	private MongoTemplate mongoTemplate;
+	
 	@Value("${upyun.bucketName}")
 	protected String bucketName;
 	
@@ -135,22 +142,18 @@ public class ExportStructureServiceImpl implements ExportStructureService {
 				UpYun upyun = new UpYun(bucketName,userName,password);
 				for(int i=0;i<list.size();i++){
 					upyun.deleteFile(list.get(i).getFilePath());
-					//examFileRepo.delete(list.get(i));
 				}
 				examFileRepo.delete(list);
 			}
-			//2.然后修改ExtractConfig表      根据 examId 和    examType
-			ExtractConfig extractConfig = new ExtractConfig(exportStructure.getExamType().name(),Long.valueOf(exportStructure.getExamId()));
-			List<ExtractConfig> extractConfigList = extractConfigRepo.findAll(Example.of(extractConfig));
-			if(extractConfigList.size()>0){
-				//获取每个对象, 并修改isFinish  和   finishedPaperIdMap
-				for(int i=0;i<extractConfigList.size();i++){
-					extractConfigList.get(i).setIfFinish((short) 0);
-					extractConfigList.get(i).setFinishedPaperIdMap(null);
-					//extractConfigRepo.save(extractConfigList.get(i));
-				}
-				extractConfigRepo.save(extractConfigList);
-			}
+			//2.然后修改ExtractConfig表      根据 examId 和    orgId
+			Query query = new Query();
+			query.addCriteria(Criteria.where("examId").is(Long.valueOf(exportStructure.getExamId())));
+			query.addCriteria(Criteria.where("orgId").is(exportStructure.getOrgId()));
+			Update update = new Update();
+			update.set("ifFinish", 0);
+			update.unset("finishedPaperIdMap");
+			mongoTemplate.updateMulti(query, update, ExtractConfig.class);
+			
 			exportStructureRepo.delete(exportStructure);
 		}
 	}