bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/SysUser.java

@@ -64,7 +64,7 @@ public class SysUser extends BaseEntity implements Serializable {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("org_id")
-    @NotNull(message = "请选择机构")
+//    @NotNull(message = "请选择机构")
     private Long orgId;
     /**
      * 0-禁用，1-启用

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

@@ -20,7 +20,7 @@ import java.util.List;
  */
 public interface ExamCardMapper extends BaseMapper<ExamCard> {
 
-    IPage<CardCustDto> listCardCust(Page<CardCustDto> page, @Param("status") String status, @Param("paperNumber") String paperNumber, @Param("userId") String userId, @Param("applyStartTime") Long applyStartTime, @Param("applyEndTime") Long applyEndTime, @Param("finishStartTime") Long finishStartTime, @Param("finishEndTime") Long finishEndTime);
+    IPage<CardCustDto> listCardCust(Page<CardCustDto> page, @Param("schoolId") String schoolId, @Param("status") String status, @Param("paperNumber") String paperNumber, @Param("userId") String userId, @Param("applyStartTime") Long applyStartTime, @Param("applyEndTime") Long applyEndTime, @Param("finishStartTime") Long finishStartTime, @Param("finishEndTime") Long finishEndTime);
 
     CardDetailDto getCardDetail(Long cardId);
 

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

@@ -18,4 +18,6 @@ import java.util.Map;
 public interface ExamDetailCourseMapper extends BaseMapper<ExamDetailCourse> {
 
     List<Map<String, String>> listByExamDetailId(@Param("examDetailId") Long examDetailId, @Param("status") String status);
+
+    List<ExamDetailCourse> listByExamDetailIdAndStatus(@Param("examDetailId") Long examDetailId, @Param("status") String status);
 }

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

@@ -24,6 +24,4 @@ public interface ExamTaskDetailMapper extends BaseMapper<ExamTaskDetail> {
 
     List<ExamTaskDetail> listByTemplateId(Long templateId);
 
-    List<Map<String, String>> listByExamDetailId(@Param("schoolId") Long schoolId, @Param("examDetailId") Long examDetailId);
-
 }

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

@@ -23,7 +23,7 @@ public interface ExamCardService extends IService<ExamCard> {
 
     String saveExamCard(ExamCardParams examCardParams);
 
-    IPage<CardCustDto> listCardCust(String status, String paperNumber, String userId, Long applyStartTime, Long applyEndTime, Long finishStartTime, Long finishEndTime, Integer pageNumber, Integer pageSize);
+    IPage<CardCustDto> listCardCust(String schoolId, String status, String paperNumber, String userId, Long applyStartTime, Long applyEndTime, Long finishStartTime, Long finishEndTime, Integer pageNumber, Integer pageSize);
 
     String saveExamCardCust(ExamCardParams examCardParams);
 

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

@@ -28,4 +28,6 @@ public interface ExamDetailCourseService extends IService<ExamDetailCourse> {
     List<ExamDetailCourse> listDetailCourseByCourseCodeAndPaperNumber(Long schoolId, String courseCode, String paperNumber);
 
     void updatePaperNumber(List<ExamDetailCourse> examDetailCourses, String paperNumber);
+
+    List<ExamDetailCourse> listByExamDetailIdAndStatus(Long examDetailId);
 }

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

@@ -36,6 +36,4 @@ public interface ExamTaskDetailService extends IService<ExamTaskDetail> {
 
     String getUrl(Long schoolId, Long examTaskId);
 
-    List<Map<String, String>> listByExamDetailId(Long schoolId, Long examDetailId);
-
 }

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

@@ -18,6 +18,7 @@ import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.*;
 import com.qmth.distributed.print.business.service.*;
+import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
 import com.qmth.distributed.print.business.util.AuthUtil;
 import com.qmth.distributed.print.business.util.OssUtil;
 import com.qmth.distributed.print.business.util.RedisUtil;
@@ -95,6 +96,15 @@ public class CommonServiceImpl implements CommonService {
     @Resource
     CommonService commonService;
 
+    @Autowired
+    private ExamDetailCourseService examDetailCourseService;
+
+    @Autowired
+    private TBTaskService tbTaskService;
+
+    @Autowired
+    private AsyncCreatePdfTempleteService asyncCreatePdfTempleteService;
+
     /**
      * 新增用户权限
      *
@@ -601,8 +611,8 @@ public class CommonServiceImpl implements CommonService {
             List<ExamDetail> examDetails = examDetailService.listByCourseCodeAndPaperNumber(schoolId, courseCode, paperNumber);
             if (examDetails != null && examDetails.size() > 0) {
                 // 3.检查examDetailId下有无其它课程
-                /*for (ExamDetail examDetail : examDetails) {
-                    List<ExamDetailCourse> examDetailCourses = examDetailCourseService.listByExamDetailId(examDetail.getId());
+                for (ExamDetail examDetail : examDetails) {
+                    List<ExamDetailCourse> examDetailCourses = examDetailCourseService.listByExamDetailIdAndStatus(examDetail.getId());
                     // 4.没有未完成的命题任务
                     if (examDetailCourses.isEmpty()) {
                         Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.CREATE_PDF, examDetail.getPrintPlanId(), user);
@@ -612,7 +622,7 @@ public class CommonServiceImpl implements CommonService {
                         map.computeIfAbsent("schoolId", v -> schoolId);
                         asyncCreatePdfTempleteService.createPdf(map, null);
                     }
-                }*/
+                }
             }
         }
     }

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

