1

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

@@ -6,6 +6,8 @@ import com.ibeetl.admin.core.annotation.DictDeep;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.enums.MenuEnums;
 import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
 import org.beetl.sql.fetch.annotation.FetchOne;
 
@@ -76,6 +78,8 @@ public class Student extends BaseEntity implements TokenInterface {
     private Long userId ;
 
     @FetchOne("classId")
+    @UpdateIgnore
+    @InsertIgnore
     @DictDeep
     private SchoolClass schoolClass;
 	

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

@@ -6,6 +6,8 @@ import com.ibeetl.admin.core.util.ValidateConfig;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
 import org.beetl.sql.fetch.annotation.FetchSql;
 
@@ -38,6 +40,8 @@ public class TeacherMergeApplication extends BaseEntity{
 
     @FetchSql("select resources_application_id, application_name, application_link, application_carousel, application_introduction, application_info, application_introduction_original, application_info_original " +
             " from resources_application t where t.resources_application_id = #resourcesApplicationId# ")
+    @UpdateIgnore
+    @InsertIgnore
     private ResourcesApplicationInfo resourcesApplication;
 
     @Data

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

@@ -7,6 +7,8 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
 import org.beetl.sql.fetch.annotation.FetchSql;
 
@@ -52,11 +54,15 @@ public class TeacherOpenCourse extends BaseEntity{
             "left join teacher ta on ta.teacher_id = t.teacher_id " +
             "where t.teacher_open_course_id = #teacherOpenCourseId# and t.teacher_open_course_merge_teacher_status = 1 " +
             "order by teacher_id limit 1 ")
+    @UpdateIgnore
+    @InsertIgnore
     private MergeTeacherInfo teacherInfo;
 
     @FetchSql("select GROUP_CONCAT(ta.class_name) from teacher_open_course_merge_school_class t  " +
             "left join school_class ta on t.school_class_id = ta.class_id " +
             "where  t.teacher_open_course_merge_school_class_status = 1 and t.teacher_open_course_id = #teacherOpenCourseId# ")
+    @UpdateIgnore
+    @InsertIgnore
     private String schoolClassInfo;
 
     @Setter

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

@@ -6,6 +6,8 @@ import com.ibeetl.admin.core.util.ValidateConfig;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
 import org.beetl.sql.fetch.annotation.FetchSql;
 
@@ -39,6 +41,8 @@ public class TeacherOpenCourseChatLog extends BaseEntity{
             "where t.teacher_open_course_id = #teacherOpenCourseId# " +
             "and t.teacher_open_course_chat_log_parent_id = #teacherOpenCourseChatLogId# " +
             "and t.teacher_open_course_chat_log_parent_id != 0")
+    @UpdateIgnore
+    @InsertIgnore
     private List<TeacherOpenCourseChatLog> children;
 	
     //课程开课ID

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

@@ -6,6 +6,8 @@ import com.ibeetl.admin.core.util.ValidateConfig;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
 import org.beetl.sql.fetch.annotation.FetchSql;
 
@@ -38,6 +40,8 @@ public class TeacherOpenCourseMergeSchoolClass extends BaseEntity{
     @FetchSql("select teacher_open_course_id, teacher_open_course_title, teacher_open_course_code, " +
             "teacher_open_course_cover, teacher_open_course_summary, start_time,end_time,create_time " +
             "from teacher_open_course where teacher_open_course_status = 1 and teacher_open_course_id = #teacherOpenCourseId# ")
+    @UpdateIgnore
+    @InsertIgnore
     private TeacherOpenCourseInfo teacherOpenCourse;
 
     @Data

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

@@ -6,6 +6,8 @@ import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import com.ibeetl.jlw.enums.OpenCourseMergeJoinTypeEnum;
 import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
 import org.beetl.sql.fetch.annotation.FetchOne;
 
@@ -52,6 +54,8 @@ public class TeacherOpenCourseMergeStudent extends BaseEntity{
 
     @FetchOne("studentId")
     @DictDeep
+    @UpdateIgnore
+    @InsertIgnore
     private Student studentInfo;
 	
     //组织ID

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

@@ -6,6 +6,8 @@ import com.ibeetl.admin.core.util.ValidateConfig;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
 import org.beetl.sql.fetch.annotation.FetchSql;
 
@@ -34,6 +36,8 @@ public class TeacherOpenCourseMergeTeacher extends BaseEntity{
     @FetchSql("select teacher_open_course_id, teacher_open_course_title, teacher_open_course_code, " +
             "teacher_open_course_cover, teacher_open_course_summary, start_time,end_time,create_time " +
             "from teacher_open_course where teacher_open_course_status = 1 and teacher_open_course_id = #teacherOpenCourseId# ")
+    @UpdateIgnore
+    @InsertIgnore
     private TeacherOpenCourseInfo teacherOpenCourse;
 
     public Long getTeacherOpenCourseMergeTeacherOrderIndex() {

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

@@ -1,17 +1,16 @@
 package com.ibeetl.jlw.entity;
 
-import javax.validation.constraints.NotNull;
-
+import com.ibeetl.admin.core.annotation.Dict;
 import com.ibeetl.admin.core.entity.BaseEntity;
-import org.beetl.sql.annotation.entity.*;
-
 import com.ibeetl.admin.core.util.ValidateConfig;
-
-import com.ibeetl.admin.core.annotation.Dict;
+import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.LogicDelete;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
 import org.beetl.sql.fetch.annotation.FetchSql;
 
-import java.math.BigDecimal;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /* 
@@ -43,6 +42,8 @@ public class TeacherOpenCourseNotice extends BaseEntity{
                     "and class_status = 1 " +
                     "order by class_id " +
                     "@}\n" )
+    @UpdateIgnore
+    @InsertIgnore
     private String schoolClassIdsText;
 	
     //课程开课ID（多个逗号隔开）
@@ -60,6 +61,8 @@ public class TeacherOpenCourseNotice extends BaseEntity{
                     "and teacher_open_course_status = 1 " +
                     "order by teacher_open_course_id " +
                     "@}\n" )
+    @UpdateIgnore
+    @InsertIgnore
     private String teacherOpenCourseIdsText;
 	
     //消息标题

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

@@ -10,6 +10,8 @@ import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
 import org.beetl.sql.fetch.annotation.FetchSql;
 
@@ -115,6 +117,8 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
     @FetchSql("select count(1) from resources_question_snapshot t " +
             "where t.question_status = 1 " +
             "and t.teacher_open_course_question_setting_id = #teacherOpenCourseQuestionSettingId# ")
+    @UpdateIgnore
+    @InsertIgnore
     private int questionCount;
 
     // 平均答对数量
@@ -122,6 +126,8 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
             "from teacher_open_course_question_log t \n" +
             "where t.teacher_open_course_question_log_status = 1  " +
             " AND t.teacher_open_course_question_setting_id = #teacherOpenCourseQuestionSettingId# ")
+    @UpdateIgnore
+    @InsertIgnore
     private Integer avgSuccessCount;
 
     // 平均答错数量
@@ -129,9 +135,13 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
             "from teacher_open_course_question_log t \n" +
             "where t.teacher_open_course_question_log_status = 1  " +
             " AND t.teacher_open_course_question_setting_id = #teacherOpenCourseQuestionSettingId# ")
+    @UpdateIgnore
+    @InsertIgnore
     private Integer avgErrorCount;
 
     // 平均正确率 100最大
+    @UpdateIgnore
+    @InsertIgnore
     private float avgSuccessRate;
 
     // 平均得分
@@ -139,6 +149,8 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
             "from teacher_open_course_question_log t \n" +
             "where t.teacher_open_course_question_log_status = 1  " +
             " AND t.teacher_open_course_question_setting_id = #teacherOpenCourseQuestionSettingId# ")
+    @UpdateIgnore
+    @InsertIgnore
     private float avgScore;
 
     // 关联的班级列表
@@ -154,6 +166,8 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
             "@if(strUtil.equalsIgnoreCase(teacherOpenCourseQuestionSettingId+'', 'ALL')) { \n" +
             "and 1 != 1 \n" +
             "@} \n")
+    @UpdateIgnore
+    @InsertIgnore
     private String teacherOpenCourseQuestionSettingSchoolClassNames;
 
     // 快照ID
@@ -161,6 +175,8 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
             "from resources_question_snapshot t where t.teacher_open_course_question_setting_id = #teacherOpenCourseQuestionSettingId# \n" +
             "and t.question_status = 1 \n"
             )
+    @UpdateIgnore
+    @InsertIgnore
     private List<ResourcesQuestionSnapshot> resourcesQuestionSnapshotList;
 
     public void setAvgSuccessCount(Integer avgSuccessCount) {

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

@@ -7,6 +7,8 @@ import com.ibeetl.admin.core.util.ValidateConfig;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
 import org.beetl.sql.fetch.annotation.FetchSql;
 
@@ -76,6 +78,8 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{
     @DictDeep
     @FetchSql("select * from teacher_open_course_schedule_session_snap where teacher_open_course_schedule_session_snap_status = 1" +
             " and teacher_open_course_id = #teacherOpenCourseId#")
+    @UpdateIgnore
+    @InsertIgnore
     private List<TeacherOpenCourseScheduleSessionSnap> sessionTagList;
 
 }

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

@@ -6,6 +6,8 @@ import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninLogQuery;
 import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
 import org.beetl.sql.fetch.annotation.FetchOne;
 
@@ -82,6 +84,8 @@ public class TeacherOpenCourseStudentSigninLog extends BaseEntity{
     // 扩展属性
     @FetchOne("studentId")
 
+    @UpdateIgnore
+    @InsertIgnore
     private Student student;
 	
     public TeacherOpenCourseStudentSigninLog(){

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

@@ -6,6 +6,8 @@ import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import com.ibeetl.jlw.enums.StartStatusEnum;
 import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
 import org.beetl.sql.fetch.annotation.FetchSql;
 
@@ -49,6 +51,8 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
                     "and class_status = 1 " +
                     "order by class_id " +
             "@}\n" )
+    @UpdateIgnore
+    @InsertIgnore
     private String schoolClassIdsText;
 
     // 如果是全部的班级，则查询该课程关联的全部班级
@@ -63,6 +67,8 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
                     "@} else { \n" +
                     " select #schoolClassIds# " +
                     "@}\n" )
+    @UpdateIgnore
+    @InsertIgnore
     private String schoolClassIdsRender;
 
     // 所有班级标识
@@ -103,6 +109,8 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
 
     @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 ")
+    @UpdateIgnore
+    @InsertIgnore
     private Integer signinSettingCount;
 
     // 签到总人数
@@ -115,21 +123,29 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
             "where t.teacher_open_course_id = #teacherOpenCourseId# " +
             "and t.teacher_open_course_student_signin_log_tag = 10 " +
             "and ta.teacher_open_course_student_signin_setting_session_time = #teacherOpenCourseStudentSigninSettingSessionTime# ")
+    @UpdateIgnore
+    @InsertIgnore
     private Integer signinTotalCount;
 
     // 学生总人数
 
     @FetchSql("select count(1) from student t where find_in_set(t.class_id, #schoolClassIdsRender#) ")
+    @UpdateIgnore
+    @InsertIgnore
     private Integer signinStudentTotalCount;
 
     // 缺勤 schoolClassIds
 
     @FetchSql("select if((#signinStudentTotalCount# - #signinTotalCount#) < 0, 0, (#signinStudentTotalCount# - #signinTotalCount#))")
+    @UpdateIgnore
+    @InsertIgnore
     private Integer unsigninCount;
 
     // 合计到课率 100为单位
 
     @FetchSql("select round(#signinTotalCount# / (if((#signinStudentTotalCount#) <= 0, 1, (#signinStudentTotalCount#))) * 100, 1)")
+    @UpdateIgnore
+    @InsertIgnore
     private float signinTotalRate;
 
     //组织ID

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

@@ -73,6 +73,8 @@ public class UniversitiesColleges extends BaseEntity{
     private Long universitiesCdollegesDefaultAdminUserId;
 
 //    @FetchSql("select * from core_user where id = #universitiesCdollegesDefaultAdminUserId# ")
+//@UpdateIgnore
+//@InsertIgnore
 //    private CoreUser defaultAdminUser;
 
     //组织机构ID

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

@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.jlw.util.ToolUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -8,8 +9,10 @@ import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
+import com.ibeetl.jlw.dao.ResourcesQuestionDao;
 import com.ibeetl.jlw.dao.TeacherOpenCourseMergeResourcesQuestionDao;
 import com.ibeetl.jlw.entity.FileEntity;
+import com.ibeetl.jlw.entity.ResourcesQuestion;
 import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeResourcesQuestionQuery;
 import org.apache.commons.lang3.StringUtils;
@@ -29,6 +32,7 @@ import java.io.*;
 import java.math.BigDecimal;
 import java.util.*;
 
+import static cn.hutool.core.util.ArrayUtil.join;
 import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
 
 /**
@@ -42,6 +46,7 @@ import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
 public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseService<TeacherOpenCourseMergeResourcesQuestion>{
 
     @Autowired private TeacherOpenCourseMergeResourcesQuestionDao teacherOpenCourseMergeResourcesQuestionDao;
+    @Autowired private ResourcesQuestionDao resourcesQuestionDao;
 
     public PageQuery<TeacherOpenCourseMergeResourcesQuestion>queryByCondition(PageQuery query){
         PageQuery ret =  teacherOpenCourseMergeResourcesQuestionDao.queryByCondition(query);
@@ -356,4 +361,19 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
     }
 
 
+    /**
+     * 从resources_question 表，拷贝数据。类似从模板中，拉取数据
+     * @param resourcesQuestionIds
+     * @return
+     */
+    public void copyFromQuestion(Set<String> resourcesQuestionIds) {
+        // 题目ID集合
+        String ids = join(resourcesQuestionIds, ",");
+        List<ResourcesQuestion> resourcesQuestions = resourcesQuestionDao.getByIds(ids);
+
+//        resourcesQuestions
+
+        // 默认有
+        List<TeacherOpenCourseMergeResourcesQuestion> copyToList = BeanUtil.copyToList(resourcesQuestions, TeacherOpenCourseMergeResourcesQuestion.class);
+    }
 }

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

@@ -39,6 +39,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * 开课题目拉取 开课-题库管理-离线 接口
@@ -418,4 +419,15 @@ public class TeacherOpenCourseMergeResourcesQuestionController{
             }
         }
 
+    /**
+     * 教师端-导入题目操作，拆分
+     * @param resourcesQuestionIds
+     * @return
+     */
+    @PostMapping(API + "/copyFromQuestion.do")
+    public JsonResult copyFromQuestion(Set<String> resourcesQuestionIds) {
+        teacherOpenCourseMergeResourcesQuestionService.copyFromQuestion(resourcesQuestionIds);
+        return JsonResult.success();
+    }
+
 }