xiaofei 2 anni fa
parent
commit
75c8ac6d39

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

@@ -394,7 +394,7 @@ public class CreatePdfUtil {
                     if (isCourseFill) {
                         continue;
                     }
-                    List<String> courseNames = examDetailCourseList.stream().map(m -> String.format("%s(%s)", m.getCourseName(), m.getCourseCode())).collect(Collectors.toList());
+                    List<String> courseNames = examDetailCourseList.stream().map(m -> String.format("%s(%s)", m.getCourseName(), m.getCourseCode())).collect(Collectors.toList());
                     basicMap.put("code", "courseName");
                     basicMap.put("name", "课程名称");
                     basicMap.put("value", String.join(SystemConstant.COMMA_OF_CHINESE, courseNames));
@@ -732,7 +732,7 @@ public class CreatePdfUtil {
                     if (isCourseFill) {
                         continue;
                     }
-                    List<String> courseNames = examDetailCourseList.stream().map(m -> String.format("%s(%s)", m.getCourseName(), m.getCourseCode())).collect(Collectors.toList());
+                    List<String> courseNames = examDetailCourseList.stream().map(m -> String.format("%s(%s)", m.getCourseName(), m.getCourseCode())).collect(Collectors.toList());
                     basicMap.put("code", "courseName");
                     basicMap.put("name", "课程名称");
                     basicMap.put("value", String.join(SystemConstant.COMMA_OF_CHINESE, courseNames));

+ 1 - 1
distributed-print-business/src/main/resources/mapper/BasicCardRuleMapper.xml

@@ -72,7 +72,7 @@
             basic_card_rule a
         <where>
             AND a.school_id = #{schoolId}
-            AND a.enable = true
+--             AND a.enable = true
         </where>
         order by create_time desc
     </select>

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

@@ -92,7 +92,7 @@
                  JOIN
             (SELECT
                 exam_detail_id,
-                    GROUP_CONCAT(CONCAT(course_name, '(', course_code, ')')) courseNameCode,
+                    GROUP_CONCAT(CONCAT(course_name, '(', course_code, ')')) courseNameCode,
                     GROUP_CONCAT(paper_number) paperNumber,
                     GROUP_CONCAT(ifnull(paper_pages_a3, 0) + ifnull(card_pages_a3, 0)) singlePagesA3
             FROM