平衡关系

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

@@ -12,7 +12,7 @@ public interface ExportDao {
     //平衡关系-乐团课
     List<ExportWrapper.ExportBalancedRelationshipMusicCourse> exportBalancedRelationshipMusicCourse(@Param("month") String month, @Param("organIds") String organIds);
     //平衡关系-乐团课
-    List<ExportWrapper.ExportBalancedRelationshipMusicCourse> exportBalancedRelationshipMusicCourse1(@Param("month") String month, @Param("organIds") String organIds);
+    List<ExportWrapper.ExportBalancedRelationshipMusicCourse> exportBalancedRelationshipMusicCourse1(@Param("firstDay") String firstDay, @Param("lastDay") String lastDay, @Param("organIds") String organIds);
 
     //平衡关系-VIP已排课
     List<ExportWrapper.ExportBalancedRelationshipVipCourse> exportBalancedRelationshipVipCourse(@Param("month") String month, @Param("organIds") String organIds);
@@ -39,9 +39,9 @@ public interface ExportDao {
     List<ExportStudentCourseInfoDto> queryStudentCourseInfo(@Param("organId") String organId, @Param("tenantId") Integer tenantId, @Param("groupType") String groupType);
 
     //平衡关系-VIP剩余课时及金额明细
-    List<ExportWrapper.ExportBalancedRelationshipVipSubCourseDetail> exportBalancedRelationshipVipSubCourseDetail(@Param("month") String month, @Param("organIds") String organIds);
+    List<ExportWrapper.ExportBalancedRelationshipVipSubCourseDetail> exportBalancedRelationshipVipSubCourseDetail(@Param("firstDay") String firstDay, @Param("lastDay") String lastDay, @Param("organIds") String organIds);
 
-    List<ExportWrapper.ExportBalancedRelationshipVipSubCourseDetail> exportBalancedRelationshipVipSubCourseSum(@Param("month") String month);
+    List<ExportWrapper.ExportBalancedRelationshipVipSubCourseDetail> exportBalancedRelationshipVipSubCourseSum(@Param("firstDay") String firstDay, @Param("lastDay") String lastDay);
 
     List<ExportWrapper.ExportBalancedRelationshipCloudSum> exportBalancedRelationshipCloudSum(@Param("month") String month);
 }

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

@@ -539,7 +539,9 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
     */
     List<String> findNormalByCooperationId(@Param("coopId") Integer coopId);
 
-    List<MusicGroup> userMusicGroup(@Param("studentId") Integer studentId, @Param("coopId") Integer coopId, @Param("statusList") List<StudentMusicGroupStatusEnum> statusList);
+    List<MusicGroup> userMusicGroup(@Param("studentId") Integer studentId,
+                                    @Param("coopId") Integer coopId,
+                                    @Param("statusList") List<StudentMusicGroupStatusEnum> statusList);
 
     List<ExportMusicGroupEchelonDataDto> queryCoopEchelonData(@Param("organIds") List<Integer> organIds);
 
@@ -547,10 +549,13 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     List<String> getDelImGroupId();
 
-    List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourse(@Param("month") String month,@Param("organIds") String organIds);
+    List<ExportWrapper.ExportBalancedRelationshipMusicNoCourse> exportBalancedRelationshipMusicNoCourse(@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);
+    ExportWrapper.ExportBalancedRelationshipMusicCourseSum exportBalancedRelationshipMusicCourseSum(@Param("firstDay") String firstDay,
+                                                                                                    @Param("lastDay") String lastDay,
+                                                                                                    @Param("organIds") String organIds);
 }

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

@@ -119,9 +119,9 @@ public interface OperatingReportNewDao extends BaseDAO<Integer, OperatingReportN
     //oa费用明细
     List<FinancialExpenditure> queryOASummaryExpensesDetail(@Param("month") String month);
 
-    void musicBalancedRelationship(@Param("month") String month, @Param("lastMonth") String lastMonth);
+    void musicBalancedRelationship(@Param("firstDay") String firstDay, @Param("lastDay") String lastDay);
 
-    void vipBalancedRelationship(@Param("month") String month, @Param("lastMonth") String lastMonth);
+    void vipBalancedRelationship(@Param("firstDay") String firstDay, String lastDay);
 
     void cloudBalancedRelationship(@Param("month") String month, @Param("lastMonth") String lastMonth);
 

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

