平衡关系导出

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

@@ -549,8 +549,8 @@ 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);
+    BigDecimal exportBalancedRelationshipMusicNoClassNoCourseSum(@Param("month") String month, @Param("organIds") String organIds);
 
     //平衡关系-乐团课
-    ExportWrapper.ExportBalancedRelationshipMusicCourseSum exportBalancedRelationshipMusicCourseSum(@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

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

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

@@ -474,8 +474,9 @@ public class ExportServiceImpl implements ExportService {
     private HttpResponseResult<String> exportBalancedRelationshipMusicCourseSum(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_COURSE_SUM,sysUser.getId());
-        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicCourseSum(month),
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicCourseSum(month,organIds),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE_SUM),
                 managerDownload.getName());
     }
@@ -558,8 +559,9 @@ public class ExportServiceImpl implements ExportService {
     private HttpResponseResult<String> exportBalancedRelationshipMusicNoCourseSum(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_COURSE_SUM,sysUser.getId());
-        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoCourseSum(month),
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoCourseSum(month,organIds),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_COURSE_SUM),
                 managerDownload.getName());
     }
@@ -567,8 +569,9 @@ 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),
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicNoClassNoCourseSum(month,organIds),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_NO_CLASS_NO_COURSE_SUM),
                 managerDownload.getName());
     }
@@ -586,7 +589,6 @@ public class ExportServiceImpl implements ExportService {
     private HttpResponseResult<String> exportBalancedRelationshipVipSubCourseSum(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_VIP_SUB_COURSE_SUM,sysUser.getId());
         return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipVipSubCourseSum(month),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_SUM),

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

@@ -44,6 +44,7 @@ import com.ym.mec.util.json.JsonUtil;
 import com.ym.mec.util.validator.CommonValidator;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -4255,12 +4256,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	}
 
     @Override
-    public List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourseSum(String month) {
+    public List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourseSum(String month, String organIds) {
 		List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> result = new ArrayList<>();
 		ExportWrapper.ExportBalancedRelationshipMusicNoCourse sum = new ExportWrapper.ExportBalancedRelationshipMusicNoCourse();
 		//期初已分班未排课
 		List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> first =
-				musicGroupDao.exportBalancedRelationshipMusicNoCourse(month + "-01 00:00:00", null);
+				musicGroupDao.exportBalancedRelationshipMusicNoCourse(month + "-01 00:00:00", organIds);
 		if(CollectionUtils.isNotEmpty(first)){
 			//计算课酬
 			this.createMusicGroupCourseTeacherSalaries(first);
@@ -4272,7 +4273,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
 		//期末已分班未排课
 		List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourses =
-				musicGroupDao.exportBalancedRelationshipMusicNoCourse(month + "-31 23:59:59", null);
+				musicGroupDao.exportBalancedRelationshipMusicNoCourse(month + "-31 23:59:59", organIds);
 		if(CollectionUtils.isNotEmpty(exportBalancedRelationshipMusicNoCourses)){
 			//计算课酬
 			this.createMusicGroupCourseTeacherSalaries(exportBalancedRelationshipMusicNoCourses);
@@ -4301,14 +4302,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	}
 
     @Override
-    public List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> exportBalancedRelationshipMusicNoClassNoCourseSum(String month) {
+    public List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> exportBalancedRelationshipMusicNoClassNoCourseSum(String month, String organIds) {
 		List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> result = new ArrayList<>();
 		ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse sum = new ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse();
 		//期初未分班未排课
-		BigDecimal first = musicGroupDao.exportBalancedRelationshipMusicNoClassNoCourseSum(month + "-01 00:00:00");
+		BigDecimal first = musicGroupDao.exportBalancedRelationshipMusicNoClassNoCourseSum(month + "-01 00:00:00",organIds);
 		sum.setFirstTotalCoursePrice(first);
 		//期末未分班未排课
-		BigDecimal last = musicGroupDao.exportBalancedRelationshipMusicNoClassNoCourseSum(month + "-31 23:59:59");
+		BigDecimal last = musicGroupDao.exportBalancedRelationshipMusicNoClassNoCourseSum(month + "-31 23:59:59",organIds);
 		sum.setLastTotalCoursePrice(last);
 		//当月新增未分班未排课(期末-期初)
 		sum.setCurrentTotalCoursePrice(last.subtract(first));
@@ -4317,9 +4318,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	}
 
 	@Override
-	public List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> exportBalancedRelationshipMusicCourseSum(String month) {
+	public List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> exportBalancedRelationshipMusicCourseSum(String month,String organIds) {
 		List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> result = new ArrayList<>();
-		ExportWrapper.ExportBalancedRelationshipMusicCourseSum courseSum = musicGroupDao.exportBalancedRelationshipMusicCourseSum(month);
+		ExportWrapper.ExportBalancedRelationshipMusicCourseSum courseSum = musicGroupDao.exportBalancedRelationshipMusicCourseSum(month,organIds);
 		//获取排课日志
 		musicGroupPaymentStudentCourseDetailLogService.lambdaQuery()
 				.gt(MusicGroupPaymentStudentCourseDetailLog::getCreateTime, month + "-01 00:00:00")

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

@@ -311,6 +311,7 @@
     <select id="exportBalancedRelationshipVipSubCourseSum"
             resultType="com.ym.mec.biz.dal.dto.ExportWrapper$ExportBalancedRelationshipVipSubCourseDetail">
         select
+            SUM(mv.first_month_pre_course_amount_) AS firstMonthPreCourseAmount,
             SUM(mv.first_month_pre_no_course_amount_) AS firstMonthPreNoCourseAmount,
             SUM(mv.first_month_sub_course_num_) AS firstMonthSubCourseNum,
             SUM(mv.first_month_sub_no_course_num_) AS firstMonthSubNoCourseNum,

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

@@ -1389,12 +1389,16 @@
         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;
+        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">
@@ -1404,6 +1408,13 @@
             SUM(current_month_course_amount_) currentMonthCourseAmount, SUM(last_month_pre_amount_) lastMonthPreAmount,
             SUM(last_month_sub_course_num_) lastMonthSubCourseNum, SUM(last_month_course_salary_) lastMonthCourseSalary
         from month_music_class_report_statis mm
+        <if test="organIds != null and organIds != ''">
+            left join class_group cg ON cg.id_ = mm.class_group_id_
+            left join music_group mg ON mg.id_ = cg.music_group_id_
+        </if>
         where mm.month_ = #{month}
+        <if test="organIds != null and organIds != ''">
+            AND FIND_IN_SET(mg.organ_id_,#{organIds})
+        </if>
     </select>
 </mapper>