add 对内评价接口

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/PracticeGroupDao.java

@@ -202,4 +202,11 @@ public interface PracticeGroupDao extends com.ym.mec.common.dal.BaseDAO<Long, Pr
      * @return
      */
     List<ClassGroup> getReportCourseTimes(@Param("classGroupIds") List<Integer> classGroupIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    /**
+     * 根据课程组id查询课程组详情
+     * @param id
+     * @return
+     */
+    PracticeCourseDto findByGroupId(@Param("id") Integer id);
 }

mec-biz/src/main/resources/config/mybatis/PracticeGroupMapper.xml

@@ -364,4 +364,10 @@
         AND (del_flag_ =0 OR del_flag_ IS NULL)
         GROUP BY class_group_id_
     </select>
+
+    <select id="findByGroupId" resultMap="PracticeCourseDto">
+        SELECT pg.*,s.name_ subject_name_ FROM practice_group pg
+        LEFT JOIN subject s on pg.subject_id_ = s.id_
+        WHERE pg.id_ = #{id}
+    </select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -66,6 +66,8 @@ public class ExportController extends BaseController {
     private CourseScheduleService scheduleService;
     @Autowired
     private SporadicChargeInfoService sporadicChargeInfoService;
+    @Autowired
+    private PracticeGroupDao practiceGroupDao;
 
     @ApiOperation(value = "导出老师课酬")
     @PostMapping("export/teacherSalary")
@@ -523,6 +525,16 @@ public class ExportController extends BaseController {
                 if(userSchool!= null){
                     row.setSchoolName(userSchool.getName());
                 }
+            }else if (row.getGroupType().equals(GroupType.PRACTICE)) {
+                row.setCourseFee(row.getActualAmount());
+                School userSchool = musicGroupDao.findUserSchool(row.getUserId());
+                if(userSchool!= null){
+                    row.setSchoolName(userSchool.getName());
+                }
+                PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(row.getMusicGroupId()));
+                if (practiceGroup != null) {
+                    row.setSubjectName(practiceGroup.getSubjectName());
+                }
             }
             String paymentChannel = "";
             if (row.getPaymentChannel() == null) {