@@ -10,6 +10,7 @@ import com.ym.mec.biz.dal.vo.MusicGroupDeliveryVo;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -493,5 +494,5 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 
     List<ExportWrapper.ExportBalancedRelationshipMusicNoClassNoCourse> exportBalancedRelationshipMusicNoClassNoCourseSum(String month);
 
-    List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> exportBalancedRelationshipMusicCourseSum(String month, String organIds);
+    List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> exportBalancedRelationshipMusicCourseSum(String firstDay, String lastDay, String organIds);
 }

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

@@ -462,21 +462,23 @@ public class ExportServiceImpl implements ExportService {
     }
 
     private HttpResponseResult<String> exportBalancedRelationshipMusicCourse(Map<String, Object> info){
-        String month = getParam(info, "month", String.class);
+        String firstDay = getParam(info, "firstDay", String.class);
+        String lastDay = getParam(info, "lastDay", 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,sysUser.getId());
-        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipMusicCourse1(month,organIds),
+        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipMusicCourse1(firstDay,lastDay,organIds),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE),
                 managerDownload.getName());
     }
 
     private HttpResponseResult<String> exportBalancedRelationshipMusicCourseSum(Map<String, Object> info){
-        String month = getParam(info, "month", String.class);
+        String firstDay = getParam(info, "firstDay", String.class);
+        String lastDay = getParam(info, "lastDay", 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,organIds),
+        return this.asyncExport(() -> this.initExportInfo(musicGroupService.exportBalancedRelationshipMusicCourseSum(firstDay,lastDay,organIds),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE_SUM),
                 managerDownload.getName());
     }
@@ -576,20 +578,22 @@ public class ExportServiceImpl implements ExportService {
     }
 
     private HttpResponseResult<String> exportBalancedRelationshipVipSubCourseDetail(Map<String, Object> info){
-        String month = getParam(info, "month", String.class);
+        String firstDay = getParam(info, "firstDay", String.class);
+        String lastDay = getParam(info, "lastDay", 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_DETAIL,sysUser.getId());
-        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipVipSubCourseDetail(month,organIds),
+        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipVipSubCourseDetail(firstDay,lastDay,organIds),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_DETAIL),
                 managerDownload.getName());
     }
 
     private HttpResponseResult<String> exportBalancedRelationshipVipSubCourseSum(Map<String, Object> info){
-        String month = getParam(info, "month", String.class);
+        String firstDay = getParam(info, "firstDay", String.class);
+        String lastDay = getParam(info, "lastDay", String.class);
         SysUser sysUser = sysUserService.getUser();
         ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_SUM,sysUser.getId());
-        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipVipSubCourseSum(month),
+        return this.asyncExport(() -> this.initExportInfo(exportDao.exportBalancedRelationshipVipSubCourseSum(firstDay,lastDay),
                         managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_SUM),
                 managerDownload.getName());
     }

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

@@ -4330,13 +4330,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	}
 
 	@Override
