修改数据

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

@@ -759,14 +759,32 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                         continue;
                     }
 
+                    Object _cost="0";
+
                     if ("早自习".equals(courseListVo.getShortName())) {
                         classTime7 += weightSetMap.get(courseListVo.getShortName()) == null ? 0d : weightSetMap.get(courseListVo.getShortName());
+                        if ("FB1601".equals(teacher.getEmployType())) {
+                            _cost=costSetMap.get("cost1");
+                        } else {
+                            _cost=costSetMap.get("cost2");
+                        }
                     } else if (zkList.contains(courseListVo.getShortName())) {
                         classTime8 += weightSetMap.get(courseListVo.getShortName()) == null ? 0d : weightSetMap.get(courseListVo.getShortName());
+                        if ("FB1601".equals(teacher.getEmployType())) {
+                            _cost=costSetMap.get("cost3");
+                        } else {
+                            _cost=costSetMap.get("cost4");
+                        }
                     } else if (wzxList.contains(courseListVo.getShortName())) {
                         classTime9 += weightSetMap.get(courseListVo.getShortName()) == null ? 0d : weightSetMap.get(courseListVo.getShortName());
+                        if ("FB1601".equals(teacher.getEmployType())) {
+                            _cost=costSetMap.get("cost5");
+                        } else {
+                            _cost=costSetMap.get("cost6");
+                        }
                     }
 
+
                     if (courseListVo.getAdjustType() != null && !courseListVo.getAdjustType().isEmpty()) {
                         if (CourseAdjustTypeEnum.courseExchange.getCode().equals(courseListVo.getAdjustType())) {
                             classTime11 += weightSetMap.get(courseListVo.getShortName());
@@ -774,7 +792,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                     }
                     courseJson.addProperty("type", courseListVo.getShortName());
                     courseJson.addProperty("scheduleDate", courseListVo.getScheduleDate().format(formatter));
-                    courseJson.addProperty("content", courseListVo.getClassName() + "," + courseListVo.getCourseName());
+                    courseJson.addProperty("content", courseListVo.getClassName() + "," + courseListVo.getCourseName()+","+_cost);
                     courseJson.addProperty("adjustType", courseListVo.getAdjustType() == null ? "" : courseListVo.getAdjustType());
                     allClassTimeDataArray.add(courseJson);