Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

web/src/main/java/com/ibeetl/jlw/entity/Competition.java

@@ -1,6 +1,7 @@
 package com.ibeetl.jlw.entity;
 
 import cn.jlw.validate.ValidateConfig;
+import com.ibeetl.admin.core.annotation.Query;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import org.beetl.sql.annotation.entity.AutoID;
 
@@ -147,6 +148,25 @@ public class Competition extends BaseEntity{
     //除外的学生IDs
 
     private String excludedStudentIds;
+
+    //技术支持方
+    private String competitionTechnicalName;
+    //大赛轮播图1
+    private String competitionCarouselImage1;
+    //轮播图1超链接网址
+    private String competitionHyperlinkUrl1;
+    //大赛轮播图2
+    private String competitionCarouselImage2;
+    //轮播图2超链接网址
+    private String competitionHyperlinkUrl2;
+    //大赛轮播图3
+    private String competitionCarouselImage3;
+    //轮播图3超链接网址
+    private String competitionHyperlinkUrl3;
+    //试玩阶段开始时间
+    private String competitionFreetrialStartTime;
+    //试玩阶段结束时间
+    private String competitionFreetrialEndTime;
 	
     public Competition(){
     }
@@ -515,4 +535,76 @@ public class Competition extends BaseEntity{
     public void setExcludedStudentIds(String excludedStudentIds) {
         this.excludedStudentIds = excludedStudentIds;
     }
+
+    public String getCompetitionTechnicalName() {
+        return competitionTechnicalName;
+    }
+
+    public void setCompetitionTechnicalName(String competitionTechnicalName) {
+        this.competitionTechnicalName = competitionTechnicalName;
+    }
+
+    public String getCompetitionCarouselImage1() {
+        return competitionCarouselImage1;
+    }
+
+    public void setCompetitionCarouselImage1(String competitionCarouselImage1) {
+        this.competitionCarouselImage1 = competitionCarouselImage1;
+    }
+
+    public String getCompetitionHyperlinkUrl1() {
+        return competitionHyperlinkUrl1;
+    }
+
+    public void setCompetitionHyperlinkUrl1(String competitionHyperlinkUrl1) {
+        this.competitionHyperlinkUrl1 = competitionHyperlinkUrl1;
+    }
+
+    public String getCompetitionCarouselImage2() {
+        return competitionCarouselImage2;
+    }
+
+    public void setCompetitionCarouselImage2(String competitionCarouselImage2) {
+        this.competitionCarouselImage2 = competitionCarouselImage2;
+    }
+
+    public String getCompetitionHyperlinkUrl2() {
+        return competitionHyperlinkUrl2;
+    }
+
+    public void setCompetitionHyperlinkUrl2(String competitionHyperlinkUrl2) {
+        this.competitionHyperlinkUrl2 = competitionHyperlinkUrl2;
+    }
+
+    public String getCompetitionCarouselImage3() {
+        return competitionCarouselImage3;
+    }
+
+    public void setCompetitionCarouselImage3(String competitionCarouselImage3) {
+        this.competitionCarouselImage3 = competitionCarouselImage3;
+    }
+
+    public String getCompetitionHyperlinkUrl3() {
+        return competitionHyperlinkUrl3;
+    }
+
+    public void setCompetitionHyperlinkUrl3(String competitionHyperlinkUrl3) {
+        this.competitionHyperlinkUrl3 = competitionHyperlinkUrl3;
+    }
+
+    public String getCompetitionFreetrialStartTime() {
+        return competitionFreetrialStartTime;
+    }
+
+    public void setCompetitionFreetrialStartTime(String competitionFreetrialStartTime) {
+        this.competitionFreetrialStartTime = competitionFreetrialStartTime;
+    }
+
+    public String getCompetitionFreetrialEndTime() {
+        return competitionFreetrialEndTime;
+    }
+
+    public void setCompetitionFreetrialEndTime(String competitionFreetrialEndTime) {
+        this.competitionFreetrialEndTime = competitionFreetrialEndTime;
+    }
 }

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java

@@ -38,14 +38,6 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
     //班级ID集合
     private String schoolClassIds ;
 
-    public String getSchoolClassIdsText() {
-        return schoolClassIdsText;
-    }
-
-    public void setSchoolClassIdsText(String schoolClassIdsText) {
-        this.schoolClassIdsText = schoolClassIdsText;
-    }
-
     @FetchSql(
             "@if(strUtil.equalsIgnoreCase(schoolClassIds, 'ALL')) { \n" +
             "select '所有班级'  \n" +
@@ -59,6 +51,20 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
             "@}\n" )
     private String schoolClassIdsText;
 
+    // 如果是全部的班级，则查询该课程关联的全部班级
+    // 否则 取schoolClassIds 字段。
+    @FetchSql(
+            "@if(strUtil.equalsIgnoreCase(schoolClassIds, 'ALL')) { \n" +
+                    "select group_concat(distinct(school_class_id))  \n" +
+                    "            from teacher_open_course_merge_school_class t  \n" +
+                    "            where t.teacher_open_course_id = #teacherOpenCourseId#  \n" +
+                    "            and t.teacher_open_course_merge_school_class_status = 1  \n" +
+                    "            group by t.teacher_open_course_id  \n" +
+                    "@} else { \n" +
+                    " select #schoolClassIds# " +
+                    "@}\n" )
+    private String schoolClassIdsRender;
+
     // 所有班级标识
     public static String ALL_SCHOOL_CLASS_IDS_SIGN = "ALL";
 	
@@ -92,7 +98,36 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
     @Dict(type="global_status")
 
     private Integer teacherOpenCourseStudentSigninSettingStatus ;
-	
+
+    // 这个开课ID下的签到场次总数量
+
+    @FetchSql("select count(1) from teacher_open_course_student_signin_setting " +
+            "where teacher_open_course_id = #teacherOpenCourseId# and teacher_open_course_student_signin_setting_status = 1 ")
+    private Integer signinSettingCount;
+
+    // 签到总人数
+
+    @FetchSql("select count(1) " +
+            "from teacher_open_course_student_signin_log t " +
+            "left join teacher_open_course_student_signin_setting ta on ta.teacher_open_course_student_signin_setting_id = t.teacher_open_course_student_signin_setting_id " +
+            "where t.teacher_open_course_id = #teacherOpenCourseId# ")
+    private Integer signinTotalCount;
+
+    // 学生总人数
+
+    @FetchSql("select count(1) from student t where find_in_set(t.class_id, #schoolClassIdsRender#) ")
+    private Integer signinStudentTotalCount;
+
+    // 缺勤 schoolClassIds
+
+    @FetchSql("select if((#signinStudentTotalCount# - #signinTotalCount#) < 0, 0, (#signinStudentTotalCount# - #signinTotalCount#))")
+    private Integer unsigninCount;
+
+    // 合计到课率 100为单位
+
+    @FetchSql("select round(#signinTotalCount# / (if((#signinStudentTotalCount#) <= 0, 1, (#signinStudentTotalCount#))) * 100, 1)")
+    private float signinTotalRate;
+
     //组织ID
 
     private Long orgId ;
@@ -264,4 +299,60 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
     public void setTeacherOpenCourseStudentSigninSettingSessionTime(Date teacherOpenCourseStudentSigninSettingSessionTime) {
         this.teacherOpenCourseStudentSigninSettingSessionTime = teacherOpenCourseStudentSigninSettingSessionTime;
     }
+
+    public Integer getSigninSettingCount() {
+        return signinSettingCount;
+    }
+
+    public void setSigninSettingCount(Integer signinSettingCount) {
+        this.signinSettingCount = signinSettingCount;
+    }
+
+    public Integer getSigninTotalCount() {
+        return signinTotalCount;
+    }
+
+    public void setSigninTotalCount(Integer signinTotalCount) {
+        this.signinTotalCount = signinTotalCount;
+    }
+
+    public Integer getUnsigninCount() {
+        return unsigninCount;
+    }
+
+    public void setUnsigninCount(Integer unsigninCount) {
+        this.unsigninCount = unsigninCount;
+    }
+
+    public float getSigninTotalRate() {
+        return signinTotalRate;
+    }
+
+    public void setSigninTotalRate(float signinTotalRate) {
+        this.signinTotalRate = signinTotalRate;
+    }
+
+    public String getSchoolClassIdsRender() {
+        return schoolClassIdsRender;
+    }
+
+    public void setSchoolClassIdsRender(String schoolClassIdsRender) {
+        this.schoolClassIdsRender = schoolClassIdsRender;
+    }
+
+    public Integer getSigninStudentTotalCount() {
+        return signinStudentTotalCount;
+    }
+
+    public void setSigninStudentTotalCount(Integer signinStudentTotalCount) {
+        this.signinStudentTotalCount = signinStudentTotalCount;
+    }
+
+    public String getSchoolClassIdsText() {
+        return schoolClassIdsText;
+    }
+
+    public void setSchoolClassIdsText(String schoolClassIdsText) {
+        this.schoolClassIdsText = schoolClassIdsText;
+    }
 }

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java

