pdf生成bug

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

@@ -20,7 +20,7 @@ import java.util.Set;
  * @since 2021-03-23
  */
 public interface ExamTaskDetailMapper extends BaseMapper<ExamTaskDetail> {
-    IPage<ExamTaskDetailDto> listPage(Page<ExamTaskDetailDto> page, @Param("schoolId") Long schoolId, @Param("relateType") String relateType, @Param("printPlanIdList") List<Long> printPlanIdList, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber,@Param("userName")String userName,@Param("cardRuleName")String cardRuleName, @Param("orgIds") Set<Long> orgIds);
+    IPage<ExamTaskDetailDto> listPage(Page<ExamTaskDetailDto> page, @Param("schoolId") Long schoolId, @Param("relateType") String relateType, @Param("printPlanIdList") List<Long> printPlanIdList, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("userName") String userName, @Param("cardRuleId") Long cardRuleId, @Param("orgIds") Set<Long> orgIds);
 
     List<ExamTaskDetail> listByTemplateId(Long templateId);
 

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

@@ -25,7 +25,7 @@ public interface ExamTaskDetailService extends IService<ExamTaskDetail> {
 
     boolean updatePaper(RelatePaperParam paperParam) throws IOException;
 
-    IPage<ExamTaskDetailDto> list(String relateType, List<Long> printPlanId, String courseCode, String paperNumber,String userName,String cardRuleName, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDetailDto> list(String relateType, List<Long> printPlanId, String courseCode, String paperNumber,String userName,Long cardRuleId, Integer pageNumber, Integer pageSize);
 
     List<ExamTaskDetail> listByCardId(Long cardId);
 

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

@@ -88,6 +88,7 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         template.setSchoolId(schoolId);
+        template.setOrgId(sysUser.getOrgId());
         QueryWrapper<BasicTemplate> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(BasicTemplate::getSchoolId, template.getSchoolId()).eq(BasicTemplate::getName, template.getName());
         BasicTemplate basicTemplate = this.getOne(queryWrapper);
@@ -98,7 +99,6 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
                 throw ExceptionResultEnum.ERROR.exception("模板名称已存在");
             }
             template.insertInfo(sysUser.getId());
-            template.setOrgId(sysUser.getOrgId());
             isSuccess = this.save(template);
         }
         // 修改

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

@@ -226,19 +226,12 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
     }
 
     @Override
-    public IPage<ExamTaskDetailDto> list(String relateType, List<Long> printPlanIdList, String courseCode, String paperNumber,String userName,String cardRuleName, Integer pageNumber, Integer pageSize) {
+    public IPage<ExamTaskDetailDto> list(String relateType, List<Long> printPlanIdList, String courseCode, String paperNumber, String userName, Long cardRuleId, Integer pageNumber, Integer pageSize) {
         userName = SystemConstant.translateSpecificSign(userName);
-        if (SystemConstant.strNotNull(cardRuleName)){
-            if (cardRuleName.equals("全部通卡")){
-                cardRuleName = "-1";
-            }else {
-                cardRuleName = SystemConstant.translateSpecificSign(cardRuleName);
-            }
-        }
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         Page<ExamTaskDetailDto> page = new Page<>(pageNumber, pageSize);
-        IPage<ExamTaskDetailDto> examDetailDtoIPage = this.baseMapper.listPage(page, schoolId, relateType, printPlanIdList, courseCode, paperNumber,userName,cardRuleName, orgIds);
+        IPage<ExamTaskDetailDto> examDetailDtoIPage = this.baseMapper.listPage(page, schoolId, relateType, printPlanIdList, courseCode, paperNumber, userName, cardRuleId, orgIds);
         examDetailDtoIPage.getRecords().stream().map(m -> {
             String paperType = StringUtils.isBlank(m.getRelatePaperType()) ? null : m.getRelatePaperType();
             Long printPlanIdT = Long.valueOf(m.getPrintPlanId());

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -825,7 +825,7 @@ public class CreatePdfUtil {
         }
         String packageCodeDiv = "<div class=\"page-box page-box-0\"><div class=\"package-number\" style=\"position: absolute;width: 200px;height: 40px;top: 10px;right: 25%;margin-left: -100px;text-align: center;z-index: 99;\"><img src=\"data:image/png;base64," + packageCodeImg + "\" style=\"display: block; height: 28px; width: 100%\" /><p style=\"line-height: 1; font-size: 12px; margin: 0;\">" + packageCode + "</p></div>";
         cardTemp = cardTemp.replaceAll("<div class=\"page-box page-box-0\">", packageCodeDiv);
-        BasicAttachment cardAttachment = printCommonService.saveAttachmentHtml(examCard.getSchoolId() + "|" + examCard.getCourseCode(), cardTemp, userId, cardPdfList);
+        BasicAttachment cardAttachment = printCommonService.saveAttachmentHtml(examCard.getSchoolId() + "|" + examDetailCourse.getCourseCode(), cardTemp, userId, cardPdfList);
         JSONObject object = new JSONObject();
         object.put("name", examDetailCourse.getPaperType());
         object.put("examDetailCourseId", examDetailCourse.getId());

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

@@ -91,11 +91,8 @@
             <if test="paperNumber != null and paperNumber != ''">
                 and c.paper_number = #{paperNumber}
             </if>
-            <if test="cardRuleName != null and cardRuleName != ''">
-                and e.name like concat('%',#{cardRuleName},'%')
-            </if>
-            <if test="cardRuleName != null and cardRuleName = -1">
-                and c.card_rule_id = -1
+            <if test="cardRuleId != null and cardRuleId != ''">
+                and c.card_rule_id = #{cardRuleId}
             </if>
             <if test="userName != null and userName != ''">
                 and f.real_name like concat('%',#{userName},'%')

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

@@ -145,14 +145,14 @@ public class ExamPrintPlanController {
                              @RequestParam(value = "courseCode", required = false) String courseCode,
                              @RequestParam(value = "paperNumber", required = false) String paperNumber,
                              @RequestParam(value = "userName", required = false) String userName,
-                             @RequestParam(value = "cardRuleName", required = false) String cardRuleName,
+                             @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
                              @RequestParam Integer pageNumber,
                              @RequestParam Integer pageSize) {
         if (Objects.isNull(printPlanIdList)){
             printPlanIdList = new ArrayList<>();
         }
         List<Long> idList = printPlanIdList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList());
-        IPage<ExamTaskDetailDto> examTasks = examTaskDetailService.list(relateType, idList, courseCode, paperNumber,userName,cardRuleName, pageNumber, pageSize);
+        IPage<ExamTaskDetailDto> examTasks = examTaskDetailService.list(relateType, idList, courseCode, paperNumber,userName,cardRuleId, pageNumber, pageSize);
         return ResultUtil.ok(examTasks);
     }