平衡关系导出

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

@@ -549,7 +549,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourse(@Param("month") String month,@Param("organIds") String organIds);
 
-    BigDecimal exportBalancedRelationshipMusicNoClassNoCourseSum(@Param("month") String month, @Param("organIds") String organIds);
+    BigDecimal exportBalancedRelationshipMusicNoClassNoCourseSum(@Param("month") String month);
 
     //平衡关系-乐团课
     ExportWrapper.ExportBalancedRelationshipMusicCourseSum exportBalancedRelationshipMusicCourseSum(@Param("month") String month, @Param("organIds") String organIds);

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -491,7 +491,7 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 
     List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourseSum(String month, String organIds);
 
-    List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> exportBalancedRelationshipMusicNoClassNoCourseSum(String month, String organIds);
+    List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> exportBalancedRelationshipMusicNoClassNoCourseSum(String month);
 
     List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> exportBalancedRelationshipMusicCourseSum(String month, String organIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -569,9 +569,8 @@ public class ExportServiceImpl implements ExportService {
     private HttpResponseResult<String> exportBalancedRelationshipMusicNoClassNoCourseSum(Map<String, Object> info){
         String month = getParam(info, "month", String.class);
         SysUser sysUser = sysUserService.getUser();
-        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
         ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_CLASS_NO_COURSE_SUM,sysUser.getId());
-        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoClassNoCourseSum(month,organIds),
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoClassNoCourseSum(month),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_CLASS_NO_COURSE_SUM),
                 managerDownload.getName());
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -4302,14 +4302,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	}
 
     @Override
-    public List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> exportBalancedRelationshipMusicNoClassNoCourseSum(String month, String organIds) {
+    public List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> exportBalancedRelationshipMusicNoClassNoCourseSum(String month) {
 		List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> result = new ArrayList<>();
 		ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse sum = new ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse();
 		//期初未分班未排课
-		BigDecimal first = musicGroupDao.exportBalancedRelationshipMusicNoClassNoCourseSum(month + "-01 00:00:00",organIds);
+		BigDecimal first = musicGroupDao.exportBalancedRelationshipMusicNoClassNoCourseSum(month + "-01 00:00:00");
 		sum.setFirstTotalCoursePrice(first);
 		//期末未分班未排课
-		BigDecimal last = musicGroupDao.exportBalancedRelationshipMusicNoClassNoCourseSum(month + "-31 23:59:59",organIds);
+		BigDecimal last = musicGroupDao.exportBalancedRelationshipMusicNoClassNoCourseSum(month + "-31 23:59:59");
 		sum.setLastTotalCoursePrice(last);
 		//当月新增未分班未排课(期末-期初)
 		sum.setCurrentTotalCoursePrice(last.subtract(first));

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

@@ -1389,16 +1389,12 @@
         from music_group_payment_student_course_detail mgpscd
         left join (select cgsm.user_id_,cg.type_,cg.music_group_id_,cgsm.class_group_id_  from class_group_student_mapper cgsm
         left join class_group cg ON cg.id_ = cgsm.class_group_id_
-        left join music_group mg ON mg.id_ = cg.music_group_id_
         where cg.group_type_ = 'MUSIC' AND cgsm.status_ = 'NORMAL') cgsm ON cgsm.music_group_id_ = mgpscd.music_group_id_ and cgsm.user_id_ = mgpscd.user_id_
         AND (cgsm.type_ = mgpscd.course_type_ OR
         (cgsm.type_ = 'NORMAL' AND mgpscd.course_type_ IN ('SINGLE','TRAINING_SINGLE')) OR
         (cgsm.type_ = 'MIX' AND mgpscd.course_type_ IN ('MIX','TRAINING_MIX')) OR cgsm.type_ = 'SNAP')
         where mgpscd.sub_course_current_price_ > 0 AND mgpscd.sub_course_minutes_ > 0
         AND mgpscd.create_time_ <= #{month} AND cgsm.class_group_id_ IS NULL
-        <if test="organIds != null and organIds != ''">
-            AND FIND_IN_SET(mg.organ_id_,#{organIds})
-        </if>
     </select>
     <select id="exportBalancedRelationshipMusicCourseSum"
             resultType="com.ym.mec.biz.dal.dto.ExportWrapper$ExportBalancedRelationshipMusicCourseSum">