课时统计导出调整

src/main/java/com/xjrsoft/module/classtime/service/impl/ClassTimeStatisticsServiceImpl.java

@@ -572,6 +572,9 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                 rowData.add(recordVo.getName());//姓名
                 JsonObject courseTimeTypeJson = parser.parse(recordVo.getCourseTimeTypeData()).getAsJsonObject();
                 for (DictionaryDetail dictionaryDetail : CourseTimeTypeList) {
+                    if (courseTimeTypeJson.get(dictionaryDetail.getName()) == null) {
+                        continue;
+                    }
                     Double courseTimeTypeTime = courseTimeTypeJson.get(dictionaryDetail.getName()).getAsDouble();
                     rowData.add(courseTimeTypeTime == 0 ? "" : courseTimeTypeTime.toString());//教研会
                 }
@@ -680,7 +683,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
             workbook.write(bot);
             return bot.toByteArray();
         }catch (Exception e){
-            log.error(e.getMessage());
+            Log.error(e.getMessage(), e);
             throw new MyException("导出出错，请联系管理员");
         }
     }

src/main/resources/mapper/classtime/ClassTimeStatisticsMapper.xml

@@ -73,7 +73,7 @@
     <select id="getRecordList" resultType="com.xjrsoft.module.classtime.vo.ClassTimeStatisticsRecordVo">
         SELECT t1.id,t2.user_name,t2.name,t3.name AS employ_type_cn,t1.week_data,
         t1.class_time1,t1.class_time2,t1.class_time3,t1.class_time4,t1.class_time5,
-        t1.class_time6,t1.class_time7,t1.class_time8,t1.class_time9,t1.class_time10,t1.class_time11,
+        t1.class_time6,t1.class_time7,t1.class_time8,t1.class_time9,t1.class_time10,t1.class_time11,course_time_type_data,
         t1.all_class_time,t1.total_amount,t1.class_time_amount,t1.beyond_class_time_amount FROM class_time_statistics_record t1
         INNER JOIN xjr_user t2 ON t1.user_id = t2.id
         LEFT JOIN xjr_dictionary_detail t3 ON t1.employ_type = t3.code