@@ -166,8 +166,8 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
      * @param id
      * @param status
      */
-    public void editStatus(@NotNull(message = "签到配置ID不能为空！") Long id,
-                           @NotNull(message = "签到状态不能为空！")
+    public void updateStatus(@NotNull(message = "签到配置ID不能为空！") Long id,
+                             @NotNull(message = "签到状态不能为空！")
                           @Pattern(regexp = "[12]",message = "状态只接收两个值：1开始 2结束")
                           Integer status) {
         TeacherOpenCourseStudentSigninSetting model = new TeacherOpenCourseStudentSigninSetting();

web/src/main/java/com/ibeetl/jlw/web/CompetitionController.java

@@ -88,10 +88,14 @@ public class CompetitionController{
         return view;
     }
 
+    /**
+    *@author 姚丹
+    *@data 2022/10/17
+     */
     @GetMapping(MODEL + "/add.do")
     @Function("competition.add")
     @ResponseBody
-    public ModelAndView add(Long competitionId) {
+    public ModelAndView add(Long competitionId,String sign) {
         ModelAndView view = new ModelAndView("/jlw/competition/add.html");
         if(null != competitionId){
             Competition competition = competitionService.queryById(competitionId);
@@ -105,6 +109,7 @@ public class CompetitionController{
             view.addObject("competition", new Competition());
             view.addObject("competitionNewsList", new ArrayList<CompetitionNews>());
         }
+        view.addObject("sign", sign);
         return view;
     }
 

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java

@@ -202,11 +202,11 @@ public class TeacherOpenCourseStudentSigninSettingController{
      * @param status    1：开始 2：结束
      * @return
      */
-    @PostMapping(MODEL + "/editStatus.json")
+    @PostMapping(MODEL + "/updateStatus.json")
     @Function("teacherOpenCourseStudentSigninSetting.edit")
     @ResponseBody
-    public JsonResult editStatus(Long id, Integer status) {
-        teacherOpenCourseStudentSigninSettingService.editStatus(id, status);
+    public JsonResult updateStatus(Long id, Integer status) {
+        teacherOpenCourseStudentSigninSettingService.updateStatus(id, status);
         return JsonResult.success();
     }
 

web/src/main/java/com/ibeetl/jlw/web/query/CompetitionQuery.java

@@ -77,6 +77,24 @@ public class CompetitionQuery extends PageParam {
     private String classIds;
     @Query(name = "除外的学生IDs", display = false)
     private String excludedStudentIds;
+    @Query(name = "技术支持方", display = false)
+    private String competitionTechnicalName;
+    @Query(name = "大赛轮播图1", display = false)
+    private String competitionCarouselImage1;
+    @Query(name = "轮播图1超链接网址", display = false)
+    private String competitionHyperlinkUrl1;
+    @Query(name = "大赛轮播图2", display = false)
+    private String competitionCarouselImage2;
+    @Query(name = "轮播图2超链接网址", display = false)
+    private String competitionHyperlinkUrl2;
+    @Query(name = "大赛轮播图3", display = false)
+    private String competitionCarouselImage3;
+    @Query(name = "轮播图3超链接网址", display = false)
+    private String competitionHyperlinkUrl3;
+    @Query(name = "试玩阶段开始时间", display = false)
+    private String competitionFreetrialStartTime;
+    @Query(name = "试玩阶段结束时间", display = false)
+    private String competitionFreetrialEndTime;
 
     private String competitionStudentsJson; //参赛学员json
     private String competitionNewsJson; //大赛动态json
@@ -324,6 +342,15 @@ public class CompetitionQuery extends PageParam {
 
         pojo.setClassIds(this.getClassIds());
         pojo.setExcludedStudentIds(this.getExcludedStudentIds());
+        pojo.setCompetitionTechnicalName(this.getCompetitionTechnicalName());
+        pojo.setCompetitionCarouselImage1(this.getCompetitionCarouselImage1());
+        pojo.setCompetitionCarouselImage2(this.getCompetitionCarouselImage2());
+        pojo.setCompetitionCarouselImage3(this.getCompetitionCarouselImage3());
+        pojo.setCompetitionHyperlinkUrl1(this.getCompetitionHyperlinkUrl1());
+        pojo.setCompetitionHyperlinkUrl2(this.getCompetitionHyperlinkUrl2());
+        pojo.setCompetitionHyperlinkUrl3(this.getCompetitionHyperlinkUrl3());
+        pojo.setCompetitionFreetrialStartTime(this.getCompetitionFreetrialStartTime());
+        pojo.setCompetitionFreetrialEndTime(this.getCompetitionFreetrialEndTime());
         return pojo;
      }
 
@@ -488,5 +515,75 @@ public class CompetitionQuery extends PageParam {
         this.resourcesApplicationId = resourcesApplicationId;
     }
 
+    public String getCompetitionTechnicalName() {
+        return competitionTechnicalName;
+    }
+
+    public void setCompetitionTechnicalName(String competitionTechnicalName) {
+        this.competitionTechnicalName = competitionTechnicalName;
+    }
+
+    public String getCompetitionCarouselImage1() {
+        return competitionCarouselImage1;
+    }
+
+    public void setCompetitionCarouselImage1(String competitionCarouselImage1) {
+        this.competitionCarouselImage1 = competitionCarouselImage1;
+    }
+
+    public String getCompetitionHyperlinkUrl1() {
+        return competitionHyperlinkUrl1;
+    }
+
+    public void setCompetitionHyperlinkUrl1(String competitionHyperlinkUrl1) {
+        this.competitionHyperlinkUrl1 = competitionHyperlinkUrl1;
+    }
+
+    public String getCompetitionCarouselImage2() {
+        return competitionCarouselImage2;
+    }
+
+    public void setCompetitionCarouselImage2(String competitionCarouselImage2) {
+        this.competitionCarouselImage2 = competitionCarouselImage2;
+    }
+
+    public String getCompetitionHyperlinkUrl2() {
+        return competitionHyperlinkUrl2;
+    }
 
+    public void setCompetitionHyperlinkUrl2(String competitionHyperlinkUrl2) {
+        this.competitionHyperlinkUrl2 = competitionHyperlinkUrl2;
+    }
+
+    public String getCompetitionCarouselImage3() {
+        return competitionCarouselImage3;
+    }
+
+    public void setCompetitionCarouselImage3(String competitionCarouselImage3) {
+        this.competitionCarouselImage3 = competitionCarouselImage3;
+    }
+
+    public String getCompetitionHyperlinkUrl3() {
+        return competitionHyperlinkUrl3;
+    }
+
+    public void setCompetitionHyperlinkUrl3(String competitionHyperlinkUrl3) {
+        this.competitionHyperlinkUrl3 = competitionHyperlinkUrl3;
+    }
+
+    public String getCompetitionFreetrialStartTime() {
+        return competitionFreetrialStartTime;
+    }
+
+    public void setCompetitionFreetrialStartTime(String competitionFreetrialStartTime) {
+        this.competitionFreetrialStartTime = competitionFreetrialStartTime;
+    }
+
+    public String getCompetitionFreetrialEndTime() {
+        return competitionFreetrialEndTime;
+    }
+
+    public void setCompetitionFreetrialEndTime(String competitionFreetrialEndTime) {
+        this.competitionFreetrialEndTime = competitionFreetrialEndTime;
+    }
 }

web/src/main/resources/sql/jlw/competition.md

@@ -35,6 +35,15 @@ queryByCondition
         c.resources_application_id,
         c.class_ids,
         c.excluded_student_ids,
+        c.competition_technical_name,
+        c.competition_carousel_image1,
+        c.competition_hyperlink_url1,
+        c.competition_carousel_image2,
+        c.competition_hyperlink_url2,
+        c.competition_carousel_image3,
+        c.competition_hyperlink_url3,
+        c.competition_freetrial_start_time,
+        c.competition_freetrial_end_time,
           @if(showCompetitionGeneralization == 1){
             c.competition_generalization,
           @}
@@ -171,6 +180,33 @@ queryByCondition
       @if(!isEmpty(competitionDetailedStatuses)){
        and find_in_set(t.competition_detailed_status,#competitionDetailedStatuses#)
       @}
+    @if(!isEmpty(competitionTechnicalName)){
+    and t.competition_technical_name =#competitionTechnicalName#
+    @}
+    @if(!isEmpty(competitionCarouselImage1)){
+    and t.competition_carousel_image1 =#competitionCarouselImage1#
+    @}
+    @if(!isEmpty(competitionHyperlinkUrl1)){
+    and t.competition_hyperlink_url1 =#competitionHyperlinkUrl1#
+    @}
+    @if(!isEmpty(competitionCarouselImage2)){
+    and t.competition_carousel_image2 =#competitionCarouselImage2#
+    @}
+    @if(!isEmpty(competitionHyperlinkUrl2)){
+    and t.competition_hyperlink_url2 =#competitionHyperlinkUrl2#
+    @}
+    @if(!isEmpty(competitionCarouselImage3)){
+    and t.competition_carousel_image3 =#competitionCarouselImage3#
+    @}
+    @if(!isEmpty(competitionHyperlinkUrl3)){
+    and t.competition_hyperlink_url3 =#competitionHyperlinkUrl3#
+    @}
+    @if(!isEmpty(competitionFreetrialStartTime)){
+    and t.competition_freetrial_start_time =#competitionFreetrialStartTime#
+    @}
+    @if(!isEmpty(competitionFreetrialEndTime)){
+    and t.competition_freetrial_end_time =#competitionFreetrialEndTime#
+    @}
     ORDER BY t.competition_contest_start_time DESC
     
 queryByCondition2Student
@@ -210,6 +246,15 @@ queryByCondition2Student
         c.resources_application_id,
         c.class_ids,
         c.excluded_student_ids,
+        c.competition_technical_name,
+        c.competition_carousel_image1,
+        c.competition_hyperlink_url1,
+        c.competition_carousel_image2,
+        c.competition_hyperlink_url2,
+        c.competition_carousel_image3,
+        c.competition_hyperlink_url3,
+        c.competition_freetrial_start_time,
+        c.competition_freetrial_end_time,
           @if(showCompetitionGeneralization == 1){
             c.competition_generalization,
           @}
@@ -340,6 +385,33 @@ queryByCondition2Student
       @if(!isEmpty(competitionDetailedStatuses)){
        and find_in_set(t.competition_detailed_status,#competitionDetailedStatuses#)
       @}
+        @if(!isEmpty(competitionTechnicalName)){
+        and t.competition_technical_name =#competitionTechnicalName#
+        @}
+        @if(!isEmpty(competitionCarouselImage1)){
+        and t.competition_carousel_image1 =#competitionCarouselImage1#
+        @}
+        @if(!isEmpty(competitionHyperlinkUrl1)){
+        and t.competition_hyperlink_url1 =#competitionHyperlinkUrl1#
+        @}
+        @if(!isEmpty(competitionCarouselImage2)){
+        and t.competition_carousel_image2 =#competitionCarouselImage2#
+        @}
+        @if(!isEmpty(competitionHyperlinkUrl2)){
+        and t.competition_hyperlink_url2 =#competitionHyperlinkUrl2#
+        @}
+        @if(!isEmpty(competitionCarouselImage3)){
+        and t.competition_carousel_image3 =#competitionCarouselImage3#
+        @}
+        @if(!isEmpty(competitionHyperlinkUrl3)){
+        and t.competition_hyperlink_url3 =#competitionHyperlinkUrl3#
+        @}
+        @if(!isEmpty(competitionFreetrialStartTime)){
+        and t.competition_freetrial_start_time =#competitionFreetrialStartTime#
+        @}
+        @if(!isEmpty(competitionFreetrialEndTime)){
+        and t.competition_freetrial_end_time =#competitionFreetrialEndTime#
+        @}
     ORDER BY t.competition_contest_start_time DESC
 
     
@@ -398,6 +470,15 @@ getCompetitionValues
         c.resources_application_id,
         c.class_ids,
         c.excluded_student_ids,
+        c.competition_technical_name,
+        c.competition_carousel_image1,
+        c.competition_hyperlink_url1,
+        c.competition_carousel_image2,
+        c.competition_hyperlink_url2,
+        c.competition_carousel_image3,
+        c.competition_hyperlink_url3,
+        c.competition_freetrial_start_time,
+        c.competition_freetrial_end_time,
         (SELECT COUNT(*) FROM competition_students WHERE competition_id = c.competition_id) competition_student_number,
         CASE WHEN c.competition_type = 2 THEN (SELECT COUNT(*) FROM competition_students WHERE competition_id = c.competition_id AND is_captain = 1) ELSE NULL END competition_team_number,
         -- 1报名未开始 2报名中 3报名结束或大赛未开始 4大赛开始或任务一未开始 5任务一进行中 6任务一结束或任务二未开始 7任务二进行中 8任务二结束或任务三未开始 9任务三进行中 10任务三结束 11大赛结束 
@@ -507,6 +588,33 @@ getCompetitionValues
       @if(!isEmpty(resourcesApplicationId)){
         and t.resources_application_id =#resourcesApplicationId#
       @}
+  @if(!isEmpty(competitionTechnicalName)){
+  and t.competition_technical_name =#competitionTechnicalName#
+  @}
+  @if(!isEmpty(competitionCarouselImage1)){
+  and t.competition_carousel_image1 =#competitionCarouselImage1#
+  @}
+  @if(!isEmpty(competitionHyperlinkUrl1)){
+  and t.competition_hyperlink_url1 =#competitionHyperlinkUrl1#
+  @}
+  @if(!isEmpty(competitionCarouselImage2)){
+  and t.competition_carousel_image2 =#competitionCarouselImage2#
+  @}
+  @if(!isEmpty(competitionHyperlinkUrl2)){
+  and t.competition_hyperlink_url2 =#competitionHyperlinkUrl2#
+  @}
+  @if(!isEmpty(competitionCarouselImage3)){
+  and t.competition_carousel_image3 =#competitionCarouselImage3#
+  @}
+  @if(!isEmpty(competitionHyperlinkUrl3)){
+  and t.competition_hyperlink_url3 =#competitionHyperlinkUrl3#
+  @}
+  @if(!isEmpty(competitionFreetrialStartTime)){
+  and t.competition_freetrial_start_time =#competitionFreetrialStartTime#
+  @}
+  @if(!isEmpty(competitionFreetrialEndTime)){
+  and t.competition_freetrial_end_time =#competitionFreetrialEndTime#
+  @}
   
     
 getById
@@ -539,6 +647,15 @@ getById
     c.resources_application_id,
     c.class_ids,
     c.excluded_student_ids,
+    c.competition_technical_name,
+    c.competition_carousel_image1,
+    c.competition_hyperlink_url1,
+    c.competition_carousel_image2,
+    c.competition_hyperlink_url2,
+    c.competition_carousel_image3,
+    c.competition_hyperlink_url3,
+    c.competition_freetrial_start_time,
+    c.competition_freetrial_end_time,
     (SELECT COUNT(*) FROM competition_students WHERE competition_id = c.competition_id) competition_student_number,
     CASE WHEN c.competition_type = 2 THEN (SELECT COUNT(*) FROM competition_students WHERE competition_id = c.competition_id AND is_captain = 1) ELSE NULL END competition_team_number,
     -- 1报名未开始 2报名中 3报名结束或大赛未开始 4大赛开始或任务一未开始 5任务一进行中 6任务一结束或任务二未开始 7任务二进行中 8任务二结束或任务三未开始 9任务三进行中 10任务三结束 11大赛结束 
@@ -609,6 +726,15 @@ getValuesByQuery
         c.competition_task_three_start_time,
         c.competition_task_three_end_time,
         c.competition_judge_ids,
+        c.competition_technical_name,
+        c.competition_carousel_image1,
+        c.competition_hyperlink_url1,
+        c.competition_carousel_image2,
+        c.competition_hyperlink_url2,
+        c.competition_carousel_image3,
+        c.competition_hyperlink_url3,
+        c.competition_freetrial_start_time,
+        c.competition_freetrial_end_time,
         (SELECT group_concat(teacher_name ORDER BY find_in_set(teacher_id,c.competition_judge_ids)) FROM teacher where find_in_set(teacher_id,c.competition_judge_ids)) teacher_names,
         c.competition_weight,
         c.org_id,
@@ -749,5 +875,32 @@ getValuesByQuery
       @if(!isEmpty(competitionDetailedStatuses)){
        and find_in_set(t.competition_detailed_status,#competitionDetailedStatuses#)
       @}
+  @if(!isEmpty(competitionTechnicalName)){
+  and t.competition_technical_name =#competitionTechnicalName#
+  @}
+  @if(!isEmpty(competitionCarouselImage1)){
+  and t.competition_carousel_image1 =#competitionCarouselImage1#
+  @}
+  @if(!isEmpty(competitionHyperlinkUrl1)){
+  and t.competition_hyperlink_url1 =#competitionHyperlinkUrl1#
+  @}
+  @if(!isEmpty(competitionCarouselImage2)){
+  and t.competition_carousel_image2 =#competitionCarouselImage2#
+  @}
+  @if(!isEmpty(competitionHyperlinkUrl2)){
+  and t.competition_hyperlink_url2 =#competitionHyperlinkUrl2#
+  @}
+  @if(!isEmpty(competitionCarouselImage3)){
+  and t.competition_carousel_image3 =#competitionCarouselImage3#
+  @}
+  @if(!isEmpty(competitionHyperlinkUrl3)){
+  and t.competition_hyperlink_url3 =#competitionHyperlinkUrl3#
+  @}
+  @if(!isEmpty(competitionFreetrialStartTime)){
+  and t.competition_freetrial_start_time =#competitionFreetrialStartTime#
+  @}
+  @if(!isEmpty(competitionFreetrialEndTime)){
+  and t.competition_freetrial_end_time =#competitionFreetrialEndTime#
+  @}
     ORDER BY t.competition_contest_start_time DESC
     

web/src/main/resources/static/js/jlw/competition/index.js

@@ -91,43 +91,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
         initToolBar:function(){
             toolbar = {
                 add : function() { // 获取选中数据
-                    layer.open({
-                        type:1,
-                        title: '新增大赛',
-                        btn: ['确定', '关闭'],
-                        btnAlign: 'c',
-                        area: ['440px', '170px'],
-                        content: '  <div class="layui-form" style="margin-top: 5px">' +
-                                    '<div class="layui-form-item">' +
-                                    '    <label class="layui-form-label">大赛类型:</label>' +
-                                    '    <div class="layui-input-block">' +
-                                    '      <input type="radio" name="type" value="1" title="金融大数据大赛">' +
-                                    '      <input type="radio" name="type" value="2" title="金融模拟交易大赛" checked>' +
-                                    '    </div>' +
-                                    '  </div>' +
-                                  '</div>'
-                        ,success: function (layero, index) {
-                            form.render();
-                        },
-                        yes: function (index, layero) {
-                            var type = $("input[name='type']:checked").val();
-                            console.log(type)
-                            if($.isEmpty(type)){
-                                Common.info("请选择大赛类型！！")
-                               return;
-                            }
-                            if(type == '1'||type == 1){
-                                var url = "/jlw/competition/add.do";
-                                Common.openDlg(url,"大赛管理/新增大赛");
-                            }else {
-                            }
-
-                            layer.close(index);
-                        },
-                        btn2: function (index, layero) {
-                            layer.close(index);
-                        }
-                    });
+                    openF("add");
                 },
                 refresh: function () {//刷新
                     searchForm.reset();
@@ -144,8 +108,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
         }, initTableTool: table.on('tool(competitionTable)', function (obj) {
             var data = obj.data;
             if (obj.event === 'edit') {
-                var url = "/jlw/competition/add.do?competitionId="+data.competitionId;
-                Common.openDlg(url,"大赛管理/编辑大赛");
+                openF("edit",data);
             }else if(obj.event === "del"){
                 layer.confirm('是否确定删除该大赛？', function (index) {
                     var ret = Common.postAjax("/jlw/competition/delete.json", {ids: data.competitionId});
@@ -191,6 +154,55 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
 
         return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
     });*/
+    function openF(f,data){
+        layer.open({
+            type:1,
+            title: f == "add"?'新增大赛':'编辑大赛',
+            btn: ['确定', '关闭'],
+            btnAlign: 'c',
+            area: ['440px', '170px'],
+            content: '  <div class="layui-form" style="margin-top: 5px">' +
+                '<div class="layui-form-item">' +
+                '    <label class="layui-form-label">大赛类型:</label>' +
+                '    <div class="layui-input-block">' +
+                '      <input type="radio" name="type" value="1" title="金融大数据大赛" checked>' +
+                '      <input type="radio" name="type" value="2" title="金融模拟交易大赛" >' +
+                '    </div>' +
+                '  </div>' +
+                '</div>'
+            ,success: function (layero, index) {
+                form.render();
+            },
+            yes: function (index, layero) {
+                var type = $("input[name='type']:checked").val();
+                if($.isEmpty(type)){
+                    Common.info("请选择大赛类型！！")
+                    return;
+                }
+                if(f == "add"){
+                    if(type == '1'||type == 1){
+                        var url = "/jlw/competition/add.do?"+"sign=1";
+                        Common.openDlg(url,"大赛管理/新增大赛");
+                    }else {
+                        var url = "/jlw/competition/add.do?"+"sign=2";
+                        Common.openDlg(url,"大赛管理/新增大赛");
+                    }
+                }else if(f == "edit"){
+                    if(type == '1'||type == 1){
+                        var url = "/jlw/competition/add.do?competitionId="+data.competitionId+"&sign=1";
+                        Common.openDlg(url,"大赛管理/编辑大赛");
+                    }else {
+                        var url = "/jlw/competition/add.do?competitionId="+data.competitionId+"&sign=2";
+                        Common.openDlg(url,"大赛管理/编辑大赛");
+                    }
+                }
+                layer.close(index);
+            },
+            btn2: function (index, layero) {
+                layer.close(index);
+            }
+        });
+    };
     exports('index',view);
 
 });

web/src/main/resources/static/js/jlw/resourcesApplicationCourse/index.js

@@ -132,6 +132,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
         }, initTableTool: table.on('tool(resourcesApplicationCourseTable)', function (obj) {
             var data = obj.data;
             if (obj.event === 'edit') {
+                // 实际是修改课程的数据，为了懒省事
                 var url = "/jlw/resourcesApplicationCourse/add.do?courseInfoId=" + data.courseInfoId;
                 Common.openDlg(url, "");
             } else if (obj.event === "del") {
@@ -211,7 +212,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
     });
 
     form.on('checkbox(binding)', function (obj) {
-        var index = $(this).parents("tr").data("index")
+        var index = $(this).parents("tr").data("index");
         layer.confirm('是否确定绑定？', function (i) {
             var data = table.cache['resourcesApplicationCourseTable'][index];
             var param = {

web/src/main/resources/static/js/jlw/resourcesInfo/index.js

@@ -106,8 +106,8 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         field: 'unfinishedYD', width: 150, title: '上传院校', align: "center"
                     },
                     {
-                        field: 'resourcesInfoType', width: 150, title: '资源类型', align: "center", templet: function (d) {//(1视频 2课件 3附件)
-                            var text= d.resourcesInfoType == 1 ? "视频" : d.resourcesInfoType == 2 ? "课件" : d.resourcesInfoType == 3 ? "附件" : '-';
+                        field: 'resourcesInfoType', width: 150, title: '资源类型', align: "center", templet: function (d) {//(1视频 2PPT 3PDF)
+                            var text= d.resourcesInfoType == 1 ? "视频" : d.resourcesInfoType == 2 ? "PPT" : d.resourcesInfoType == 3 ? "PDF" : d.resourcesInfoType == 4 ? "链接" : d.resourcesInfoType == 5 ? "图文" : '-';
                             return '<span class="textType">' + text + '</span>';
 
                         }

web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js

@@ -38,8 +38,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     align:"center",
                     hideField :false,
                     hide:$.isEmpty(sx_['teacherOpenCourseStudentSigninSettingId'])?false:sx_['teacherOpenCourseStudentSigninSettingId'],
-
-                        width : 60,
+                    width : 60,
                 },
                 {
                     field : 'teacherOpenCourseStudentSigninSettingSessionTime',
@@ -112,9 +111,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     hide:$.isEmpty(sx_['teacherOpenCourseStudentSigninSettingStartStatusText'])?false:sx_['teacherOpenCourseStudentSigninSettingStartStatusText'],
                 },
                 {
-                    field : 'operation_',title : '操作',align:"center", templet: function (d) {
-                        var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>';
-                        htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
+                    field : 'operation_',title : '操作',align:"center", width : 220, templet: function (d) {
+                        var htm = '';
+                        htm += '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="startSignin">开始签到</button>';
+                        htm += '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="endSignin">结束签到</button>';
+                        htm += '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">详情</button>';
                         return htm;
                     }
                 }
@@ -192,6 +193,40 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     });
                 });
             }
+            // 开始签到
+            else if(obj.event == 'startSignin') {
+                layer.confirm('开始签到？', function (index) {
+                    var ret = Common.postAjax(
+                        "/jlw/teacherOpenCourseStudentSigninSetting/updateStatus.json",
+                        { status: 1, id: data.teacherOpenCourseStudentSigninSettingId });
+                    layer.msg(ret.code == 0?"开始签到成功！":ret.msg, {
+                        offset: ['50%'],
+                        icon: ret.code == 0?1:2,
+                        time: 1500 //2秒关闭（如果不配置，默认是3秒）
+                    },function (){
+                        if(ret.code == 0){
+                            Lib.tableRefresh();
+                        }
+                    });
+                });
+            }
+            // 结束签到
+            else if(obj.event == 'endSignin') {
+                layer.confirm('结束签到？', function (index) {
+                    var ret = Common.postAjax(
+                        "/jlw/teacherOpenCourseStudentSigninSetting/updateStatus.json",
+                        { status: 2, id: data.teacherOpenCourseStudentSigninSettingId });
+                    layer.msg(ret.code == 0?"已结束签到！":ret.msg, {
+                        offset: ['50%'],
+                        icon: ret.code == 0?1:2,
+                        time: 1500 //2秒关闭（如果不配置，默认是3秒）
+                    },function (){
+                        if(ret.code == 0){
+                            Lib.tableRefresh();
+                        }
+                    });
+                });
+            }
         })
     }
     exports('index',view);

web/src/main/resources/templates/jlw/competition/add.html

@@ -80,12 +80,24 @@
     <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
         <ul class="layui-tab-title">
             <li lay-id="0" class="layui-this">大赛概况</li>
-            <li lay-id="1" >竞赛时间</li>
-            <li lay-id="2" >大赛任务</li>
-            <li lay-id="3" >成绩权重</li>
-            <li lay-id="4" class="cjwt">常见问题</li>
-            <li lay-id="5" class="hjmd">获奖名单</li>
-            <li lay-id="6" class="dsdt">大赛动态</li>
+            <li lay-id="1" ${sign=='1'?'':'style="display:none"'}>竞赛时间</li>
+            <!--<li lay-id="2" >参赛学员</li>-->
+            <li lay-id="2" class="cjwt" ${sign=='2'?'':'style="display:none"'}>赛组管理</li>
+
+            <li lay-id="3">大赛任务</li>
+            <li lay-id="4" ${sign=='1'?'':'style="display:none"'}>成绩权重</li>
+            <!--<li lay-id="5" >大赛评委</li>-->
+            <li lay-id="5" class="cjwt" ${sign=='2'?'':'style="display:none"'}>赛制赛程</li>
+
+            <li lay-id="6" class="cjwt" ${sign=='1'?'':'style="display:none"'}>常见问题</li>
+            <li lay-id="7" class="dsdt" ${sign=='1'?'':'style="display:none"'}>大赛动态</li>
+            <li lay-id="8" class="hjmd" ${sign=='1'?'':'style="display:none"'}>获奖名单</li>
+
+
+            <li lay-id="9" class="cjwt" ${sign=='2'?'':'style="display:none"'}>交易规则</li>
+            <li lay-id="10" class="cjwt" ${sign=='2'?'':'style="display:none"'}>奖项设置</li>
+            <li lay-id="11" class="cjwt" ${sign=='2'?'':'style="display:none"'}>大赛新闻</li>
+            <li lay-id="12" class="cjwt" ${sign=='2'?'':'style="display:none"'}>院校风采</li>
         </ul>
         <div class="layui-tab-content">
             <!--大赛概况-->

web/src/main/resources/templates/jlw/resourcesApplicationCourse/add.html

@@ -55,7 +55,7 @@
     </div>
     <div class="layui-row">
         <div class="layui-form-item">
-            <input name="resourcesApplicationIds" type="hidden" value="${courseInfo.resourcesApplicationIds}" />
+            <!--<input name="resourcesApplicationIds" type="hidden" value="${courseInfo.resourcesApplicationIds}" />-->
             <label class="layui-form-label"><span class="req">*</span>关联应用：</label>
 <!--            <div class="layui-input-block" style="margin-left: 180px;">-->
 <!--                <div id="transfer" class="demo-transfer"></div>-->

web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html

@@ -11,7 +11,7 @@
             <layui:accessButton function="teacherOpenCourseScheduleSession.query"  id="searchFormSearch" action="search"><i class="layui-icon">&#xe615;</i>搜索</layui:accessButton>
             <!--# }-->
             <layui:accessButton function="teacherOpenCourseScheduleSession.add"  action="add">添加</layui:accessButton>
-            <layui:accessButton function="teacherOpenCourseScheduleSession.edit"  action="edit">修改</layui:accessButton>
+<!--            <layui:accessButton function="teacherOpenCourseScheduleSession.edit"  action="edit">修改</layui:accessButton>-->
             <layui:accessButton function="teacherOpenCourseScheduleSession.del"  action="del">删除</layui:accessButton>
             <!--#            if(!isEmpty(search)) {-->
             <layui:accessButton function="teacherOpenCourseScheduleSession.query"  action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton>