yjwang пре 2 недеља
родитељ
комит
8a4272f615

+ 2 - 2
fs-company-app/src/main/java/com/fs/app/controller/FsUserController.java

@@ -242,8 +242,8 @@ public class FsUserController extends AppBaseController {
         long userId = Long.parseLong(getUserId());
         UserStatisticsCommonParam param = new UserStatisticsCommonParam();
         param.setUserId(userId).setStartTime(startTime).setEndTime(endTime);
-        List<FsUserGraphicStatisticsVO> list = fsUserService.graphicStatistics(param);
-        return ResponseResult.ok(list);
+//        List<FsUserGraphicStatisticsVO> list = fsUserService.graphicStatistics(param);
+        return ResponseResult.ok();
     }
 
     @Login

+ 7 - 1
fs-service/src/main/java/com/fs/course/mapper/FsUserCourseVideoRedPackageMapper.java

@@ -114,6 +114,12 @@ public interface FsUserCourseVideoRedPackageMapper
             "</script>")
     int deleteBatchByVideoIds(@Param("ids") Long[] ids);
 
-
+    @Delete("<script>" +
+            "DELETE FROM fs_user_course_video_red_package WHERE period_id IN " +
+            "<foreach collection='ids' item='id' open='(' separator=',' close=')'>" +
+            "#{id}" +
+            "</foreach>" +
+            "</script>")
+    int deleteBatchByPeriodIds(@Param("ids") Long[] ids);
     Integer selectRedPacketByCompanyCount(@Param("videoId") Long videoId,@Param("companyId") Long companyId, @Param("periodId") Long periodId);
 }

+ 1 - 1
fs-service/src/main/java/com/fs/course/service/impl/FsUserCoursePeriodServiceImpl.java

@@ -174,7 +174,7 @@ public class FsUserCoursePeriodServiceImpl implements IFsUserCoursePeriodService
             //删除红包记录(修改状态)
             //fsUserCourseVideoRedPackageMapper.updateBatchDelFlag(videoIds.toArray(new Long[0]),1);
             //直接删除
-            fsUserCourseVideoRedPackageMapper.deleteBatchByVideoIds(videoIds.toArray(new Long[0]));
+            fsUserCourseVideoRedPackageMapper.deleteBatchByPeriodIds(periodIds);
         }
         return flag;
     }

+ 3 - 1
fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseTrainingCampServiceImpl.java

@@ -102,8 +102,10 @@ public class FsUserCourseTrainingCampServiceImpl extends ServiceImpl<FsUserCours
             fsUserCoursePeriodDaysMapper.updateBatchDelFlag(periodDayIds.toArray(new Long[0]),1);
             //删除红包记录(修改状态)
             //fsUserCourseVideoRedPackageMapper.updateBatchDelFlag(videoIds.toArray(new Long[0]),1);
+//            //直接删除
+//            fsUserCourseVideoRedPackageMapper.deleteBatchByVideoIds(videoIds.toArray(new Long[0]));
             //直接删除
-            fsUserCourseVideoRedPackageMapper.deleteBatchByVideoIds(videoIds.toArray(new Long[0]));
+            fsUserCourseVideoRedPackageMapper.deleteBatchByPeriodIds(set.toArray(new Long[0]));
         }
     }
 

BIN
fs-store/src/main/resources/打印详情表格.xlsx