caozixuan преди 1 година
родител
ревизия
3d5a3f2a00

+ 2 - 0
src/main/java/cn/com/qmth/print/manage/config/PmConstants.java

@@ -16,6 +16,8 @@ public interface PmConstants {
 
     public static final String LING_SIGN = "_";
 
+    public static final String DEFAULT_ORG_CODE = "qmth";
+
     /**
      * 默认密码
      */

+ 8 - 0
src/main/java/cn/com/qmth/print/manage/controller/ExamController.java

@@ -1,9 +1,12 @@
 package cn.com.qmth.print.manage.controller;
 
+import cn.com.qmth.print.manage.config.PmConstants;
 import cn.com.qmth.print.manage.entity.ExamEntity;
+import cn.com.qmth.print.manage.entity.OrgEntity;
 import cn.com.qmth.print.manage.entity.UserEntity;
 import cn.com.qmth.print.manage.enums.RoleMeta;
 import cn.com.qmth.print.manage.service.ExamService;
+import cn.com.qmth.print.manage.service.OrgService;
 import cn.com.qmth.print.manage.service.PmSession;
 import cn.com.qmth.print.manage.service.UserService;
 import cn.com.qmth.print.manage.service.query.ExamQuery;
@@ -30,6 +33,8 @@ public class ExamController extends BaseController {
     private ExamService examService;
     @Resource
     private UserService userService;
+    @Resource
+    private OrgService orgService;
 
     /**
      * 批次分页查询
@@ -66,6 +71,9 @@ public class ExamController extends BaseController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public Object save(@RequestAttribute PmSession accessEntity, ExamEntity exam) {
         Long userId = getAccessUserId(accessEntity);
+        // 默认机构
+        OrgEntity defaultOrg = orgService.findByCode(PmConstants.DEFAULT_ORG_CODE);
+        exam.setOrgId(defaultOrg.getId());
         exam.setCreatorId(userId);
         exam.setUpdaterId(userId);
         return examService.saveExam(exam);

+ 2 - 1
src/main/java/cn/com/qmth/print/manage/service/impl/ExamServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.print.manage.service.impl;
 
+import cn.com.qmth.print.manage.config.PmConstants;
 import cn.com.qmth.print.manage.dao.ExamDao;
 import cn.com.qmth.print.manage.dto.ExamDTO;
 import cn.com.qmth.print.manage.entity.*;
@@ -194,7 +195,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
                 .map(ExamEntity::getName)
                 .collect(Collectors.toList());
         // 默认机构
-        OrgEntity defaultOrg = orgService.findByCode("qmth");
+        OrgEntity defaultOrg = orgService.findByCode(PmConstants.DEFAULT_ORG_CODE);
 
         List<ExamEntity> examEntityList = new ArrayList<>();
 

+ 2 - 2
src/main/java/cn/com/qmth/print/manage/service/impl/ExamStudentServiceImpl.java

@@ -80,11 +80,11 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentDao, ExamStud
             result = checkStudentCode;
         } else {
             // 判断examNumber是否为小条码(去掉末尾和examNumber)
-            examNumber = examNumber.substring(0, examNumber.length() - 1);
+            String smallExamNumber = examNumber.substring(0, examNumber.length() - 1);
             ExamStudentEntity checkExamNumber = this.getOne(new QueryWrapper<ExamStudentEntity>()
                     .lambda()
                     .eq(ExamStudentEntity::getExamId, examId)
-                    .eq(ExamStudentEntity::getExamNumber, examNumber));
+                    .eq(ExamStudentEntity::getExamNumber, smallExamNumber));
             if (Objects.isNull(checkExamNumber)) {
                 throw new StatusException("未找到考生[" + examNumber + "]");
             }