@@ -11,7 +11,6 @@ import com.qmth.distributed.print.business.bean.params.ExamCardParams;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.CardStatusEnum;
 import com.qmth.distributed.print.business.enums.CardTypeEnum;
-import com.qmth.distributed.print.business.enums.ExamCardStatusEnum;
 import com.qmth.distributed.print.business.enums.MakeMethodEnum;
 import com.qmth.distributed.print.business.mapper.ExamCardMapper;
 import com.qmth.distributed.print.business.service.*;
@@ -26,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -127,9 +125,9 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
     }
 
     @Override
-    public IPage<CardCustDto> listCardCust(String status, String paperNumber, String userId, Long applyStartTime, Long applyEndTime, Long finishStartTime, Long finishEndTime, Integer pageNumber, Integer pageSize) {
+    public IPage<CardCustDto> listCardCust(String schoolId, String status, String paperNumber, String userId, Long applyStartTime, Long applyEndTime, Long finishStartTime, Long finishEndTime, Integer pageNumber, Integer pageSize) {
         Page<CardCustDto> page = new Page<>(pageNumber, pageSize);
-        IPage<CardCustDto> cardCustDtoIPage = this.baseMapper.listCardCust(page, status, paperNumber, userId, applyStartTime, applyEndTime, finishStartTime, finishEndTime);
+        IPage<CardCustDto> cardCustDtoIPage = this.baseMapper.listCardCust(page, schoolId, status, paperNumber, userId, applyStartTime, applyEndTime, finishStartTime, finishEndTime);
         return cardCustDtoIPage;
     }
 
@@ -142,7 +140,7 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
         if (!MakeMethodEnum.CUST.name().equals(examCardParams.getMakeMethod().name())) {
             throw ExceptionResultEnum.ERROR.exception("题卡制作类型错误");
         }
-        if (StringUtils.isBlank(examCardParams.getAttachmentId())) {
+        if (StringUtils.isBlank(examCardParams.getCustAttachmentId())) {
             throw ExceptionResultEnum.ERROR.exception("客户制卡时，附件未上传");
         }
 

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

@@ -54,4 +54,9 @@ public class ExamDetailCourseServiceImpl extends ServiceImpl<ExamDetailCourseMap
         updateWrapper.lambda().set(ExamDetailCourse::getPaperNumber, paperNumber).in(ExamDetailCourse::getId, examDetailCourseIds);
         this.update(updateWrapper);
     }
+
+    @Override
+    public List<ExamDetailCourse> listByExamDetailIdAndStatus(Long examDetailId) {
+        return this.baseMapper.listByExamDetailIdAndStatus(examDetailId, ExamDetailStatusEnum.FINISH.name());
+    }
 }

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

