3.0.0-bug修改

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

@@ -26,7 +26,7 @@ public interface ExamCardMapper extends BaseMapper<ExamCard> {
 
     CardDetailDto getCardDetail(Long cardId);
 
-    List<ExamCard> listGenericCard(@Param("schoolId") Long schoolId, @Param("orgIds") Set<Long> orgIds, @Param("type") String type);
+    List<ExamCard> listGenericCard(@Param("schoolId") Long schoolId, @Param("orgIds") Set<Long> orgIds, @Param("type") String type, @Param("cardRuleId") Long cardRuleId);
 
     List<ExamCard> listCustom(@Param("schoolId") Long schoolId, @Param("orgId") Long orgId, @Param("courseCode") String courseCode, @Param("type") String type);
 

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

@@ -8,7 +8,6 @@ import com.qmth.distributed.print.business.bean.dto.SyncExamCardDto;
 import com.qmth.distributed.print.business.bean.params.ExamCardParams;
 import com.qmth.distributed.print.business.bean.params.GenericExamCardParams;
 import com.qmth.distributed.print.business.entity.ExamCard;
-import com.qmth.distributed.print.business.enums.CardTypeEnum;
 import com.qmth.teachcloud.common.bean.params.ArraysParams;
 
 import javax.servlet.http.HttpServletResponse;

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

@@ -19,6 +19,7 @@ import com.qmth.distributed.print.business.service.*;
 import com.qmth.teachcloud.common.bean.params.ArraysParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
+import com.qmth.teachcloud.common.entity.BasicExam;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.CardCreateMethodEnum;
@@ -31,7 +32,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -224,9 +224,10 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
+
         // 通用题卡
         List<ExamCard> list = new ArrayList<>();
-        List<ExamCard> genericCards = this.baseMapper.listGenericCard(schoolId, orgIds, CardTypeEnum.GENERIC.name());
+        List<ExamCard> genericCards = this.baseMapper.listGenericCard(schoolId, orgIds, CardTypeEnum.GENERIC.name(), cardRuleId);
         if (!genericCards.isEmpty()) {
             list.addAll(genericCards);
         }

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

@@ -123,8 +123,10 @@
         WHERE
             a.school_id = #{schoolId}
             AND a.type = #{type}
-            AND a.create_method != 'STANDARD'
             AND a.enable = TRUE
+            <if test="cardRuleId == '-1'">
+                AND a.create_method != 'STANDARD'
+            </if>
             <if test="orgIds != null">
                 AND c.org_id IN
                 <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">