Merge branch 'zx_saas_export_0814' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/java/com/ym/mec/config/ResourceServerConfig.java

@@ -56,7 +56,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                         "/api-teacher/teacherContract/callback", "/api-teacher/eduPracticeGroup/queryOrderInfo", "/api-teacher/open/**",
 
                 //web
-                        "/api-web/classGroup/highClassGroups", "/api-web/api/*", "/api-web/appVersionInfo/queryByPlatform", "/api-web/eduDegree/*",
+                        "/api-web/task/**","/api-web/classGroup/highClassGroups", "/api-web/api/*", "/api-web/appVersionInfo/queryByPlatform", "/api-web/eduDegree/*",
                         "/api-web/uploadFile", "/api-web/eduContracts/queryProduceContract", "/api-web/activity/doubleEleven2020Statis", "/api-web/replacementInstrument/queryPage",
                         "/api-web/replacementInstrumentActivity/queryReplacementsStat", "/api-web/eduStudentRegistration/queryPreApplyList",
                         "/api-web/eduSubject/findSubSubjects", "/api-web/eduFinancialExpenditure/batchAdd", "/api-web/eduSendNotice/*",

mec-application/src/main/resources/exportColumnMapper.ini

@@ -419,8 +419,8 @@ headColumns = ["分部","乐团名称","乐团编号","班级名称","班级类
 fieldColumns = ["organName","musicGroupName","musicGroupId","className","classType","classId","courseType","subCourseMinutes","totalCoursePrice","totalCourseSalary"]
 
 [平衡关系-已分班未排课汇总]
-headColumns = ["期初剩余可排课时长", "期初总预收", "期初总课酬", "期末剩余可排课时长", "期末总预收", "期末总课酬", "当月新增剩余可排课时长", "当月新增总预收", "当月新增总课酬", "当月消耗可排课时长", "当月消耗总预收", "当月消耗总课酬"]
-fieldColumns = ["firstSubCourseMinutes", "firstTotalCoursePrice", "firstTotalCourseSalary", "lastSubCourseMinutes", "lastTotalCoursePrice", "lastTotalCourseSalary", "currentSubCourseMinutes", "currentTotalCoursePrice", "currentTotalCourseSalary", "currentConsumeCourseMinutes", "currentConsumeCoursePrice", "currentConsumeCourseSalary"]
+headColumns = ["期初剩余可排课时长", "期初总预收", "期初总课酬", "当月新增剩余可排课时长", "当月新增总预收", "当月新增总课酬", "当月消耗可排课时长", "当月消耗总预收", "当月消耗总课酬", "期末剩余可排课时长", "期末总预收", "期末总课酬"]
+fieldColumns = ["firstSubCourseMinutes", "firstTotalCoursePrice", "firstTotalCourseSalary", "currentSubCourseMinutes", "currentTotalCoursePrice", "currentTotalCourseSalary", "currentConsumeCourseMinutes", "currentConsumeCoursePrice", "currentConsumeCourseSalary", "lastSubCourseMinutes", "lastTotalCoursePrice", "lastTotalCourseSalary"]
 
 [平衡关系-VIP剩余课时及金额明细]
 headColumns = ["分部","学校","学生编号","学生姓名","课程类型","期初预收款（已排）","期初预收款（未排）","期初剩余课次（已排）","期初剩余课次（未排）","期初课酬成本（已排）","期初课酬成本（未排）","当月现金收款","当月余额收款","当月新增课次","当月新增课酬（已排）","当月新增课酬（未排）","当月消耗课次","当月课酬","当月课耗总收入","期末预收款（已排）","期末预收款（未排）","期末余额（已排）","期末余额（未排）","期末课酬（已排）","期末课酬（未排）"]

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

@@ -121,5 +121,6 @@ public interface OperatingReportNewDao extends BaseDAO<Integer, OperatingReportN
 
     void firstBalancedRelationship(@Param("month") String month);
 
-    void lastBalancedRelationship(@Param("lastMonth") String lastMonth);
+    void lastBalancedRelationship(@Param("month") String month);
+
 }

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

@@ -587,9 +587,9 @@ public class ExportServiceImpl implements ExportService {
         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_DETAIL,sysUser.getId());
+        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_DETAIL),
+                        managerDownload,ExportEnum.EXPORT_BALANCED_RELATIONSHIP_VIP_SUB_COURSE_SUM),
                 managerDownload.getName());
     }
 

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

