xx

src/main/java/com/example/pdfgenerator/controller/GeneratorAllTypePdfByProvinceController.java

@@ -48,7 +48,7 @@ public class GeneratorAllTypePdfByProvinceController {
                 "school,exam_id,province,region1 as  region,sub_subject\n" +
                 "from \n" +
                 "base_school_subject_tda"+suffix+" \n" +
-                " where subject_type = '常规'  and sub_subject in('历史','生物')  \n";
+                " where subject_type = '常规' \n";
 
         String  synthesisSchoolReportSql = "select \n" +
                 "school,exam_id,province,region1 as region\n" +
@@ -65,7 +65,7 @@ public class GeneratorAllTypePdfByProvinceController {
                 "FROM\n" +
                 "\tbase_student_subject_tda"+suffix+"\n" +
                 "where\n" +
-                "subject_type = '常规' and sub_subject in('历史','生物')   \n "  ;
+                "subject_type = '常规'   \n "  ;
 
         String synthesisClassReportSql = "SELECT\n" +
                 "\tclass AS class_name,\n" +
@@ -139,6 +139,11 @@ public class GeneratorAllTypePdfByProvinceController {
         List<BasicReportParameters> synthesisSchoolSubjectReportParameters = this.reportJdbcTemplate.query(synthesisSchoolSubjectReportSql, new Object[]{}, new BeanPropertyRowMapper<>(BasicReportParameters.class));
 
         for (BasicReportParameters parameter : synthesisSchoolSubjectReportParameters) {
+
+            if (!parameter.getSubSubject().contains("物理") || !parameter.getSubSubject().contains("生物")){
+                continue;
+            }
+
             if(parameter.getRegion().equals("改革")||parameter.getRegion().equals("改革A")||parameter.getRegion().equals("改革3+3")||parameter.getRegion().equals("改革3+1+2")){
                 String command = "node /myworkSpace/puppeteer2.js \"http://schoolreport.cssat.cn/pdf/subject?province=condition5&school=condition1&examId=condition4&region=conditionC&subSubject=condition6&subjectType=常规\" pdf";
                 String fileName = "/myworkSpace/subject/" + parameter.getRegion() + parameter.getProvince() + parameter.getSchool() + parameter.getSubSubject() + parameter.getExamId() + ".pdf";
@@ -185,6 +190,10 @@ public class GeneratorAllTypePdfByProvinceController {
         List<ClassBasicReportParameters> synthesisClassSubjectReportParameters = this.reportJdbcTemplate.query(synthesisClassSubjectReportSql,new Object[]{},new BeanPropertyRowMapper<>(ClassBasicReportParameters.class));
 
         for (ClassBasicReportParameters synthesisClassSubjectReportParameter : synthesisClassSubjectReportParameters) {
+            if (!synthesisClassSubjectReportParameter.getSubSubject().contains("物理") || !synthesisClassSubjectReportParameter.getSubSubject().contains("生物")){
+                continue;
+            }
+
 
             if (synthesisClassSubjectReportParameter.getRegion().equals("改革")||synthesisClassSubjectReportParameter.getRegion().equals("改革A")||synthesisClassSubjectReportParameter.getRegion().equals("改革3+3")||synthesisClassSubjectReportParameter.getRegion().equals("改革3+1+2")) {
                 String command = "node /myworkSpace/pdfOfClassSubjectGen.js \"http://schoolreport.cssat.cn/pdf/classSubject?province=condition5&school=condition1&examId=condition4&region=conditionC&subSubject=condition6&subjectType=常规&className=conditionA\" pdf";

src/main/java/com/example/pdfgenerator/controller/GeneratorAllTypePdfByProvinceYcyController.java

@@ -139,6 +139,7 @@ public class GeneratorAllTypePdfByProvinceYcyController {
         List<BasicReportParameters> synthesisSchoolSubjectReportParameters = this.reportJdbcTemplate.query(synthesisSchoolSubjectReportSql, new Object[]{}, new BeanPropertyRowMapper<>(BasicReportParameters.class));
 
         for (BasicReportParameters parameter : synthesisSchoolSubjectReportParameters) {
+
             if(parameter.getRegion().equals("改革")||parameter.getRegion().equals("改革A")||parameter.getRegion().equals("改革3+3")||parameter.getRegion().equals("改革3+1+2")){
                 String command = "node F:/myworkSpace/puppeteer2.js \"http://schoolreport.cssat.cn/pdf/subject?province=condition5&school=condition1&examId=condition4&region=conditionC&subSubject=condition6&subjectType=常规\" pdf";
                 String fileName = "/myworkSpace/subject/" + parameter.getRegion() + parameter.getProvince() + parameter.getSchool() + parameter.getSubSubject() + parameter.getExamId() + ".pdf";