-	public List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> exportBalancedRelationshipMusicCourseSum(String month,String organIds) {
+	public List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> exportBalancedRelationshipMusicCourseSum(String firstDay, String lastDay,String organIds) {
 		List<ExportWrapper.ExportBalancedRelationshipMusicCourseSum> result = new ArrayList<>();
-		ExportWrapper.ExportBalancedRelationshipMusicCourseSum courseSum = musicGroupDao.exportBalancedRelationshipMusicCourseSum(month,organIds);
+		ExportWrapper.ExportBalancedRelationshipMusicCourseSum courseSum = musicGroupDao.exportBalancedRelationshipMusicCourseSum(firstDay,lastDay,organIds);
 		//获取排课日志
 		musicGroupPaymentStudentCourseDetailLogService.lambdaQuery()
-				.gt(MusicGroupPaymentStudentCourseDetailLog::getCreateTime, month + "-01 00:00:00")
-				.lt(MusicGroupPaymentStudentCourseDetailLog::getCreateTime, month + "-31 23:59:59")
+				.gt(MusicGroupPaymentStudentCourseDetailLog::getCreateTime, firstDay + " 00:00:00")
+				.lt(MusicGroupPaymentStudentCourseDetailLog::getCreateTime, lastDay + " 23:59:59")
 				.list().forEach(e->{
 			courseSum.setCurrentMonthAdd(courseSum.getCurrentMonthConsume() + e.getCourseNum());
 			courseSum.setCurrentMonthAddReward(courseSum.getCurrentMonthAddReward().add(e.getCourseSalary()));

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

@@ -210,12 +210,15 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 	@Override
 	public void balancedRelationship(String month) {
 		//获取上个月时间
-		String lastMonth = DateUtil.dateToString(DateUtil.addMonths(DateUtil.stringToDate(month,DateUtil.ISO_YEAR_MONTH_FORMAT),-1),DateUtil.ISO_YEAR_MONTH_FORMAT);
+		Date months = DateUtil.addMonths(DateUtil.stringToDate(month, DateUtil.ISO_YEAR_MONTH_FORMAT), -1);
+		String lastMonth = DateUtil.dateToString(months, DateUtil.ISO_YEAR_MONTH_FORMAT);
+		String firstDay = DateUtil.dateToString(DateUtil.getFirstDayOfMonth(months),DateUtil.ISO_EXPANDED_DATE_FORMAT);
+		String lastDay = DateUtil.dateToString(DateUtil.getLastDayOfMonth(months),DateUtil.ISO_EXPANDED_DATE_FORMAT);
 		//乐团课
-		operatingReportNewDao.musicBalancedRelationship(month,lastMonth);
+		operatingReportNewDao.musicBalancedRelationship(firstDay,lastDay);
 
 		//vip课
-		operatingReportNewDao.vipBalancedRelationship(month,lastMonth);
+		operatingReportNewDao.vipBalancedRelationship(firstDay,lastDay);
 
 		//云教练
 		operatingReportNewDao.cloudBalancedRelationship(month,lastMonth);

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

@@ -43,7 +43,7 @@
                  left join class_group cg ON cg.id_ = mm.class_group_id_
                  left join music_group mg ON mg.id_ = cg.music_group_id_
                  left join organization o ON o.id_ = mg.organ_id_
-        where mm.month_ = #{month}
+        where mm.first_day_ = #{firstDay} AND mm.last_day_ = #{lastDay}
         <if test="organIds != null and organIds != ''">
             AND FIND_IN_SET(mg.organ_id_,#{organIds})
         </if>
@@ -302,7 +302,7 @@
         from month_vip_report_statis mv
                  left join student_basic_info sbi ON sbi.user_id_ = mv.user_id_
                  left join vip_group_category vgc ON vgc.id_ = mv.course_type_
-        where mv.month_ = #{month}
+        where mv.first_day_ = #{firstDay} AND mv.last_day_ = #{lastDay}
         <if test="organIds != null and organIds != ''">
             AND FIND_IN_SET(sbi.organ_id_,#{organIds})
         </if>
@@ -332,7 +332,7 @@
             SUM(mv.last_month_course_salary_) AS lastMonthCourseSalary,
             SUM(mv.last_month_no_course_salary_) AS lastMonthNoCourseSalary
         from month_vip_report_statis mv
-        where mv.month_ = #{month}
+        where mv.first_day_ = #{firstDay} AND mv.last_day_ = #{lastDay}
     </select>
     <select id="exportBalancedRelationshipCloudSum"
             resultType="com.ym.mec.biz.dal.dto.ExportWrapper$ExportBalancedRelationshipCloudSum">

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

@@ -1409,7 +1409,7 @@
             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}
+        where mm.first_day_ = #{firstDay} AND mm.last_day_ = #{lastDay}
         <if test="organIds != null and organIds != ''">
             AND FIND_IN_SET(mg.organ_id_,#{organIds})
         </if>

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

@@ -429,14 +429,14 @@
 		where month_ = #{month} group by organ_id_
 	</select>
 	<update id="musicBalancedRelationship">
-		select firstMonthVipReportStatis(#{month});
-		select currentMonthVipReportStatis(#{lastMonth});
-		select lastMonthVipReportStatis(#{lastMonth});
+		select firstMonthVipReportStatis(#{firstDay},#{lastDay});
+		select currentMonthVipReportStatis(#{firstDay},#{lastDay});
+		select lastMonthVipReportStatis(#{firstDay},#{lastDay});
 	</update>
 	<update id="vipBalancedRelationship">
-		select firstMonthMusicClassReportStatis(#{month});
-		select currentMonthMusicClassReportStatis(#{lastMonth});
-		select lastMonthMusicClassReportStatis(#{lastMonth});
+		select firstMonthMusicClassReportStatis(#{firstDay},#{lastDay});
+		select currentMonthMusicClassReportStatis(#{firstDay},#{lastDay});
+		select lastMonthMusicClassReportStatis(#{firstDay},#{lastDay});
 	</update>
 	<update id="cloudBalancedRelationship">
 		select firstMonthCloudReportStatis(#{month});