正式环境配置

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TCStatisticsServiceImpl.java

@@ -7,10 +7,14 @@ import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.dto.TCStatisticsDto;
+import com.qmth.distributed.print.business.entity.ExamDetailCourse;
+import com.qmth.distributed.print.business.entity.ExamStudent;
 import com.qmth.distributed.print.business.entity.TCStatistics;
 import com.qmth.distributed.print.business.entity.TCStatisticsTemp;
 import com.qmth.distributed.print.business.enums.StatisticsStatusEnum;
 import com.qmth.distributed.print.business.mapper.TCStatisticsMapper;
+import com.qmth.distributed.print.business.service.ExamDetailCourseService;
+import com.qmth.distributed.print.business.service.ExamStudentService;
 import com.qmth.distributed.print.business.service.TCStatisticsService;
 import com.qmth.distributed.print.business.service.TCStatisticsTempService;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
@@ -50,6 +54,12 @@ public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCS
     @Resource
     RedisUtil redisUtil;
 
+    @Resource
+    ExamStudentService examStudentService;
+
+    @Resource
+    ExamDetailCourseService examDetailCourseService;
+
     /**
      * 查找印刷计划信息
      *
@@ -213,8 +223,11 @@ public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCS
                 if (t.getPrintSum().intValue() > temp.getPrintSum().intValue()) {
                     map.put(key, t);
                 } else if (t.getPrintSum().intValue() == temp.getPrintSum().intValue()) {
-                    temp.setExamDetailId(null);
-                    temp.setStatus(StatisticsStatusEnum.UN_JOIN);
+                    if (t.getStatus() != StatisticsStatusEnum.UN_JOIN) {
+                        temp.setExamDetailId(t.getExamDetailId());
+                    } else {
+                        temp.setExamDetailId(null);
+                    }
                 }
             }
         }

distributed-print/src/main/java/com/qmth/distributed/print/api/SysUserController.java

@@ -1,12 +1,9 @@
 package com.qmth.distributed.print.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.distributed.print.business.templete.execute.AsyncSysUserDataImportService;
-import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
 import com.qmth.teachcloud.common.bean.params.UserSaveParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -30,7 +27,6 @@ import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.security.NoSuchAlgorithmException;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -73,7 +69,7 @@ public class SysUserController {
                        @RequestParam(value = "realName", required = false) String realName,
                        @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(sysUserService.list(loginName, roleId, enable,realName, pageNumber, pageSize));
+        return ResultUtil.ok(sysUserService.list(loginName, roleId, enable, realName, pageNumber, pageSize));
     }
 
     /**
@@ -189,7 +185,7 @@ public class SysUserController {
     public Result sysUserImportAysnc(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws Exception {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Map<String, Object> map = printCommonService.saveTask(file, TaskTypeEnum.USER_IMPORT);
-        map.put(SystemConstant.SYS_USER,sysUser);
+        map.put(SystemConstant.SYS_USER, sysUser);
 
         asyncSysUserDataImportService.importTask(map);
         TBTask tbTask = Objects.nonNull(map.get(SystemConstant.TASK)) ? (TBTask) map.get(SystemConstant.TASK) : null;