@@ -166,9 +166,4 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
         return null;
     }
 
-    @Override
-    public List<Map<String, String>> listByExamDetailId(Long schoolId, Long examDetailId) {
-        return this.baseMapper.listByExamDetailId(schoolId, examDetailId);
-    }
-
 }

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

@@ -54,6 +54,9 @@
             sys_user g ON a.create_id = g.id
         <where>
             a.make_method = 'CUST'
+            <if test="schoolId != null and schoolId != ''">
+                and a.school_id = #{schoolId}
+            </if>
             <if test="status != null and status != ''">
                 and a.status = #{status}
             </if>

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

@@ -37,5 +37,21 @@
         WHERE
             a.exam_detail_id = #{examDetailId} AND b.status = #{status}
     </select>
+    <select id="listByExamDetailIdAndStatus" resultMap="BaseResultMap">
+        SELECT
+            a.*
+        FROM
+            exam_detail_course a
+                LEFT JOIN
+            exam_task b ON a.school_id = b.school_id
+                AND a.course_code = b.course_code
+                AND a.paper_number = b.paper_number
+                LEFT JOIN
+            exam_task_detail c ON b.id = c.exam_task_id
+                LEFT JOIN
+            exam_card_detail d ON c.card_id = d.card_id
+        WHERE
+            a.exam_detail_id = #{examDetailId} AND b.status != #{status}
+    </select>
 
 </mapper>

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

@@ -108,25 +108,4 @@
                     a.card_id = b.id
                         AND b.template_id = #{templateId})
     </select>
-    <select id="listByExamDetailId" resultType="java.util.Map">
-        SELECT
-            a.course_code courseCode,
-            a.paper_number paperNumber,
-            b.paper_attachment_ids paperAttachmentIds
-        FROM
-            exam_task a
-                LEFT JOIN
-            exam_task_detail b ON a.id = b.exam_task_id
-        WHERE
-            a.school_id = #{schoolId}
-                AND EXISTS( SELECT
-                    1
-                FROM
-                    exam_detail_course b
-                WHERE
-                    b.exam_detail_id = #{examDetailId}
-                        AND a.school_id = b.school_id
-                        AND a.course_code = b.course_code
-                        AND a.paper_number = b.paper_number)
-    </select>
 </mapper>

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

@@ -67,6 +67,7 @@ public class ExamCardController {
     /**
      * 客服制卡审核查询
      *
+     * @param schoolId
      * @param status
      * @param paperNumber
      * @param userId
@@ -80,7 +81,8 @@ public class ExamCardController {
      */
     @ApiOperation(value = "客服制卡审核查询")
     @RequestMapping(value = "/cust_list", method = RequestMethod.POST)
-    public Result list(@RequestParam(value = "status", required = false) String status,
+    public Result list(@RequestParam(value = "schoolId", required = false) String schoolId,
+                       @RequestParam(value = "status", required = false) String status,
                        @RequestParam(value = "paperNumber", required = false) String paperNumber,
                        @RequestParam(value = "userId", required = false) String userId,
                        @RequestParam(value = "applyStartTime", required = false) Long applyStartTime,
@@ -89,7 +91,7 @@ public class ExamCardController {
                        @RequestParam(value = "finishEndTime", required = false) Long finishEndTime,
                        @RequestParam(value = "pageNumber") Integer pageNumber,
                        @RequestParam(value = "pageSize") Integer pageSize) {
-        IPage<CardCustDto> cardCustDtoIPage = examCardService.listCardCust(status, paperNumber, userId, applyStartTime, applyEndTime, finishStartTime, finishEndTime, pageNumber, pageSize);
+        IPage<CardCustDto> cardCustDtoIPage = examCardService.listCardCust(schoolId, status, paperNumber, userId, applyStartTime, applyEndTime, finishStartTime, finishEndTime, pageNumber, pageSize);
         return ResultUtil.ok(cardCustDtoIPage);
     }