修改orgId

cqb-gen-paper/src/main/java/com/qmth/cqb/genpaper/web/GenPaperController.java

@@ -38,7 +38,7 @@ public class GenPaperController {
     @PostMapping("/genPaper/simple")
     public ResponseEntity genPaperSimple(HttpServletRequest request, @RequestBody GenPaperDto genPaperDto) {
         AccessUser user = (AccessUser) request.getAttribute("accessUser");
-        genPaperDto.setOrgId(user.getOrgId().toString());
+        genPaperDto.setOrgId(user.getRootOrgId().toString());
         genPaperDto.setCreator(user.getName());
         Map<String, Object> paperMap = new HashMap<String, Object>();
         String paperName = genPaperDto.getPaperName();
@@ -83,7 +83,7 @@ public class GenPaperController {
     @PostMapping("/genPaper/normal")
     public ResponseEntity genPaperNormal(HttpServletRequest request, @RequestBody GenPaperDto genPaperDto) {
         AccessUser user = (AccessUser) request.getAttribute("accessUser");
-        genPaperDto.setOrgId(user.getOrgId().toString());
+        genPaperDto.setOrgId(user.getRootOrgId().toString());
         genPaperDto.setCreator(user.getName());
         Map<String, Object> paperMap = new HashMap<String, Object>();
         String paperName = genPaperDto.getPaperName();

cqb-paper/src/main/java/com/qmth/cqb/paper/service/ImportPaperService.java

@@ -98,7 +98,7 @@ public class ImportPaperService {
     public Map<String, Object> ImportPaper(String paperName, String courseNo, String courseName, AccessUser user,
             File file) throws Exception {
         Map<String, Object> msgMap = new HashMap<String, Object>();
-        String errorInfo = paperService.checkPaperName(paperName, user.getOrgId().toString());
+        String errorInfo = paperService.checkPaperName(paperName, user.getRootOrgId().toString());
         if (errorInfo == null) {
             msgMap = processImportPaper(paperName, courseNo, courseName, user, file);
             if (StringUtils.isEmpty((String) msgMap.get("msg"))) {
@@ -187,7 +187,7 @@ public class ImportPaperService {
 
         paper.setCourseName(courseName);
 
-        paper.setOrgId(user.getOrgId().toString());
+        paper.setOrgId(user.getRootOrgId().toString());
 
         paper.setCreator(user.getName());
 
@@ -275,7 +275,7 @@ public class ImportPaperService {
                 // 设置question与Unit集合数据
                 question.setCourseNo(paper.getCourseNo());
                 question.setCourseName(paper.getCourseName());
-                question.setOrgId(user.getOrgId().toString());
+                question.setOrgId(user.getRootOrgId().toString());
                 questions.add(question);
                 paperDetailUnits.add(paperDetailUnit);
 
@@ -872,7 +872,7 @@ public class ImportPaperService {
     public Map<String, Object> saveBlankPaper(String courseNo, String courseName, String paperName, AccessUser user) {
         Map<String, Object> returnMap = new HashMap<String, Object>();
         Paper paper = new Paper();
-        String msg = paperService.checkPaperName(paperName, user.getOrgId().toString());
+        String msg = paperService.checkPaperName(paperName, user.getRootOrgId().toString());
         if (msg != null) {
             returnMap.put("msg", msg);
             return returnMap;
@@ -880,7 +880,7 @@ public class ImportPaperService {
         initPaper(paper, paperName);
         paper.setCourseNo(courseNo);
         paper.setCourseName(courseName);
-        paper.setOrgId(user.getOrgId().toString());
+        paper.setOrgId(user.getRootOrgId().toString());
         paper.setCreator(user.getName());
         paper.setCreateTime(CommonUtils.getCurDateTime());
         PaperDetail pd = new PaperDetail();

cqb-paper/src/main/java/com/qmth/cqb/paper/service/PaperService.java

@@ -152,6 +152,19 @@ public class PaperService {
         return paperRepo.findAll(Example.of(importPaper));
     }
 
+    /**
+     * 根据条件查询
+     *
+     * @param paperSearchInfo
+     * @return
+     */
+    public List<Paper> getGenPapersBySearch(PaperSearchInfo paperSearchInfo) {
+        formatPaperSearchInfo(paperSearchInfo);
+        Paper genPaper = BeanCopierUtil.copyProperties(paperSearchInfo, Paper.class);
+        genPaper.setPaperType(PaperType.GENERATE);
+        return paperRepo.findAll(Example.of(genPaper));
+    }
+
     /**
      * 保存试卷
      *
@@ -168,7 +181,7 @@ public class PaperService {
             oldPaper.setLastModifyName(user.getName());
             if (!oldName.equals(paperExp.getName().trim())) {// 假如改变了试卷名称
                                                              // 则要效验试卷名称唯一性
-                String msg = this.checkPaperName(paperExp.getName().trim(), user.getOrgId().toString());
+                String msg = this.checkPaperName(paperExp.getName().trim(), user.getRootOrgId().toString());
                 if (msg == null) {
                     paperRepo.save(oldPaper);
                     msgMap.put("msg", "success");
@@ -617,7 +630,7 @@ public class PaperService {
      * @return
      */
     public Paper insertQuestionToPaper(String paperId, String paperDetailId, Question question, AccessUser user) {
-        question.setOrgId(user.getOrgId().toString());
+        question.setOrgId(user.getRootOrgId().toString());
         quesService.updateQuesWord(question);
         question = quesRepo.save(question);
         Paper paper = paperRepo.findOne(paperId);

cqb-paper/src/main/java/com/qmth/cqb/paper/service/PaperStructService.java

@@ -41,7 +41,7 @@ public class PaperStructService {
      */
     public Page<PaperStruct> getPaperStructs(PaperStructSearchInfo searchInfo, int curPage, int pageSize,
             AccessUser user) {
-        searchInfo.setOrgId(user.getOrgId().toString());
+        searchInfo.setOrgId(user.getRootOrgId().toString());
         formatSearchInfo(searchInfo);
         PaperStruct paperStruct = BeanCopierUtil.copyProperties(searchInfo, PaperStruct.class);
         formatPaperStruct(paperStruct);
@@ -74,7 +74,7 @@ public class PaperStructService {
             PaperStruct oldPaperStruct = paperStructRepo.findOne(paperStruct.getId());
             PaperStruct rps = null;
             if (oldPaperStruct != null && !paperStruct.getName().equals(oldPaperStruct.getName())) {// 那么就是更新操作
-                rps = this.checkNameUnique(paperStruct.getName(), user.getOrgId().toString());
+                rps = this.checkNameUnique(paperStruct.getName(), user.getRootOrgId().toString());
             }
             if (rps != null) {
                 return null;
@@ -103,7 +103,7 @@ public class PaperStructService {
             paperDetailStruct.setPaperDetailUnitStructs(unitStructs);
         }
         paperStruct.setDetailCount(paperDetailStructs.size());
-        paperStruct.setOrgId(user.getOrgId().toString());
+        paperStruct.setOrgId(user.getRootOrgId().toString());
         paperStruct.setCreator(user.getName());
         paperStruct.setCreateTime(CommonUtils.getCurDateTime());
         return paperStructRepo.save(paperStruct);

cqb-paper/src/main/java/com/qmth/cqb/paper/web/ExtractConfigController.java

@@ -63,7 +63,7 @@ public class ExtractConfigController {
 	public ResponseEntity saveExtractConfig(HttpServletRequest request,@RequestBody ExtractConfig extractConfig){
 		try{
 			AccessUser user = (AccessUser) request.getAttribute("accessUser");
-			extractConfig.setOrgId(user.getOrgId()+"");
+			extractConfig.setOrgId(user.getRootOrgId()+"");
 			extractConfigService.saveExtractConfig(extractConfig);
 			return new ResponseEntity(HttpStatus.OK);
 		}catch(Exception e){

cqb-paper/src/main/java/com/qmth/cqb/paper/web/PaperController.java

@@ -118,7 +118,7 @@ public class PaperController {
     public ResponseEntity getImportPapers(HttpServletRequest request, @ModelAttribute PaperSearchInfo paperSearchInfo,
             @PathVariable int curPage, @PathVariable int pageSize) {
         AccessUser user = (AccessUser) request.getAttribute("accessUser");
-        paperSearchInfo.setOrgId(user.getOrgId().toString());
+        paperSearchInfo.setOrgId(user.getRootOrgId().toString());
         return new ResponseEntity(paperService.getImportPapers(paperSearchInfo, curPage, pageSize), HttpStatus.OK);
     }
 
@@ -128,7 +128,7 @@ public class PaperController {
     public ResponseEntity getImportPapersNotSuccess(HttpServletRequest request,
             @ModelAttribute PaperSearchInfo paperSearchInfo, @PathVariable int curPage, @PathVariable int pageSize) {
         AccessUser user = (AccessUser) request.getAttribute("accessUser");
-        paperSearchInfo.setOrgId(user.getOrgId().toString());
+        paperSearchInfo.setOrgId(user.getRootOrgId().toString());
         return new ResponseEntity(paperService.getImportPapersNotSuccess(paperSearchInfo, curPage, pageSize),
                 HttpStatus.OK);
     }
@@ -136,10 +136,23 @@ public class PaperController {
     @ApiOperation(value = "根据条件查询导入试卷", notes = "根据条件查询导入试卷")
     @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/getImportPaper")
-    public ResponseEntity<List<Paper>> getImportPapersBySearch(@ModelAttribute PaperSearchInfo paperSearchInfo) {
+    public ResponseEntity<List<Paper>> getImportPapersBySearch(HttpServletRequest request,
+                                                               @ModelAttribute PaperSearchInfo paperSearchInfo) {
+        AccessUser user = (AccessUser) request.getAttribute("accessUser");
+        paperSearchInfo.setOrgId(user.getRootOrgId().toString());
         return new ResponseEntity<List<Paper>>(paperService.getImportPapersBySearch(paperSearchInfo), HttpStatus.OK);
     }
 
+    @ApiOperation(value = "根据条件查询已组试卷", notes = "根据条件查询已组试卷")
+    @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
+    @GetMapping(value = "/getGenPaper")
+    public ResponseEntity<List<Paper>> getGenPapersBySearch(HttpServletRequest request,
+                                                            @ModelAttribute PaperSearchInfo paperSearchInfo) {
+        AccessUser user = (AccessUser) request.getAttribute("accessUser");
+        paperSearchInfo.setOrgId(user.getRootOrgId().toString());
+        return new ResponseEntity<List<Paper>>(paperService.getGenPapersBySearch(paperSearchInfo), HttpStatus.OK);
+    }
+
     /**
      * 查询所有已组试卷
      *
@@ -154,7 +167,7 @@ public class PaperController {
     public ResponseEntity getGenPapers(HttpServletRequest request, @ModelAttribute PaperSearchInfo paperSearchInfo,
             @PathVariable int curPage, @PathVariable int pageSize) {
         AccessUser user = (AccessUser) request.getAttribute("accessUser");
-        paperSearchInfo.setOrgId(user.getOrgId().toString());
+        paperSearchInfo.setOrgId(user.getRootOrgId().toString());
         return new ResponseEntity(paperService.getGenPapers(paperSearchInfo, curPage, pageSize), HttpStatus.OK);
     }
 
@@ -479,7 +492,7 @@ public class PaperController {
             @ModelAttribute PaperSearchInfo paperSearchInfo, @PathVariable String[] ids, @PathVariable int curPage,
             @PathVariable int pageSize) {
         AccessUser user = (AccessUser) request.getAttribute("accessUser");
-        paperSearchInfo.setOrgId(user.getOrgId().toString());
+        paperSearchInfo.setOrgId(user.getRootOrgId().toString());
         if (ids != null && ids.length > 0) {
             return new ResponseEntity(paperService.getImportPapersNotInIds(paperSearchInfo, ids, curPage, pageSize),
                     HttpStatus.OK);
@@ -501,7 +514,7 @@ public class PaperController {
     public ResponseEntity getImportPapersByCourseNo(HttpServletRequest request,
             @ModelAttribute PaperSearchInfo paperSearchInfo) {
         AccessUser user = (AccessUser) request.getAttribute("accessUser");
-        paperSearchInfo.setOrgId(user.getOrgId().toString());
+        paperSearchInfo.setOrgId(user.getRootOrgId().toString());
         paperService.formatPaperSearchInfo(paperSearchInfo);
         Paper importPaper = BeanCopierUtil.copyProperties(paperSearchInfo, Paper.class);
         importPaper.setPaperType(PaperType.IMPORT);
@@ -510,7 +523,8 @@ public class PaperController {
     }
     /**
      * 使用原卷
-     * @param selectedPaperIds
+     * @param request
+     * @param paperIds
      * @return
      */
     @ApiOperation(value = "复制导入试卷为组卷", notes = "复制导入试卷为组卷")

cqb-paper/src/main/java/com/qmth/cqb/paper/web/PaperStructController.java

@@ -116,7 +116,7 @@ public class PaperStructController {
     @PostMapping(value = "/paperStruct")
     public ResponseEntity addPaperStruct(HttpServletRequest request, @RequestBody PaperStruct ps) {
         AccessUser user = (AccessUser) request.getAttribute("accessUser");
-        PaperStruct paperStructTemp = paperStructService.checkNameUnique(ps.getName(), user.getOrgId().toString());
+        PaperStruct paperStructTemp = paperStructService.checkNameUnique(ps.getName(), user.getRootOrgId().toString());
         if (paperStructTemp != null) {
             return new ResponseEntity("试卷结构名称重复，请重新命名！", HttpStatus.INTERNAL_SERVER_ERROR);
         } else {

cqb-question-resource/src/main/java/com/qmth/cqb/question/web/QuesController.java

@@ -73,7 +73,7 @@ public class QuesController {
                                         @PathVariable int curPage, 
                                         @PathVariable int pageSize) {
         AccessUser user = (AccessUser) request.getAttribute("accessUser");
-        searchCondition.setOrgId(user.getOrgId().toString());
+        searchCondition.setOrgId(user.getRootOrgId().toString());
         return new ResponseEntity(quesService.findAll(searchCondition, curPage, pageSize), HttpStatus.OK);
     }