bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamDetailMapper.java

@@ -45,7 +45,7 @@ public interface ExamDetailMapper extends BaseMapper<ExamDetail> {
     IPage<ExaminationDetailResult> findDetailPageById(@Param("page") Page<ExaminationDetailResult> page,
                                                   @Param("examDetailId") Long examDetailId);
 
-    PrintTaskTotalDto taskTotalData(@Param("schoolId") Long schoolId, @Param("printPlanId") Long printPlanId, @Param("status") String status, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("examPlace") String examPlace, @Param("examRoom") String examRoom, @Param("examStartTime") Long examStartTime, @Param("examEndTime") Long examEndTime);
+    PrintTaskTotalDto taskTotalData(@Param("schoolId") Long schoolId, @Param("printPlanId") Long printPlanId, @Param("status") String status, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("examPlace") String examPlace, @Param("examRoom") String examRoom, @Param("examStartTime") Long examStartTime, @Param("examEndTime") Long examEndTime, @Param("orgIds") Set<Long> orgIds);
 
     TaskTotalLeftDto calcLeftA3(Long schoolId);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamTaskMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.ExamTask;
+import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -34,7 +35,7 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
 
     IPage<ExamTaskDetailDto> listTaskPaper(Page<ExamTaskDetailDto> page, @Param("schoolId") Long schoolId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds);
 
-    List<RelatePaperDto> listPaperNumbers(@Param("schoolId") Long schoolId, @Param("courseCode") String courseCode);
+    List<RelatePaperDto> listPaperNumbers(@Param("schoolId") Long schoolId, @Param("courseCode") String courseCode, @Param("status") String status);
 
     ExamTaskDetailCardDto applyGetOne(Long examTaskId);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/SysUserMapper.java

@@ -21,7 +21,7 @@ import java.util.Set;
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
-    IPage<UserDto> listPage(Page<UserDto> page, @Param("schoolId") Long schoolId, @Param("realName") String realName, @Param("roleId") String roleId, @Param("enable") Boolean enable);
+    IPage<UserDto> listPage(Page<UserDto> page, @Param("schoolId") Long schoolId, @Param("loginName") String loginName, @Param("roleId") String roleId, @Param("enable") Boolean enable);
 
     List<BlurryUserDto> listUser(@Param("schoolId") Long schoolId, @Param("type") String type, @Param("courseCode") String courseCode, @Param("param") String param, @Param("orgIds") Set<Long> orgIds);
 

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

@@ -21,7 +21,7 @@ import java.util.List;
  */
 public interface SysUserService extends IService<SysUser> {
 
-    IPage<UserDto> list(String realName, String roleId, Boolean enable, Integer pageNumber, Integer pageSize);
+    IPage<UserDto> list(String loginName, String roleId, Boolean enable, Integer pageNumber, Integer pageSize);
 
     boolean saveUser(UserSaveParams userSaveParams);
 

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

@@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -48,7 +49,9 @@ public class ExamDetailCourseServiceImpl extends ServiceImpl<ExamDetailCourseMap
 
     @Override
     public void updatePaperNumber(List<ExamDetailCourse> examDetailCourses, String paperNumber) {
+        List<Long> examDetailCourseIds = examDetailCourses.stream().map(m->m.getId()).collect(Collectors.toList());
         UpdateWrapper<ExamDetailCourse> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().set(ExamDetailCourse::getPaperNumber, paperNumber).in(ExamDetailCourse::getId, examDetailCourses);
+        updateWrapper.lambda().set(ExamDetailCourse::getPaperNumber, paperNumber).in(ExamDetailCourse::getId, examDetailCourseIds);
+        this.update(updateWrapper);
     }
 }

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

@@ -109,7 +109,8 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
     @Override
     public PrintTaskTotalDto taskTotalData(Long printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        PrintTaskTotalDto printTaskTotalDto = this.baseMapper.taskTotalData(schoolId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime);
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
+        PrintTaskTotalDto printTaskTotalDto = this.baseMapper.taskTotalData(schoolId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, orgIds);
 
         // 计算A3剩余
         TaskTotalLeftDto totalLeftDto = this.baseMapper.calcLeftA3(schoolId);

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

@@ -170,7 +170,13 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             if (task.getEnable()) {
                 throw ExceptionResultEnum.ERROR.exception("命题任务禁用后，才能更改命题老师");
             }
-            updateWrapper.lambda().set(ExamTask::getUserId, examTask.getUserId()).eq(ExamTask::getId, examTask.getId());
+            ExamStatusEnum examStatusEnum;
+            if(examTask.getUserId() == null){
+                examStatusEnum = ExamStatusEnum.NEW;
+            } else {
+                examStatusEnum = ExamStatusEnum.READY;
+            }
+            updateWrapper.lambda().set(ExamTask::getUserId, examTask.getUserId()).set(ExamTask::getStatus, examStatusEnum).eq(ExamTask::getId, examTask.getId());
         }
 
         return this.update(updateWrapper);
@@ -578,7 +584,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Override
     public List<RelatePaperDto> listPaperTypes(Long examTaskId, Long printPlanId, String courseCode) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        List<RelatePaperDto> list = this.baseMapper.listPaperNumbers(schoolId, courseCode);
+        List<RelatePaperDto> list = this.baseMapper.listPaperNumbers(schoolId, courseCode, ExamStatusEnum.FINISH.name());
         for (RelatePaperDto relatePaperDto : list) {
             QueryWrapper<ExamTaskDetail> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(ExamTaskDetail::getExamTaskId, relatePaperDto.getId()).eq(ExamTaskDetail::getEnable, true);

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

@@ -70,11 +70,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     SysUserService sysUserService;
 
     @Override
-    public IPage<UserDto> list(String realName, String roleId, Boolean enable, Integer pageNumber, Integer pageSize) {
+    public IPage<UserDto> list(String loginName, String roleId, Boolean enable, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
 
         Page<UserDto> page = new Page<>(pageNumber, pageSize);
-        IPage<UserDto> userDtoIPage = this.baseMapper.listPage(page, schoolId, realName, roleId, enable);
+        IPage<UserDto> userDtoIPage = this.baseMapper.listPage(page, schoolId, loginName, roleId, enable);
         if (userDtoIPage.getRecords().size() > 0) {
             userDtoIPage.getRecords().forEach(m -> {
                 //角色

distributed-print-business/src/main/resources/mapper/ExamDetailMapper.xml

@@ -57,10 +57,10 @@
                 exam_detail_course
                 <where>
                     <if test="courseCode != null and courseCode != ''">
-                        course_code = #{courseCode}
+                        and course_code = #{courseCode}
                     </if>
                     <if test="paperNumber != null and paperNumber != ''">
-                        paper_number = #{paperNumber}
+                        and paper_number = #{paperNumber}
                     </if>
                 </where>
             GROUP BY exam_detail_id) c ON b.id = c.exam_detail_id
@@ -68,22 +68,22 @@
             sys_user d on a.create_id = d.id
             <where>
                 <if test="printPlanId != null and printPlanId != ''">
-                    a.id = #{printPlanId}
+                    and a.id = #{printPlanId}
                 </if>
                 <if test="status != null and status != ''">
-                    b.status = #{status}
+                    and b.status = #{status}
                 </if>
                 <if test="examPlace != null and examPlace != ''">
-                    b.exam_place = #{examPlace}
+                    and b.exam_place = #{examPlace}
                 </if>
                 <if test="examRoom != null and examRoom != ''">
-                    b.exam_room = #{examRoom}
+                    and b.exam_room = #{examRoom}
                 </if>
                 <if test="examStartTime != null and examStartTime != ''">
-                    b.exam_start_time &gt; #{examStartTime}
+                    and b.exam_start_time &gt; #{examStartTime}
                 </if>
                 <if test="examEndTime != null and examEndTime != ''">
-                    b.exam_end_time &lt; #{examEndTime}
+                    and b.exam_end_time &lt; #{examEndTime}
                 </if>
                 <if test="orgIds != null">
                     AND d.org_id IN
@@ -237,24 +237,35 @@
             exam_print_plan a
          JOIN
             exam_detail b ON a.id = b.print_plan_id
+        JOIN
+            sys_user d on a.create_id = d.id
         <where>
+            <if test="schoolId != null and schoolId != ''">
+                and a.school_id = #{schoolId}
+            </if>
             <if test="printPlanId != null and printPlanId != ''">
-                a.id = #{printPlanId}
+                and a.id = #{printPlanId}
             </if>
             <if test="status != null and status != ''">
-                b.status = #{status}
+                and b.status = #{status}
             </if>
             <if test="examPlace != null and examPlace != ''">
-                b.exam_place = #{examPlace}
+                and b.exam_place = #{examPlace}
             </if>
             <if test="examRoom != null and examRoom != ''">
-                b.exam_room = #{examRoom}
+                and b.exam_room = #{examRoom}
             </if>
             <if test="examStartTime != null and examStartTime != ''">
-                b.exam_start_time &gt; #{examStartTime}
+                and b.exam_start_time &gt; #{examStartTime}
             </if>
             <if test="examEndTime != null and examEndTime != ''">
-                b.exam_end_time &lt; #{examEndTime}
+                and b.exam_end_time &lt; #{examEndTime}
+            </if>
+            <if test="orgIds != null">
+                AND d.org_id IN
+                <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
         </where>
     </select>

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -382,7 +382,7 @@
         FROM
             exam_task
         <where>
-            school_id = #{schoolId} and course_code = #{courseCode} and enable = true
+            school_id = #{schoolId} and course_code = #{courseCode} and status = #{status} and enable = true
         </where>
     </select>
     <select id="applyGetOne" resultType="com.qmth.distributed.print.business.bean.dto.ExamTaskDetailCardDto">

distributed-print-business/src/main/resources/mapper/SysUserMapper.xml

@@ -41,8 +41,8 @@
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>
-            <if test="realName != null and realName != ''">
-                and a.real_name like concat('%', #{realName} , '%')
+            <if test="loginName != null and loginName != ''">
+                and a.login_name like concat('%', #{loginName} , '%')
             </if>
             <if test="roleId != null and roleId != ''">
                 and a.id in (select user_id from sys_user_role b where b.role_id = #{roleId})

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

@@ -294,7 +294,7 @@ public class ExamPrintPlanController {
     @RequestMapping(value = "/task_view_pdf", method = RequestMethod.POST)
     public Result taskViewPDF(@RequestBody Map<String, Long> map) {
         String path = examDetailService.taskViewPDF(map.get("examDetailId"));
-        return ResultUtil.ok(path);
+        return ResultUtil.ok(path, "");
     }
 
     @ApiOperation(value = "印刷任务管理-批量下载PDF")

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

@@ -51,19 +51,19 @@ public class SysUserController {
     /**
      * 查询
      *
-     * @param realName
+     * @param loginName
      * @param roleId
      * @param enable
      * @return
      */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(@RequestParam(value = "realName", required = false) String realName,
+    public Result list(@RequestParam(value = "loginName", required = false) String loginName,
                        @RequestParam(value = "roleId", required = false) String roleId,
                        @RequestParam(value = "enable", required = false) Boolean enable,
                        @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
                        @RequestParam(value = "pageSize", required = true) Integer pageSize) {
-        IPage<UserDto> userDtos = sysUserService.list(realName, roleId, enable, pageNumber, pageSize);
+        IPage<UserDto> userDtos = sysUserService.list(loginName, roleId, enable, pageNumber, pageSize);
         return ResultUtil.ok(userDtos);
     }