@@ -279,6 +279,7 @@
             resultType="com.ym.mec.biz.dal.dto.ExportWrapper$ExportBalancedRelationshipVipSubCourseDetail">
         select sbi.organ_name_ organName,sbi.cooperation_organ_name_ coopName,sbi.user_id_ userId,sbi.user_name_ username,
                vgc.name_ courseType,
+               first_month_pre_course_amount AS firstMonthPreCourseAmount,
                first_month_pre_no_course_amount_ AS firstMonthPreNoCourseAmount,
                first_month_sub_course_num_ AS firstMonthSubCourseNum,
                first_month_sub_no_course_num_ AS firstMonthSubNoCourseNum,
@@ -302,11 +303,8 @@
                  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}
-        <if test="organIds != null and organIds.size > 0">
-            AND sbi.organ_id_ IN
-            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
-                #{organId}
-            </foreach>
+        <if test="organIds != null and organIds != ''">
+            AND FIND_IN_SET(sbi.organ_id_,#{organIds})
         </if>
         order by sbi.organ_id_,sbi.user_id_,mv.course_type_
     </select>

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

@@ -1336,27 +1336,50 @@
     <select id="exportBalancedRelationshipMusicNoCourse"
             resultType="com.ym.mec.biz.dal.dto.ExportWrapper$ExportBalancedRelationshipMusicNoCourse">
         select o.name_ organName,mg.name_ musicGroupName,cgtm.user_id_,cgsm.class_group_id_ classId,
-               mgpscd.music_group_id_ musicGroupId,cg.name_ className,cg.type_ classType,cgtm.user_id_ teacherId,
-               mgpscd.course_type_ courseType,SUM(mgpscd.sub_course_current_price_) totalCoursePrice,
+               mgpscd.music_group_id_ musicGroupId,cg.name_ className,cgtm.user_id_ teacherId,
+        CASE WHEN cg.type_ = 'NORMAL' THEN '声部班'
+        WHEN cg.type_ = 'MIX' THEN '合奏班'
+        WHEN cg.type_ = 'HIGH' THEN '基础技能班'
+        WHEN cg.type_ = 'VIP' THEN 'vip课'
+        WHEN cg.type_ = 'DEMO' THEN '试听课'
+        WHEN cg.type_ = 'PRACTICE' THEN '网管课'
+        WHEN cg.type_ = 'SNAP' THEN '临时班'
+        WHEN cg.type_ = 'COMM' THEN '对外课程'
+        WHEN cg.type_ = 'HIGH_ONLINE' THEN '线上基础技能班'
+        WHEN cg.type_ = 'MUSIC_NETWORK' THEN '乐团网管课'
+        WHEN cg.type_ = 'LIVE' THEN '直播课' END classType,
+   CASE WHEN mgpscd.course_type_ = 'SINGLE' THEN '声部课'
+        WHEN mgpscd.course_type_ = 'MIX' THEN '合奏课'
+        WHEN mgpscd.course_type_ = 'HIGH' THEN '基础技能课'
+        WHEN mgpscd.course_type_ = 'VIP' THEN 'vip课'
+        WHEN mgpscd.course_type_ = 'DEMO' THEN '试听课'
+        WHEN mgpscd.course_type_ = 'COMPREHENSIVE' THEN '综合课'
+        WHEN mgpscd.course_type_ = 'PRACTICE' THEN '网管课'
+        WHEN mgpscd.course_type_ = 'ENLIGHTENMENT' THEN '启蒙课'
+        WHEN mgpscd.course_type_ = 'TRAINING_SINGLE' THEN '集训声部课'
+        WHEN mgpscd.course_type_ = 'TRAINING_MIX' THEN '集训合奏课'
+        WHEN mgpscd.course_type_ = 'CLASSROOM' THEN '课堂课'
+        WHEN mgpscd.course_type_ = 'COMM' THEN '对外课程'
+        WHEN mgpscd.course_type_ = 'HIGH_ONLINE' THEN '线上基础技能课'
+        WHEN mgpscd.course_type_ = 'MUSIC_NETWORK' THEN '乐团网管课'
+        WHEN mgpscd.course_type_ = 'LIVE' THEN '直播课' END courseType,
+               SUM(mgpscd.sub_course_current_price_) totalCoursePrice,
                SUM(mgpscd.sub_course_minutes_) subCourseMinutes,COUNT(DISTINCT cgsm.user_id_) studentNum
         from music_group_payment_student_course_detail mgpscd
                  left join class_group_student_mapper cgsm ON cgsm.music_group_id_ = mgpscd.music_group_id_ and cgsm.user_id_ = mgpscd.user_id_ AND cgsm.status_ = 'NORMAL'
                  left join class_group cg ON cg.id_ = cgsm.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__
+                 left join music_group mg ON mg.id_ = cg.music_group_id_
+                 left join organization o ON o.id_ = mg.organ_id_
                  left join class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cg.id_ AND cgtm.teacher_role_ = 'BISHOP'
         where mgpscd.sub_course_current_price_ > 0 AND mgpscd.sub_course_minutes_ > 0
           AND (cg.type_ = mgpscd.course_type_ OR
                    (cg.type_ = 'NORMAL' AND mgpscd.course_type_ IN ('SINGLE','TRAINING_SINGLE')) OR
                    (cg.type_ = 'MIX' AND mgpscd.course_type_ IN ('MIX','TRAINING_MIX')) OR cg.type_ = 'SNAP')
           <if test="month != null and month != ''">
-                AND mgpscd.create_time_ $lt; #{month}
+                AND mgpscd.create_time_ &lt; #{month}
           </if>
-        <if test="organIds != null and organIds.size > 0">
-            AND mg.organ_id_ IN
-            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
-                #{organId}
-            </foreach>
+        <if test="organIds != null and organIds != ''">
+            AND FIND_IN_SET(mg.organ_id_,#{organIds})
         </if>
         group by mg.organ_id_,cgsm.class_group_id_,mgpscd.course_type_
         order by mg.organ_id_,cgsm.class_group_id_,mgpscd.course_type_
@@ -1371,15 +1394,15 @@
         (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_ $lt;= #{month} AND cgsm.class_group_id_ IS NULL;
+        AND mgpscd.create_time_ &lt;= #{month} AND cgsm.class_group_id_ IS NULL;
     </select>
     <select id="exportBalancedRelationshipMusicCourseSum"
             resultType="com.ym.mec.biz.dal.dto.ExportWrapper$ExportBalancedRelationshipMusicCourseSum">
         select
-        first_month_pre_amount_ firstMonthPreAmount, first_month_sub_course_num_ firstMonthSubCourseNum,
-        first_month_course_salary_ firstMonthCourseSalary, current_month_consume_course_num_ currentMonthConsume, current_month_course_salary_ currentMonthConsumeReward,
-        current_month_course_amount_ currentMonthCourseAmount, last_month_pre_amount_ lastMonthPreAmount,
-        last_month_sub_course_num_ lastMonthSubCourseNum, last_month_course_salary_ lastMonthCourseSalary
+            SUM(first_month_pre_amount_) firstMonthPreAmount, SUM(first_month_sub_course_num_) firstMonthSubCourseNum,
+            SUM(first_month_course_salary_) firstMonthCourseSalary, SUM(current_month_consume_course_num_) currentMonthConsume, SUM(current_month_course_salary_) currentMonthConsumeReward,
+            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
         where mm.month_ = #{month}
     </select>

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

@@ -428,17 +428,17 @@
 		from human_cost
 		where month_ = #{month} group by organ_id_
 	</select>
-	<select id="firstBalancedRelationship">
+	<update id="firstBalancedRelationship">
 		select firstMonthVipReportStatis(#{month});
 		select firstMonthMusicClassReportStatis(#{month});
 		select firstMonthCloudReportStatis(#{month});
-	</select>
-	<select id="lastBalancedRelationship">
+	</update>
+	<update id="lastBalancedRelationship">
 		select currentMonthVipReportStatis(#{month});
 		select lastMonthVipReportStatis(#{month});
 		select currentMonthMusicClassReportStatis(#{month});
 		select lastMonthMusicClassReportStatis(#{month});
 		select currentMonthCloudReportStatis(#{month});
 		select lastMonthCloudReportStatis(#{month});
-	</select>
+	</update>
 </mapper>

mec-common/audit-log/src/main/java/com/yonge/log/interceptor/AuditLogInterceptor.java

@@ -41,7 +41,7 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
 
     @Override
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
-//        syncSaveLog(request, handler);
+        syncSaveLog(request, handler);
     }
 
     public void syncSaveLog(HttpServletRequest request, Object handler) {