开课导入课程，同步资源操作

doc/sql/mysql/tianze-pro-update.sql

@@ -327,3 +327,26 @@ ALTER TABLE teacher_open_course_chat_log ADD COLUMN chat_log_send_type varchar(5
 
 ALTER TABLE teacher_open_course_schedule_session_snap ADD COLUMN teacher_open_course_schedule_session_snap_current_week_number int(10) COMMENT '所在时间列表的第几周';
 
+drop table if exists teacher_open_course_merge_resources_info;
+
+/*==============================================================*/
+/* Table: teacher_open_course_merge_resources_info              */
+/*==============================================================*/
+create table teacher_open_course_merge_resources_info
+(
+    teacher_open_course_merge_resources_info_id bigint unsigned not null auto_increment comment 'ID',
+    course_info_id       bigint comment '开课课程ID',
+    teacher_open_course_id bigint comment '教师开课ID',
+    resources_info_name  varchar(255) comment '资源名称',
+    resources_info_type  int(2) comment '资源类型 数据字典（resources_info_type）',
+    resources_info_content varchar(255) comment '资源内容',
+    org_id               bigint comment '组织机构ID',
+    user_id              bigint comment '后台用户ID',
+    primary key (teacher_open_course_merge_resources_info_id)
+)
+    auto_increment = 1
+    ENGINE = InnoDB
+    DEFAULT CHARACTER SET = utf8
+    COLLATE = utf8_general_ci;
+
+alter table teacher_open_course_merge_resources_info comment '开课关联- 资源管理';

web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeResourcesInfoDao.java

@@ -0,0 +1,28 @@
+package com.ibeetl.jlw.dao;
+
+import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo;
+import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeResourcesInfoQuery;
+import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.SqlResource;
+import org.beetl.sql.mapper.annotation.Update;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 开课资源拉取 Dao
+ */
+@SqlResource("jlw.teacherOpenCourseMergeResourcesInfo")
+public interface TeacherOpenCourseMergeResourcesInfoDao extends BaseMapper<TeacherOpenCourseMergeResourcesInfo>{
+    PageQuery<TeacherOpenCourseMergeResourcesInfo> queryByCondition(PageQuery query);
+    PageQuery<TeacherOpenCourseMergeResourcesInfo> queryByConditionQuery(PageQuery query);
+    @Update
+    void deleteTeacherOpenCourseMergeResourcesInfoByIds(String ids);
+    @Update
+    int updateGivenByIds(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery);
+    List<TeacherOpenCourseMergeResourcesInfo> getByIds(String ids);
+    List<TeacherOpenCourseMergeResourcesInfo> getValuesByQuery(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery);
+    List<TeacherOpenCourseMergeResourcesInfo> getValuesByQueryNotWithPermission(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery);
+    List<Map<String,Object>>getExcelValues(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery);
+}

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

@@ -0,0 +1,162 @@
+package com.ibeetl.jlw.entity;
+
+import com.ibeetl.admin.core.annotation.Dict;
+import com.ibeetl.admin.core.entity.BaseEntity;
+import com.ibeetl.admin.core.util.ValidateConfig;
+import org.beetl.sql.annotation.entity.AssignID;
+
+import javax.validation.constraints.NotNull;
+
+/* 
+* 开课关联- 资源管理
+* gen by Spring Boot2 Admin 2022-11-04
+*/
+public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{
+
+    //ID
+    @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
+    // @SeqID(name = ORACLE_CORE_SEQ_NAME)
+    @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo")
+
+    private Long teacherOpenCourseMergeResourcesInfoId ;
+	
+    //开课课程ID
+    @Dict(type="teacher_open_course_merge_course_info.course_info_name.course_info_status=1")
+
+    private Long courseInfoId ;
+	
+    //教师开课ID
+    @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
+
+    private Long teacherOpenCourseId ;
+	
+    //资源名称
+
+    private String resourcesInfoName ;
+	
+    //资源类型 数据字典（resources_info_type）
+    @Dict(type="resources_info_type")
+
+    private Integer resourcesInfoType ;
+	
+    //资源内容
+
+    private String resourcesInfoContent ;
+	
+    //组织机构ID
+
+    private Long orgId ;
+	
+    //后台用户ID
+
+    private Long userId ;
+	
+    public TeacherOpenCourseMergeResourcesInfo(){
+    }
+
+    /**ID
+    *@return 
+    */
+    public Long getTeacherOpenCourseMergeResourcesInfoId(){
+        return  teacherOpenCourseMergeResourcesInfoId;
+    }
+    /**ID
+    *@param  teacherOpenCourseMergeResourcesInfoId
+    */
+    public void setTeacherOpenCourseMergeResourcesInfoId(Long teacherOpenCourseMergeResourcesInfoId){
+        this.teacherOpenCourseMergeResourcesInfoId = teacherOpenCourseMergeResourcesInfoId;
+    }
+
+    /**开课课程ID
+    *@return 
+    */
+    public Long getCourseInfoId(){
+        return  courseInfoId;
+    }
+    /**开课课程ID
+    *@param  courseInfoId
+    */
+    public void setCourseInfoId(Long courseInfoId){
+        this.courseInfoId = courseInfoId;
+    }
+
+    /**教师开课ID
+    *@return 
+    */
+    public Long getTeacherOpenCourseId(){
+        return  teacherOpenCourseId;
+    }
+    /**教师开课ID
+    *@param  teacherOpenCourseId
+    */
+    public void setTeacherOpenCourseId(Long teacherOpenCourseId){
+        this.teacherOpenCourseId = teacherOpenCourseId;
+    }
+
+    /**资源名称
+    *@return 
+    */
+    public String getResourcesInfoName(){
+        return  resourcesInfoName;
+    }
+    /**资源名称
+    *@param  resourcesInfoName
+    */
+    public void setResourcesInfoName(String resourcesInfoName){
+        this.resourcesInfoName = resourcesInfoName;
+    }
+
+    /**资源类型 数据字典（resources_info_type）
+    *@return 
+    */
+    public Integer getResourcesInfoType(){
+        return  resourcesInfoType;
+    }
+    /**资源类型 数据字典（resources_info_type）
+    *@param  resourcesInfoType
+    */
+    public void setResourcesInfoType(Integer resourcesInfoType){
+        this.resourcesInfoType = resourcesInfoType;
+    }
+
+    /**资源内容
+    *@return 
+    */
+    public String getResourcesInfoContent(){
+        return  resourcesInfoContent;
+    }
+    /**资源内容
+    *@param  resourcesInfoContent
+    */
+    public void setResourcesInfoContent(String resourcesInfoContent){
+        this.resourcesInfoContent = resourcesInfoContent;
+    }
+
+    /**组织机构ID
+    *@return 
+    */
+    public Long getOrgId(){
+        return  orgId;
+    }
+    /**组织机构ID
+    *@param  orgId
+    */
+    public void setOrgId(Long orgId){
+        this.orgId = orgId;
+    }
+
+    /**后台用户ID
+    *@return 
+    */
+    public Long getUserId(){
+        return  userId;
+    }
+    /**后台用户ID
+    *@param  userId
+    */
+    public void setUserId(Long userId){
+        this.userId = userId;
+    }
+
+
+}

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

@@ -29,7 +29,7 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{
     //课程章节ID
     @Dict(type="teacher_open_course_merge_course_info.course_info_name.course_info_status=1")
 
-    private Long teacherOpenCourseMergeCourseInfoId ;
+    private Long courseInfoId ;
 	
     //题型(1单选 2多选 3判断 4填空 5分析)
 
@@ -113,19 +113,6 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{
         this.teacherOpenCourseId = teacherOpenCourseId;
     }
 
-    /**课程ID
-    *@return 
-    */
-    public Long getTeacherOpenCourseMergeCourseInfoId(){
-        return  teacherOpenCourseMergeCourseInfoId;
-    }
-    /**课程ID
-    *@param  teacherOpenCourseMergeCourseInfoId
-    */
-    public void setTeacherOpenCourseMergeCourseInfoId(Long teacherOpenCourseMergeCourseInfoId){
-        this.teacherOpenCourseMergeCourseInfoId = teacherOpenCourseMergeCourseInfoId;
-    }
-
     /**题型(1单选 2多选 3判断)
     *@return 
     */
@@ -296,4 +283,11 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{
     }
 
 
+    public Long getCourseInfoId() {
+        return courseInfoId;
+    }
+
+    public void setCourseInfoId(Long courseInfoId) {
+        this.courseInfoId = courseInfoId;
+    }
 }

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

@@ -0,0 +1,302 @@
+package com.ibeetl.jlw.service;
+
+import cn.jlw.util.ToolUtils;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.ibeetl.admin.core.entity.CoreUser;
+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.TeacherOpenCourseMergeResourcesInfoDao;
+import com.ibeetl.jlw.entity.FileEntity;
+import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo;
+import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeResourcesInfoQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.beetl.sql.core.SqlId;
+import org.beetl.sql.core.engine.PageQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.io.*;
+import java.util.*;
+
+import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
+
+/**
+ * 开课资源拉取 Service
+ * 当分布式ID开启后请勿使用insert(*,true)
+ */
+
+@Service
+@Transactional
+@Validated
+public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<TeacherOpenCourseMergeResourcesInfo>{
+
+    @Autowired private TeacherOpenCourseMergeResourcesInfoDao teacherOpenCourseMergeResourcesInfoDao;
+
+    public PageQuery<TeacherOpenCourseMergeResourcesInfo>queryByCondition(PageQuery query){
+        PageQuery ret =  teacherOpenCourseMergeResourcesInfoDao.queryByCondition(query);
+        queryListAfter(ret.getList());
+        return ret;
+    }
+
+    public PageQuery<TeacherOpenCourseMergeResourcesInfo>queryByConditionQuery(PageQuery query){
+        PageQuery ret =  teacherOpenCourseMergeResourcesInfoDao.queryByConditionQuery(query);
+        queryListAfter(ret.getList());
+        return ret;
+    }
+
+    public void deleteByList(List list){
+        String ids = "";
+        ToolUtils.deleteNullList(list);
+        for(int i=0;null != list && i<list.size();i++){
+            ids += list.get(i).toString()+(i==list.size()-1?"":",");
+        }
+        if(StringUtils.isNotBlank(ids)){
+            teacherOpenCourseMergeResourcesInfoDao.deleteTeacherOpenCourseMergeResourcesInfoByIds(ids);
+        }
+    }
+
+    public void deleteTeacherOpenCourseMergeResourcesInfo(String ids){
+        try {
+            teacherOpenCourseMergeResourcesInfoDao.deleteTeacherOpenCourseMergeResourcesInfoByIds(ids);
+        } catch (Exception e) {
+            throw new PlatformException("批量删除开课资源拉取失败", e);
+        }
+    }
+
+    public String addAll(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){
+        String msg = "";
+        List<TeacherOpenCourseMergeResourcesInfo> teacherOpenCourseMergeResourcesInfoList = new ArrayList<>();
+        try {
+            teacherOpenCourseMergeResourcesInfoList = JSON.parseArray(teacherOpenCourseMergeResourcesInfoQuery.getTeacherOpenCourseMergeResourcesInfoJsonStr(), TeacherOpenCourseMergeResourcesInfo.class);
+        } catch (Exception e) {
+            try {
+                teacherOpenCourseMergeResourcesInfoList.add(JSONObject.parseObject(teacherOpenCourseMergeResourcesInfoQuery.getTeacherOpenCourseMergeResourcesInfoJsonStr(), TeacherOpenCourseMergeResourcesInfo.class));
+            } catch (Exception e1) {}
+        }
+        ToolUtils.deleteNullList(teacherOpenCourseMergeResourcesInfoList);
+        if(null != teacherOpenCourseMergeResourcesInfoList && teacherOpenCourseMergeResourcesInfoList.size()>0){
+            for(int i=0;i<teacherOpenCourseMergeResourcesInfoList.size();i++){
+                TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoList.get(i);
+                teacherOpenCourseMergeResourcesInfo.setUserId(teacherOpenCourseMergeResourcesInfoQuery.getUserId());
+                teacherOpenCourseMergeResourcesInfo.setOrgId(teacherOpenCourseMergeResourcesInfoQuery.getOrgId());
+            }
+            insertBatch(teacherOpenCourseMergeResourcesInfoList);
+        }
+        return msg;
+    }
+
+    public JsonResult add(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){
+        String msg = "";
+        TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoQuery.pojo();
+        teacherOpenCourseMergeResourcesInfoDao.insert(teacherOpenCourseMergeResourcesInfo);
+        teacherOpenCourseMergeResourcesInfoQuery.setTeacherOpenCourseMergeResourcesInfoId(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeResourcesInfoId());
+        JsonResult jsonResult = new JsonResult();
+        jsonResult.setData(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeResourcesInfoId());//自增的ID丢进去
+        jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
+        jsonResult.setMsg(msg);
+        return jsonResult;
+    }
+
+    public String edit(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){
+        String msg = "";
+        TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoQuery.pojo();
+        teacherOpenCourseMergeResourcesInfoDao.updateTemplateById(teacherOpenCourseMergeResourcesInfo);
+        return msg;
+    }
+
+    public String updateGivenByIds(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){
+        String msg = "";
+        if(StringUtils.isNotBlank(teacherOpenCourseMergeResourcesInfoQuery.get_given())){
+            boolean flag = teacherOpenCourseMergeResourcesInfoDao.updateGivenByIds(teacherOpenCourseMergeResourcesInfoQuery) > 0;
+            if(!flag){
+                msg = "更新指定参数失败";
+            }
+        }else{
+            msg = "指定参数为空";
+        }
+        return msg;
+    }
+
+    public List<TeacherOpenCourseMergeResourcesInfo> getValues (Object paras){
+        return sqlManager.select(SqlId.of("jlw.teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeResourcesInfoValues"), TeacherOpenCourseMergeResourcesInfo.class, paras);
+    }
+
+    public List<TeacherOpenCourseMergeResourcesInfo> getValuesByQuery (TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){
+        return teacherOpenCourseMergeResourcesInfoDao.getValuesByQuery(teacherOpenCourseMergeResourcesInfoQuery);
+    }
+
+    public List<TeacherOpenCourseMergeResourcesInfo> getValuesByQueryNotWithPermission (TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){
+        return teacherOpenCourseMergeResourcesInfoDao.getValuesByQueryNotWithPermission(teacherOpenCourseMergeResourcesInfoQuery);
+    }
+
+    public TeacherOpenCourseMergeResourcesInfo getInfo (Long teacherOpenCourseMergeResourcesInfoId){
+        TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery = new TeacherOpenCourseMergeResourcesInfoQuery();
+        teacherOpenCourseMergeResourcesInfoQuery.setTeacherOpenCourseMergeResourcesInfoId(teacherOpenCourseMergeResourcesInfoId);
+        List<TeacherOpenCourseMergeResourcesInfo> list = teacherOpenCourseMergeResourcesInfoDao.getValuesByQuery(teacherOpenCourseMergeResourcesInfoQuery);
+        if(null != list && list.size()>0){
+            return list.get(0);
+        }else{
+            return null;
+        }
+    }
+
+    public TeacherOpenCourseMergeResourcesInfo getInfo (TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){
+        List<TeacherOpenCourseMergeResourcesInfo> list = teacherOpenCourseMergeResourcesInfoDao.getValuesByQuery(teacherOpenCourseMergeResourcesInfoQuery);
+        if(null != list && list.size()>0){
+            return list.get(0);
+        }else{
+            return null;
+        }
+    }
+
+
+    public JsonResult importTemplate(List<FileEntity> fileEntityList,List<Long>list,CoreUser coreUser){
+        List<String[]>errMsg = new ArrayList<>();
+        String msg ="";
+        int count = 0;
+        Date date = new Date();
+        for(int item=0;null != fileEntityList && item<fileEntityList.size();item++){
+            FileEntity fileEntity = fileEntityList.get(item);
+            if(null != fileEntity){
+                File file = new File(fileEntity.getAbsoluteUrl());
+                if(file.exists() && file.isFile() && file.canRead() && ToolUtils.findInSet("xls,xlsx",fileEntity.getFormat())){
+                    Workbook wb = null;
+                    InputStream is = null;
+                    try {
+                        is = new FileInputStream(fileEntity.getAbsoluteUrl());
+                        if("xls".equals(fileEntity.getFormat())){
+                            wb = new HSSFWorkbook(is);
+                        }else if("xlsx".equals(fileEntity.getFormat())){
+                            wb = new XSSFWorkbook(is);
+                        }
+                    } catch (FileNotFoundException e) {
+                        e.printStackTrace();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                    try {
+                        if(null != is){
+                        is.close();
+                    }
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+                    if(wb != null){
+                        //获取Sheet1
+                        Sheet sheet = wb.getSheet("Sheet1");
+                        //获取最大行数
+                        int rowNum = sheet.getPhysicalNumberOfRows();
+                        //获取第一行
+                        Row firstRow = sheet.getRow(0);
+                        //获取最大列数
+                        int colNum = firstRow.getPhysicalNumberOfCells();
+
+                        String columns[] = {
+                                        "开课课程",
+                                        "教师开课",
+                                        "资源名称",
+                                        "资源类型 数据字典",
+                                        "资源内容",
+                        };
+
+                        Map<String,Integer> map = new HashMap<>();//获取需要的表头的列
+
+                        //从第一列找到需要的表头
+                        for (int i=0; i<colNum; i++){
+                            String cellData = getCellFormatValue(firstRow.getCell(i));
+                            for(int j=0;j<columns.length;j++){
+                                if(columns[j].equals(cellData)){
+                                    map.put(columns[j],i);
+                                }
+                            }
+                        }
+
+                        //验证所需要的表头是否全
+                        Integer flag = 0;
+                        for(int i=0;i<columns.length;i++){
+                            if(null != map.get(columns[i])){
+                                flag ++;
+                            }
+                        }
+                        if(flag != columns.length){
+                            String str = " ";
+                            for(int i=0;i<columns.length;i++){
+                                str += "\""+columns[i]+"\""+(i == columns.length-1?"":", ");
+                            }
+                            return JsonResult.failMessage("导入失败，表格表头应包含"+str);
+                        }
+
+                        for (int i = 1; i<rowNum; i++) {
+                            Row row = sheet.getRow(i);
+                            if(null == row){
+                                errMsg.add(new String[]{"第"+(i+1)+"数据为空"});
+                                continue;
+                            }
+
+                            String courseInfoId = getCellFormatValue(row.getCell(map.get(columns[0])));
+                            String teacherOpenCourseId = getCellFormatValue(row.getCell(map.get(columns[1])));
+                            String resourcesInfoName = getCellFormatValue(row.getCell(map.get(columns[2])));
+                            String resourcesInfoType = getCellFormatValue(row.getCell(map.get(columns[3])));
+                            String resourcesInfoContent = getCellFormatValue(row.getCell(map.get(columns[4])));
+                            //TODO 判断（如重复等复杂判断要额外写）
+                            if(StringUtils.isBlank(courseInfoId)){
+                                errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[0])+1)+"列，第"+(i+1)+"行开课课程为空"});
+                                continue;
+                            }else
+                            if(StringUtils.isBlank(teacherOpenCourseId)){
+                                errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[1])+1)+"列，第"+(i+1)+"行教师开课为空"});
+                                continue;
+                            }else
+                            if(StringUtils.isBlank(resourcesInfoName)){
+                                errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[2])+1)+"列，第"+(i+1)+"行资源名称为空"});
+                                continue;
+                            }else
+                            if(StringUtils.isBlank(resourcesInfoType)){
+                                errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[3])+1)+"列，第"+(i+1)+"行资源类型 数据字典为空"});
+                                continue;
+                            }else
+                            if(StringUtils.isBlank(resourcesInfoContent)){
+                                errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[4])+1)+"列，第"+(i+1)+"行资源内容为空"});
+                                continue;
+                            }else
+                            {
+                            //TODO 保存
+                            TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = new TeacherOpenCourseMergeResourcesInfo();
+                            teacherOpenCourseMergeResourcesInfo.setCourseInfoId(Long.parseLong(courseInfoId));
+                            teacherOpenCourseMergeResourcesInfo.setTeacherOpenCourseId(Long.parseLong(teacherOpenCourseId));
+                            teacherOpenCourseMergeResourcesInfo.setResourcesInfoName(resourcesInfoName);
+                            teacherOpenCourseMergeResourcesInfo.setResourcesInfoType(Integer.parseInt(resourcesInfoType));
+                            teacherOpenCourseMergeResourcesInfo.setResourcesInfoContent(resourcesInfoContent);
+                            teacherOpenCourseMergeResourcesInfo.setOrgId(coreUser.getOrgId());
+                            teacherOpenCourseMergeResourcesInfo.setUserId(coreUser.getId());
+
+                            count++;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        JsonResult jsonResult = new JsonResult();
+        jsonResult.setCode(count>0?JsonReturnCode.SUCCESS.getCode():JsonReturnCode.FAIL.getCode());
+        jsonResult.setData(errMsg);
+        jsonResult.setMsg((count>0?"导入成功,共导入"+count+"条":"导入失败")+(StringUtils.isNotBlank(msg)?"<br>"+msg:""));
+        return jsonResult;
+    }
+
+    public List<Map<String,Object>> getExcelValues (TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){
+        return teacherOpenCourseMergeResourcesInfoDao.getExcelValues(teacherOpenCourseMergeResourcesInfoQuery);
+    }
+
+
+}

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

@@ -260,7 +260,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
                             }
 
                             String teacherOpenCourseId = getCellFormatValue(row.getCell(map.get(columns[0])));
-                            String teacherOpenCourseMergeCourseInfoId = getCellFormatValue(row.getCell(map.get(columns[1])));
+                            String courseInfoId = getCellFormatValue(row.getCell(map.get(columns[1])));
                             String questionType = getCellFormatValue(row.getCell(map.get(columns[2])));
                             String questionScore = getCellFormatValue(row.getCell(map.get(columns[3])));
                             String questionStem = getCellFormatValue(row.getCell(map.get(columns[4])));
@@ -277,7 +277,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
                                 errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[0])+1)+"列，第"+(i+1)+"行开课为空"});
                                 continue;
                             }else
-                            if(StringUtils.isBlank(teacherOpenCourseMergeCourseInfoId)){
+                            if(StringUtils.isBlank(courseInfoId)){
                                 errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[1])+1)+"列，第"+(i+1)+"行课程为空"});
                                 continue;
                             }else
@@ -329,7 +329,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
                             //TODO 保存
                             TeacherOpenCourseMergeResourcesQuestion teacherOpenCourseMergeResourcesQuestion = new TeacherOpenCourseMergeResourcesQuestion();
                             teacherOpenCourseMergeResourcesQuestion.setTeacherOpenCourseId(Long.parseLong(teacherOpenCourseId));
-                            teacherOpenCourseMergeResourcesQuestion.setTeacherOpenCourseMergeCourseInfoId(Long.parseLong(teacherOpenCourseMergeCourseInfoId));
+                            teacherOpenCourseMergeResourcesQuestion.setCourseInfoId(Long.parseLong(courseInfoId));
                             teacherOpenCourseMergeResourcesQuestion.setQuestionType(Integer.parseInt(questionType));
                             teacherOpenCourseMergeResourcesQuestion.setQuestionScore(new BigDecimal(questionScore));
                             teacherOpenCourseMergeResourcesQuestion.setQuestionStem(questionStem);

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

@@ -0,0 +1,405 @@
+package com.ibeetl.jlw.web;
+
+import cn.jlw.Interceptor.GetFile;
+import cn.jlw.Interceptor.RFile;
+import cn.jlw.Interceptor.SCoreUser;
+import cn.jlw.util.ToolUtils;
+import cn.jlw.validate.ValidateConfig;
+import com.ibeetl.admin.core.annotation.Function;
+import com.ibeetl.admin.core.entity.CoreUser;
+import com.ibeetl.admin.core.file.FileService;
+import com.ibeetl.admin.core.util.TimeTool;
+import com.ibeetl.admin.core.web.JsonResult;
+import com.ibeetl.jlw.entity.FileEntity;
+import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo;
+import com.ibeetl.jlw.service.TeacherOpenCourseMergeResourcesInfoService;
+import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeResourcesInfoQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.beetl.sql.core.engine.PageQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 开课资源拉取 开课关联- 资源管理 接口
+ * 切记不要对非线程安全的静态变量进行写操作
+ */
+
+@RestController
+@Validated
+public class TeacherOpenCourseMergeResourcesInfoController{
+
+    private final Log log = LogFactory.getLog(this.getClass());
+    private static final String MODEL = "/jlw/teacherOpenCourseMergeResourcesInfo";
+    private static final String API = "/api/teacherOpenCourseMergeResourcesInfo";
+
+
+    @Autowired private TeacherOpenCourseMergeResourcesInfoService teacherOpenCourseMergeResourcesInfoService;
+
+    @Autowired FileService fileService;
+
+    /* 前端接口 */
+
+    @PostMapping(API + "/getPageList.do")
+    public JsonResult<PageQuery> getPageList(TeacherOpenCourseMergeResourcesInfoQuery condition,@SCoreUser CoreUser coreUser){
+        if(null == coreUser){
+            return JsonResult.failMessage("请登录后再操作");
+        }else{
+            PageQuery page = condition.getPageQuery();
+            teacherOpenCourseMergeResourcesInfoService.queryByConditionQuery(page);
+            return JsonResult.success(page);
+        }
+    }
+
+
+    @GetMapping(API + "/getInfo.do")
+    public JsonResult<TeacherOpenCourseMergeResourcesInfo>getInfo(TeacherOpenCourseMergeResourcesInfoQuery param,@SCoreUser CoreUser coreUser) {
+        if(null == coreUser){
+            return JsonResult.failMessage("请登录后再操作");
+        }else{
+            TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoService.getInfo(param);
+            return  JsonResult.success(teacherOpenCourseMergeResourcesInfo);
+        }
+    }
+
+
+    @GetMapping(API + "/getList.do")
+    public JsonResult<List<TeacherOpenCourseMergeResourcesInfo>>getList(TeacherOpenCourseMergeResourcesInfoQuery param,@SCoreUser CoreUser coreUser) {
+        if(null == coreUser){
+            return JsonResult.failMessage("请登录后再操作");
+        }else{
+            List<TeacherOpenCourseMergeResourcesInfo>list = teacherOpenCourseMergeResourcesInfoService.getValuesByQuery(param);
+            return  JsonResult.success(list);
+        }
+    }
+
+
+    /* 后台页面 */
+
+    @GetMapping(MODEL + "/index.do")
+    @Function("teacherOpenCourseMergeResourcesInfo.query")
+    public ModelAndView index() {
+        ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeResourcesInfo/index.html") ;
+        view.addObject("search", TeacherOpenCourseMergeResourcesInfoQuery.class.getName());
+        return view;
+    }
+
+    @GetMapping(MODEL + "/edit.do")
+    @Function("teacherOpenCourseMergeResourcesInfo.edit")
+    public ModelAndView edit(Long teacherOpenCourseMergeResourcesInfoId) {
+        ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeResourcesInfo/edit.html");
+        TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoService.queryById(teacherOpenCourseMergeResourcesInfoId);
+        view.addObject("teacherOpenCourseMergeResourcesInfo", teacherOpenCourseMergeResourcesInfo);
+        return view;
+    }
+
+    @GetMapping(MODEL + "/add.do")
+    @Function("teacherOpenCourseMergeResourcesInfo.add")
+    public ModelAndView add(Long teacherOpenCourseMergeResourcesInfoId) {
+        ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeResourcesInfo/add.html");
+        if(null != teacherOpenCourseMergeResourcesInfoId){
+            TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoService.queryById(teacherOpenCourseMergeResourcesInfoId);
+            view.addObject("teacherOpenCourseMergeResourcesInfo", teacherOpenCourseMergeResourcesInfo);
+        }else {
+            view.addObject("teacherOpenCourseMergeResourcesInfo", new TeacherOpenCourseMergeResourcesInfo());
+        }
+        return view;
+    }
+
+    /* 后台接口 */
+
+    @PostMapping(MODEL + "/list.json")
+    @Function("teacherOpenCourseMergeResourcesInfo.query")
+    public JsonResult<PageQuery> list(TeacherOpenCourseMergeResourcesInfoQuery condition){
+        PageQuery page = condition.getPageQuery();
+        teacherOpenCourseMergeResourcesInfoService.queryByCondition(page);
+        return JsonResult.success(page);
+    }
+
+    @PostMapping(MODEL + "/addAll.json")
+    @Function("teacherOpenCourseMergeResourcesInfo.add")
+    public JsonResult addAll(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery,@SCoreUser CoreUser coreUser){
+        if(null == coreUser){
+            return JsonResult.failMessage("请登录后再操作");
+        }else{
+                teacherOpenCourseMergeResourcesInfoQuery.setUserId(coreUser.getId());
+                teacherOpenCourseMergeResourcesInfoQuery.setOrgId(coreUser.getOrgId());
+            String msg = teacherOpenCourseMergeResourcesInfoService.addAll(teacherOpenCourseMergeResourcesInfoQuery);
+            if (StringUtils.isBlank(msg)) {
+                return JsonResult.success();
+            } else {
+                return JsonResult.failMessage("新增失败,"+msg);
+            }
+        }
+    }
+
+    @PostMapping(MODEL + "/add.json")
+    @Function("teacherOpenCourseMergeResourcesInfo.add")
+    public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, BindingResult result,@SCoreUser CoreUser coreUser){
+        if(result.hasErrors()){
+            return JsonResult.failMessage(result);
+        }else{
+                teacherOpenCourseMergeResourcesInfoQuery.setUserId(coreUser.getId());
+                teacherOpenCourseMergeResourcesInfoQuery.setOrgId(coreUser.getOrgId());
+            return teacherOpenCourseMergeResourcesInfoService.add(teacherOpenCourseMergeResourcesInfoQuery);
+        }
+    }
+
+    @PostMapping(MODEL + "/edit.json")
+    @Function("teacherOpenCourseMergeResourcesInfo.edit")
+    public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, BindingResult result) {
+        if(result.hasErrors()){
+            return JsonResult.failMessage(result);
+        }else {
+                teacherOpenCourseMergeResourcesInfoQuery.setUserId(null);
+                teacherOpenCourseMergeResourcesInfoQuery.setOrgId(null);
+            String msg = teacherOpenCourseMergeResourcesInfoService.edit(teacherOpenCourseMergeResourcesInfoQuery);
+            if (StringUtils.isBlank(msg)) {
+                return JsonResult.success();
+            } else {
+                return JsonResult.failMessage("更新失败,"+msg);
+            }
+        }
+    }
+
+
+    @GetMapping(MODEL + "/view.json")
+    @Function("teacherOpenCourseMergeResourcesInfo.query")
+    public JsonResult<TeacherOpenCourseMergeResourcesInfo>queryInfo(Long teacherOpenCourseMergeResourcesInfoId) {
+        TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoService.queryById( teacherOpenCourseMergeResourcesInfoId);
+        return  JsonResult.success(teacherOpenCourseMergeResourcesInfo);
+    }
+
+    @GetMapping(MODEL + "/getValues.json")
+    @Function("teacherOpenCourseMergeResourcesInfo.query")
+    public JsonResult<List<TeacherOpenCourseMergeResourcesInfo>>getValues(TeacherOpenCourseMergeResourcesInfoQuery param) {
+        List<TeacherOpenCourseMergeResourcesInfo>list = teacherOpenCourseMergeResourcesInfoService.getValuesByQuery(param);
+        return  JsonResult.success(list);
+    }
+
+
+    @PostMapping(MODEL + "/delete.json")
+    @Function("teacherOpenCourseMergeResourcesInfo.delete")
+    @ResponseBody
+    public JsonResult delete(String ids) {
+        teacherOpenCourseMergeResourcesInfoService.deleteTeacherOpenCourseMergeResourcesInfo(ids);
+        return JsonResult.success();
+    }
+
+
+        //下载模板信息
+    @GetMapping(MODEL + "/downloadTemplate.json")
+        public void download(HttpServletRequest request,HttpServletResponse response,@SCoreUser CoreUser coreUser) {
+            if(null == coreUser){
+                return;
+            }
+            XSSFWorkbook workbook = null;
+            InputStream is = null;
+            try {
+                //TODO 改导入模板名字
+                is = new FileInputStream(GetFile.p + File.separator +"filesystem"+ File.separator +"template"+ File.separator+ "导入模板.xlsx");
+
+                workbook = new XSSFWorkbook(is);
+
+                try {
+                    if(null != is){
+                        is.close();
+                    }
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+
+                //准备将Excel的输出流通过response输出到页面下载
+                //八进制输出流
+                response.setContentType("application/octet-stream");
+
+                //这后面可以设置导出Excel的名称，此例中名为template.xls
+                String fileName = ToolUtils.web2fileName(request,"teacherOpenCourseMergeResourcesInfoTemplate(" + TimeTool.getNowTime("YMD") + ").xlsx");
+
+                response.setHeader("Content-disposition", "attachment;filename="+fileName);
+
+                //刷新缓冲
+                response.flushBuffer();
+
+                //workbook将Excel写入到response的输出流中，供页面下载
+                workbook.write(response.getOutputStream());
+            }catch (Exception e){
+                e.printStackTrace();
+            } finally {
+                try {
+                    if (null != workbook) {
+                        workbook.close();
+                    }
+                    if (null != response && null != response.getOutputStream()) {
+                        response.getOutputStream().close();
+                    }
+                } catch (Exception e) { }
+            }
+        }
+
+        //导入模板信息
+    @PostMapping(MODEL + "/importTemplate.json")
+    @Function("teacherOpenCourseMergeResourcesInfo.importTemplate")
+        public JsonResult importTemplate(@RFile List<FileEntity> fileEntityList,@SCoreUser CoreUser coreUser) {
+            if(null == coreUser){
+                return JsonResult.failMessage("请登录后再操作");
+            }
+            List<Long>list=new ArrayList<>();
+            JsonResult jsonResult = teacherOpenCourseMergeResourcesInfoService.importTemplate(fileEntityList,list,coreUser);
+            if(list.size()>0){
+                teacherOpenCourseMergeResourcesInfoService.deleteByList(list);
+            }
+            return jsonResult;
+        }
+
+        //导出信息
+    @GetMapping(MODEL + "/excel/export.json")
+    @Function("teacherOpenCourseMergeResourcesInfo.exportDocument")
+        public void export(HttpServletRequest request,HttpServletResponse response,TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery,@SCoreUser CoreUser coreUser) {
+            if(null == coreUser){
+                return;
+            }
+            HSSFWorkbook workbook = null;
+            try {
+                //表头数据
+                String[] header = {
+                            "开课课程",
+                            "教师开课",
+                            "资源名称",
+                            "资源类型 数据字典",
+                            "资源内容",
+            };
+                String[] headerCode = {
+                            "courseInfoId",
+                            "teacherOpenCourseId",
+                            "resourcesInfoName",
+                            "resourcesInfoType",
+                            "resourcesInfoContent",
+            };
+
+                //数据内容
+                List<Map<String, Object>> mapList = teacherOpenCourseMergeResourcesInfoService.getExcelValues(teacherOpenCourseMergeResourcesInfoQuery);
+
+                //内容宽度
+                Map<String, Object> widthMap = mapList.get(0);
+                mapList.remove(0);
+
+                //声明一个工作簿
+                workbook = new HSSFWorkbook();
+
+                //生成一个表格，设置表格名称为"Sheet1"
+                HSSFSheet sheet = workbook.createSheet("Sheet1");
+
+                //冻结表头
+                sheet.createFreezePane(0, 1, 0, 1);
+
+                //设置默认列宽度为5个字节
+                sheet.setDefaultColumnWidth(5);
+
+                //创建第一行表头
+                HSSFRow headRow = sheet.createRow(0);
+
+                //头部样式
+                HSSFCellStyle headerStyle = workbook.createCellStyle();
+                //垂直居中
+                headerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+                //水平居中
+                headerStyle.setAlignment(HorizontalAlignment.CENTER);
+
+                //单元格样式
+                HSSFCellStyle cellStyle = workbook.createCellStyle();
+                //垂直居中
+                cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+                //水平居左
+                cellStyle.setAlignment(HorizontalAlignment.CENTER);
+                //自动换行
+                cellStyle.setWrapText(true);
+
+                //遍历添加表头
+                for (int i = 0; i < header.length; i++) {
+
+                    //设置表格特定的列宽度
+                    if (null != widthMap.get(headerCode[i])) {
+                        String width = widthMap.get(headerCode[i]).toString().split("\\.")[0];
+                        Integer w = Integer.parseInt(width) > header[i].length()*3?Integer.parseInt(width):header[i].length()*3;
+                        sheet.setColumnWidth(i, w * 190);
+                    }
+
+                    //创建一个单元格
+                    HSSFCell cell = headRow.createCell(i);
+
+                    //创建一个内容对象
+                    HSSFRichTextString text = new HSSFRichTextString(header[i]);
+
+                    //将内容对象的文字内容写入到单元格中
+                    cell.setCellValue(text);
+
+                    //设置样式
+                    cell.setCellStyle(headerStyle);
+                }
+
+                //遍历结果集，把内容加入表格
+                for (int i = 0; i < mapList.size(); i++) {
+                    HSSFRow row = sheet.createRow(i + 1);
+
+                    row.setHeight((short) (50*10));
+
+                    Map<String, Object> map = mapList.get(i);
+                    for (int j = 0; j < headerCode.length; j++) {
+                        HSSFCell cell = row.createCell(j);
+                        cell.setCellStyle(cellStyle);
+                        HSSFRichTextString text = new HSSFRichTextString(null != map.get(headerCode[j]) ? map.get(headerCode[j]).toString() : " ");
+                        cell.setCellValue(text);
+                    }
+                }
+
+
+                //准备将Excel的输出流通过response输出到页面下载
+                //八进制输出流
+                response.setContentType("application/octet-stream");
+
+                //这后面可以设置导出Excel的名称，此例中名为student.xls
+                String fileName = ToolUtils.web2fileName(request,"teacherOpenCourseMergeResourcesInfo(" + TimeTool.getNowTime("YMD") + ").xls");
+
+                response.setHeader("Content-disposition", "attachment;filename="+fileName);
+
+                //刷新缓冲
+                response.flushBuffer();
+
+                //workbook将Excel写入到response的输出流中，供页面下载
+                workbook.write(response.getOutputStream());
+            }catch (Exception e){
+                e.printStackTrace();
+            } finally {
+                try {
+                    if (null != workbook) {
+                        workbook.close();
+                    }
+                    if (null != response && null != response.getOutputStream()) {
+                        response.getOutputStream().close();
+                    }
+                } catch (Exception e) { }
+            }
+        }
+
+}

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

@@ -300,7 +300,7 @@ public class TeacherOpenCourseMergeResourcesQuestionController{
             };
                 String[] headerCode = {
                             "teacherOpenCourseId",
-                            "teacherOpenCourseMergeCourseInfoId",
+                            "courseInfoId",
                             "questionType",
                             "questionScore",
                             "questionStem",

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

@@ -0,0 +1,146 @@
+package com.ibeetl.jlw.web.query;
+
+import cn.jlw.validate.ValidateConfig;
+import com.ibeetl.admin.core.annotation.Query;
+import com.ibeetl.admin.core.web.query.PageParam;
+import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ *开课资源拉取查询
+ */
+public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam {
+    @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
+    @Query(name = "ID", display = false)
+    private Long teacherOpenCourseMergeResourcesInfoId;
+    @Query(name = "开课课程ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course_merge_course_info.course_info_name.course_info_status=1")
+    private Long courseInfoId;
+    @Query(name = "教师开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
+    private Long teacherOpenCourseId;
+    @Query(name = "资源名称", display = false)
+    private String resourcesInfoName;
+    @Query(name = "资源类型 数据字典（resources_info_type）", display = true,type=Query.TYPE_DICT,dict="resources_info_type")
+    private Integer resourcesInfoType;
+    @Query(name = "资源内容", display = false)
+    private String resourcesInfoContent;
+    @Query(name = "组织机构ID", display = false)
+    private Long orgId;
+    @Query(name = "后台用户ID", display = false)
+    private Long userId;
+
+    private String teacherOpenCourseMergeResourcesInfoIdPlural;
+    private String courseInfoIdPlural;
+    private String teacherOpenCourseIdPlural;
+    private String orgIdPlural;
+    private String userIdPlural;
+
+    private String teacherOpenCourseMergeResourcesInfoJsonStr;//json格式
+
+    private String _given;//指定更新的特定字段，多个逗号隔开
+
+    public Long getTeacherOpenCourseMergeResourcesInfoId(){
+        return  teacherOpenCourseMergeResourcesInfoId;
+    }
+    public void setTeacherOpenCourseMergeResourcesInfoId(Long teacherOpenCourseMergeResourcesInfoId ){
+        this.teacherOpenCourseMergeResourcesInfoId = teacherOpenCourseMergeResourcesInfoId;
+    }
+    public Long getCourseInfoId(){
+        return  courseInfoId;
+    }
+    public void setCourseInfoId(Long courseInfoId ){
+        this.courseInfoId = courseInfoId;
+    }
+    public Long getTeacherOpenCourseId(){
+        return  teacherOpenCourseId;
+    }
+    public void setTeacherOpenCourseId(Long teacherOpenCourseId ){
+        this.teacherOpenCourseId = teacherOpenCourseId;
+    }
+    public String getResourcesInfoName(){
+        return  resourcesInfoName;
+    }
+    public void setResourcesInfoName(String resourcesInfoName ){
+        this.resourcesInfoName = resourcesInfoName;
+    }
+    public Integer getResourcesInfoType(){
+        return  resourcesInfoType;
+    }
+    public void setResourcesInfoType(Integer resourcesInfoType ){
+        this.resourcesInfoType = resourcesInfoType;
+    }
+    public String getResourcesInfoContent(){
+        return  resourcesInfoContent;
+    }
+    public void setResourcesInfoContent(String resourcesInfoContent ){
+        this.resourcesInfoContent = resourcesInfoContent;
+    }
+    public Long getOrgId(){
+        return  orgId;
+    }
+    public void setOrgId(Long orgId ){
+        this.orgId = orgId;
+    }
+    public Long getUserId(){
+        return  userId;
+    }
+    public void setUserId(Long userId ){
+        this.userId = userId;
+    }
+
+    public TeacherOpenCourseMergeResourcesInfo pojo(){
+        TeacherOpenCourseMergeResourcesInfo pojo = new TeacherOpenCourseMergeResourcesInfo();
+        pojo.setTeacherOpenCourseMergeResourcesInfoId(this.getTeacherOpenCourseMergeResourcesInfoId());
+        pojo.setCourseInfoId(this.getCourseInfoId());
+        pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId());
+        pojo.setResourcesInfoName(this.getResourcesInfoName());
+        pojo.setResourcesInfoType(this.getResourcesInfoType());
+        pojo.setResourcesInfoContent(this.getResourcesInfoContent());
+        pojo.setOrgId(this.getOrgId());
+        pojo.setUserId(this.getUserId());
+        return pojo;
+    }
+
+    public String getTeacherOpenCourseMergeResourcesInfoIdPlural(){
+        return  teacherOpenCourseMergeResourcesInfoIdPlural;
+    }
+    public void setTeacherOpenCourseMergeResourcesInfoIdPlural(String teacherOpenCourseMergeResourcesInfoIdPlural){
+        this.teacherOpenCourseMergeResourcesInfoIdPlural = teacherOpenCourseMergeResourcesInfoIdPlural;
+    }
+    public String getCourseInfoIdPlural(){
+        return  courseInfoIdPlural;
+    }
+    public void setCourseInfoIdPlural(String courseInfoIdPlural){
+        this.courseInfoIdPlural = courseInfoIdPlural;
+    }
+    public String getTeacherOpenCourseIdPlural(){
+        return  teacherOpenCourseIdPlural;
+    }
+    public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural){
+        this.teacherOpenCourseIdPlural = teacherOpenCourseIdPlural;
+    }
+    public String getOrgIdPlural(){
+        return  orgIdPlural;
+    }
+    public void setOrgIdPlural(String orgIdPlural){
+        this.orgIdPlural = orgIdPlural;
+    }
+    public String getUserIdPlural(){
+        return  userIdPlural;
+    }
+    public void setUserIdPlural(String userIdPlural){
+        this.userIdPlural = userIdPlural;
+    }
+    public String getTeacherOpenCourseMergeResourcesInfoJsonStr(){
+        return  teacherOpenCourseMergeResourcesInfoJsonStr;
+    }
+    public void setTeacherOpenCourseMergeResourcesInfoJsonStr(String teacherOpenCourseMergeResourcesInfoJsonStr ){
+        this.teacherOpenCourseMergeResourcesInfoJsonStr = teacherOpenCourseMergeResourcesInfoJsonStr;
+    }
+    public String get_given() {
+        return _given;
+    }
+    public void set_given(String _given) {
+        this._given = _given;
+    }
+}

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

@@ -18,7 +18,7 @@ public class TeacherOpenCourseMergeResourcesQuestionQuery extends PageParam {
     @Query(name = "开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
     private Long teacherOpenCourseId;
     @Query(name = "课程ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course_merge_course_info.course_info_name.course_info_status=1")
-    private Long teacherOpenCourseMergeCourseInfoId;
+    private Long courseInfoId;
     @Query(name = "题型(1单选 2多选 3判断)", display = false)
     private Integer questionType;
     @Query(name = "分值", display = false)
@@ -48,7 +48,7 @@ public class TeacherOpenCourseMergeResourcesQuestionQuery extends PageParam {
 
     private String teacherOpenCourseMergeResourcesQuestionIdPlural;
     private String teacherOpenCourseIdPlural;
-    private String teacherOpenCourseMergeCourseInfoIdPlural;
+    private String courseInfoIdPlural;
     private String questionTypePlural;
     private String questionStatusPlural;
     private String userIdPlural;
@@ -70,12 +70,6 @@ public class TeacherOpenCourseMergeResourcesQuestionQuery extends PageParam {
     public void setTeacherOpenCourseId(Long teacherOpenCourseId ){
         this.teacherOpenCourseId = teacherOpenCourseId;
     }
-    public Long getTeacherOpenCourseMergeCourseInfoId(){
-        return  teacherOpenCourseMergeCourseInfoId;
-    }
-    public void setTeacherOpenCourseMergeCourseInfoId(Long teacherOpenCourseMergeCourseInfoId ){
-        this.teacherOpenCourseMergeCourseInfoId = teacherOpenCourseMergeCourseInfoId;
-    }
     public Integer getQuestionType(){
         return  questionType;
     }
@@ -159,7 +153,7 @@ public class TeacherOpenCourseMergeResourcesQuestionQuery extends PageParam {
         TeacherOpenCourseMergeResourcesQuestion pojo = new TeacherOpenCourseMergeResourcesQuestion();
         pojo.setTeacherOpenCourseMergeResourcesQuestionId(this.getTeacherOpenCourseMergeResourcesQuestionId());
         pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId());
-        pojo.setTeacherOpenCourseMergeCourseInfoId(this.getTeacherOpenCourseMergeCourseInfoId());
+        pojo.setCourseInfoId(this.getCourseInfoId());
         pojo.setQuestionType(this.getQuestionType());
         pojo.setQuestionScore(this.getQuestionScore());
         pojo.setQuestionStem(this.getQuestionStem());
@@ -188,12 +182,6 @@ public class TeacherOpenCourseMergeResourcesQuestionQuery extends PageParam {
     public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural){
         this.teacherOpenCourseIdPlural = teacherOpenCourseIdPlural;
     }
-    public String getTeacherOpenCourseMergeCourseInfoIdPlural(){
-        return  teacherOpenCourseMergeCourseInfoIdPlural;
-    }
-    public void setTeacherOpenCourseMergeCourseInfoIdPlural(String teacherOpenCourseMergeCourseInfoIdPlural){
-        this.teacherOpenCourseMergeCourseInfoIdPlural = teacherOpenCourseMergeCourseInfoIdPlural;
-    }
     public String getQuestionTypePlural(){
         return  questionTypePlural;
     }
@@ -230,4 +218,20 @@ public class TeacherOpenCourseMergeResourcesQuestionQuery extends PageParam {
     public void set_given(String _given) {
         this._given = _given;
     }
+
+    public Long getCourseInfoId() {
+        return courseInfoId;
+    }
+
+    public void setCourseInfoId(Long courseInfoId) {
+        this.courseInfoId = courseInfoId;
+    }
+
+    public String getCourseInfoIdPlural() {
+        return courseInfoIdPlural;
+    }
+
+    public void setCourseInfoIdPlural(String courseInfoIdPlural) {
+        this.courseInfoIdPlural = courseInfoIdPlural;
+    }
 }

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

@@ -0,0 +1,423 @@
+queryByCondition
+===
+* 根据不为空的参数进行分页查询
+
+  select
+  @pageTag(){
+  t.*
+  @}
+  from teacher_open_course_merge_resources_info t
+  where 1=1  
+  @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行  
+  and #function("teacherOpenCourseMergeResourcesInfo.query")#
+  @if(!isEmpty(teacherOpenCourseMergeResourcesInfoId)){
+  and t.teacher_open_course_merge_resources_info_id =#teacherOpenCourseMergeResourcesInfoId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeResourcesInfoIdPlural)){
+  and find_in_set(t.teacher_open_course_merge_resources_info_id,#teacherOpenCourseMergeResourcesInfoIdPlural#)
+  @}
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
+  @}
+  @if(!isEmpty(courseInfoIdPlural)){
+  and find_in_set(t.course_info_id,#courseInfoIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(resourcesInfoName)){
+  and t.resources_info_name =#resourcesInfoName#
+  @}
+  @if(!isEmpty(resourcesInfoType)){
+  and t.resources_info_type =#resourcesInfoType#
+  @}
+  @if(!isEmpty(resourcesInfoContent)){
+  and t.resources_info_content =#resourcesInfoContent#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+
+
+queryByConditionQuery
+===
+* 根据不为空的参数进行分页查询(无权限)
+
+  select
+  @pageTag(){
+  t.*
+  @}
+  from teacher_open_course_merge_resources_info t
+  where 1=1  
+  @if(!isEmpty(teacherOpenCourseMergeResourcesInfoId)){
+  and t.teacher_open_course_merge_resources_info_id =#teacherOpenCourseMergeResourcesInfoId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeResourcesInfoIdPlural)){
+  and find_in_set(t.teacher_open_course_merge_resources_info_id,#teacherOpenCourseMergeResourcesInfoIdPlural#)
+  @}
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
+  @}
+  @if(!isEmpty(courseInfoIdPlural)){
+  and find_in_set(t.course_info_id,#courseInfoIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(resourcesInfoName)){
+  and t.resources_info_name =#resourcesInfoName#
+  @}
+  @if(!isEmpty(resourcesInfoType)){
+  and t.resources_info_type =#resourcesInfoType#
+  @}
+  @if(!isEmpty(resourcesInfoContent)){
+  and t.resources_info_content =#resourcesInfoContent#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+
+
+
+
+deleteTeacherOpenCourseMergeResourcesInfoByIds
+===
+
+* 批量删除
+
+  delete from teacher_open_course_merge_resources_info where find_in_set(teacher_open_course_merge_resources_info_id,#ids#)
+
+
+
+getByIds
+===
+
+select * from teacher_open_course_merge_resources_info where find_in_set(teacher_open_course_merge_resources_info_id,#ids#)
+
+
+updateGivenByIds
+===
+
+* 批量更新指定字段，无论此字段是否有值
+
+  update teacher_open_course_merge_resources_info
+  set
+  @if(contain("courseInfoId",_given)){
+  @if(isEmpty(courseInfoId)){
+  course_info_id = null ,
+  @}else{
+  course_info_id = #courseInfoId# ,
+  @}
+  @}
+  @if(contain("teacherOpenCourseId",_given)){
+  @if(isEmpty(teacherOpenCourseId)){
+  teacher_open_course_id = null ,
+  @}else{
+  teacher_open_course_id = #teacherOpenCourseId# ,
+  @}
+  @}
+  @if(contain("resourcesInfoName",_given)){
+  @if(isEmpty(resourcesInfoName)){
+  resources_info_name = null ,
+  @}else{
+  resources_info_name = #resourcesInfoName# ,
+  @}
+  @}
+  @if(contain("resourcesInfoType",_given)){
+  @if(isEmpty(resourcesInfoType)){
+  resources_info_type = null ,
+  @}else{
+  resources_info_type = #resourcesInfoType# ,
+  @}
+  @}
+  @if(contain("resourcesInfoContent",_given)){
+  @if(isEmpty(resourcesInfoContent)){
+  resources_info_content = null ,
+  @}else{
+  resources_info_content = #resourcesInfoContent# ,
+  @}
+  @}
+  @if(contain("orgId",_given)){
+  @if(isEmpty(orgId)){
+  org_id = null ,
+  @}else{
+  org_id = #orgId# ,
+  @}
+  @}
+  @if(contain("userId",_given)){
+  @if(isEmpty(userId)){
+  user_id = null ,
+  @}else{
+  user_id = #userId# ,
+  @}
+  @}
+  teacher_open_course_merge_resources_info_id = teacher_open_course_merge_resources_info_id
+  where find_in_set(teacher_open_course_merge_resources_info_id,#teacherOpenCourseMergeResourcesInfoIdPlural#)
+
+
+
+getTeacherOpenCourseMergeResourcesInfoValues
+===
+
+* 根据不为空的参数进行查询
+
+  select t.*
+  from teacher_open_course_merge_resources_info t
+  where 1=1  
+  @if(!isEmpty(teacherOpenCourseMergeResourcesInfoId)){
+  and t.teacher_open_course_merge_resources_info_id =#teacherOpenCourseMergeResourcesInfoId#
+  @}
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(resourcesInfoName)){
+  and t.resources_info_name =#resourcesInfoName#
+  @}
+  @if(!isEmpty(resourcesInfoType)){
+  and t.resources_info_type =#resourcesInfoType#
+  @}
+  @if(!isEmpty(resourcesInfoContent)){
+  and t.resources_info_content =#resourcesInfoContent#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+
+
+getValuesByQuery
+===
+
+* 根据不为空的参数进行查询
+
+  select t.*
+  from teacher_open_course_merge_resources_info t
+  where 1=1 and #function("teacherOpenCourseMergeResourcesInfo.query")#
+  @if(!isEmpty(teacherOpenCourseMergeResourcesInfoId)){
+  and t.teacher_open_course_merge_resources_info_id =#teacherOpenCourseMergeResourcesInfoId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeResourcesInfoIdPlural)){
+  and find_in_set(t.teacher_open_course_merge_resources_info_id,#teacherOpenCourseMergeResourcesInfoIdPlural#)
+  @}
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
+  @}
+  @if(!isEmpty(courseInfoIdPlural)){
+  and find_in_set(t.course_info_id,#courseInfoIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(resourcesInfoName)){
+  and t.resources_info_name =#resourcesInfoName#
+  @}
+  @if(!isEmpty(resourcesInfoType)){
+  and t.resources_info_type =#resourcesInfoType#
+  @}
+  @if(!isEmpty(resourcesInfoContent)){
+  and t.resources_info_content =#resourcesInfoContent#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+
+
+getValuesByQueryNotWithPermission
+===
+
+* 根据不为空的参数进行查询（不包含权限）
+
+  select t.*
+  from teacher_open_course_merge_resources_info t
+  where 1=1
+  @if(!isEmpty(teacherOpenCourseMergeResourcesInfoId)){
+  and t.teacher_open_course_merge_resources_info_id =#teacherOpenCourseMergeResourcesInfoId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeResourcesInfoIdPlural)){
+  and find_in_set(t.teacher_open_course_merge_resources_info_id,#teacherOpenCourseMergeResourcesInfoIdPlural#)
+  @}
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
+  @}
+  @if(!isEmpty(courseInfoIdPlural)){
+  and find_in_set(t.course_info_id,#courseInfoIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(resourcesInfoName)){
+  and t.resources_info_name =#resourcesInfoName#
+  @}
+  @if(!isEmpty(resourcesInfoType)){
+  and t.resources_info_type =#resourcesInfoType#
+  @}
+  @if(!isEmpty(resourcesInfoContent)){
+  and t.resources_info_content =#resourcesInfoContent#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+
+
+
+
+getExcelValues
+===
+
+* 根据不为空的参数进行查询导入需要的参数
+
+  SELECT * FROM (
+  (
+  select
+  MAX(LENGTH(t.course_info_id)) course_info_id,
+  MAX(LENGTH(t.teacher_open_course_id)) teacher_open_course_id,
+  MAX(LENGTH(t.resources_info_name)) resources_info_name,
+  MAX(LENGTH(t.resources_info_type)) resources_info_type,
+  MAX(LENGTH(t.resources_info_content)) resources_info_content,
+  from teacher_open_course_merge_resources_info t
+  where 1=1 and #function("teacherOpenCourseMergeResourcesInfo.query")#
+  @if(!isEmpty(teacherOpenCourseMergeResourcesInfoId)){
+  and t.teacher_open_course_merge_resources_info_id =#teacherOpenCourseMergeResourcesInfoId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeResourcesInfoIdPlural)){
+  and find_in_set(t.teacher_open_course_merge_resources_info_id,#teacherOpenCourseMergeResourcesInfoIdPlural#)
+  @}
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
+  @}
+  @if(!isEmpty(courseInfoIdPlural)){
+  and find_in_set(t.course_info_id,#courseInfoIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(resourcesInfoName)){
+  and t.resources_info_name =#resourcesInfoName#
+  @}
+  @if(!isEmpty(resourcesInfoType)){
+  and t.resources_info_type =#resourcesInfoType#
+  @}
+  @if(!isEmpty(resourcesInfoContent)){
+  and t.resources_info_content =#resourcesInfoContent#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+  )
+  UNION ALL
+  (
+  select
+  t.course_info_id ,
+  t.teacher_open_course_id ,
+  t.resources_info_name ,
+  t.resources_info_type ,
+  t.resources_info_content ,
+  from teacher_open_course_merge_resources_info t
+  where 1=1 and #function("teacherOpenCourseMergeResourcesInfo.query")#  
+  @if(!isEmpty(teacherOpenCourseMergeResourcesInfoId)){
+  and t.teacher_open_course_merge_resources_info_id =#teacherOpenCourseMergeResourcesInfoId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeResourcesInfoIdPlural)){
+  and find_in_set(t.teacher_open_course_merge_resources_info_id,#teacherOpenCourseMergeResourcesInfoIdPlural#)
+  @}
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
+  @}
+  @if(!isEmpty(courseInfoIdPlural)){
+  and find_in_set(t.course_info_id,#courseInfoIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(resourcesInfoName)){
+  and t.resources_info_name =#resourcesInfoName#
+  @}
+  @if(!isEmpty(resourcesInfoType)){
+  and t.resources_info_type =#resourcesInfoType#
+  @}
+  @if(!isEmpty(resourcesInfoContent)){
+  and t.resources_info_content =#resourcesInfoContent#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+  )
+  )t
+

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

@@ -22,11 +22,11 @@ queryByCondition
   @if(!isEmpty(teacherOpenCourseIdPlural)){
   and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
   @}
-  @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
   @}
-  @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  @if(!isEmpty(courseInfoIdPlural)){
+  and find_in_set(t.course_info_id,#courseInfoIdPlural#)
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#
@@ -103,11 +103,11 @@ queryByConditionQuery
   @if(!isEmpty(teacherOpenCourseIdPlural)){
   and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
   @}
-  @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
   @}
-  @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  @if(!isEmpty(courseInfoIdPlural)){
+  and find_in_set(t.course_info_id,#courseInfoIdPlural#)
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#
@@ -193,11 +193,11 @@ updateGivenByIds
   teacher_open_course_id = #teacherOpenCourseId# ,
   @}
   @}
-  @if(contain("teacherOpenCourseMergeCourseInfoId",_given)){
-  @if(isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  teacher_open_course_merge_course_info_id = null ,
+  @if(contain("courseInfoId",_given)){
+  @if(isEmpty(courseInfoId)){
+  course_info_id = null ,
   @}else{
-  teacher_open_course_merge_course_info_id = #teacherOpenCourseMergeCourseInfoId# ,
+  course_info_id = #courseInfoId# ,
   @}
   @}
   @if(contain("questionType",_given)){
@@ -310,8 +310,8 @@ getTeacherOpenCourseMergeResourcesQuestionValues
   @if(!isEmpty(teacherOpenCourseId)){
   and t.teacher_open_course_id =#teacherOpenCourseId#
   @}
-  @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#
@@ -374,11 +374,11 @@ getValuesByQuery
   @if(!isEmpty(teacherOpenCourseIdPlural)){
   and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
   @}
-  @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
   @}
-  @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  @if(!isEmpty(courseInfoIdPlural)){
+  and find_in_set(t.course_info_id,#courseInfoIdPlural#)
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#
@@ -453,11 +453,11 @@ getValuesByQueryNotWithPermission
   @if(!isEmpty(teacherOpenCourseIdPlural)){
   and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
   @}
-  @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
   @}
-  @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  @if(!isEmpty(courseInfoIdPlural)){
+  and find_in_set(t.course_info_id,#courseInfoIdPlural#)
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#
@@ -523,7 +523,7 @@ getExcelValues
   (
   select
   MAX(LENGTH(t.teacher_open_course_id)) teacher_open_course_id,
-  MAX(LENGTH(t.teacher_open_course_merge_course_info_id)) teacher_open_course_merge_course_info_id,
+  MAX(LENGTH(t.course_info_id)) course_info_id,
   MAX(LENGTH(t.question_type)) question_type,
   MAX(LENGTH(t.question_score)) question_score,
   MAX(LENGTH(t.question_stem)) question_stem,
@@ -549,11 +549,11 @@ getExcelValues
   @if(!isEmpty(teacherOpenCourseIdPlural)){
   and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
   @}
-  @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
   @}
-  @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  @if(!isEmpty(courseInfoIdPlural)){
+  and find_in_set(t.course_info_id,#courseInfoIdPlural#)
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#
@@ -611,7 +611,7 @@ getExcelValues
   (
   select
   t.teacher_open_course_id ,
-  t.teacher_open_course_merge_course_info_id ,
+  t.course_info_id ,
   t.question_type ,
   t.question_score ,
   t.question_stem ,
@@ -637,11 +637,11 @@ getExcelValues
   @if(!isEmpty(teacherOpenCourseIdPlural)){
   and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
   @}
-  @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  @if(!isEmpty(courseInfoId)){
+  and t.course_info_id =#courseInfoId#
   @}
-  @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  @if(!isEmpty(courseInfoIdPlural)){
+  and find_in_set(t.course_info_id,#courseInfoIdPlural#)
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#

web/src/main/resources/static/js/jlw/teacherOpenCourseMergeResourcesInfo/add.js

@@ -0,0 +1,38 @@
+layui.define([ 'form', 'laydate', 'table','teacherOpenCourseMergeResourcesInfoApi'], function(exports) {
+    var form = layui.form;
+    var teacherOpenCourseMergeResourcesInfoApi = layui.teacherOpenCourseMergeResourcesInfoApi;
+    var index = layui.index;
+    var view = {
+        init:function(){
+            Lib.initGenrealForm($("#addForm"),form);
+            this.initSubmit();
+        },
+        initSubmit:function(){
+            $("#addButton").click(function(){
+                 form.on('submit(form)', function(){
+                     var teacherOpenCourseMergeResourcesInfoId = $("#addForm input[name='teacherOpenCourseMergeResourcesInfoId']").val();
+                     if(!$.isEmpty(teacherOpenCourseMergeResourcesInfoId)){
+                         teacherOpenCourseMergeResourcesInfoApi.updateTeacherOpenCourseMergeResourcesInfo($('#addForm'),function(){
+                             parent.window.dataReload();
+                             Common.info("更新成功");
+                             Lib.closeFrame();
+                         });
+                     }else{
+                         teacherOpenCourseMergeResourcesInfoApi.addTeacherOpenCourseMergeResourcesInfo($('#addForm'),function(){
+                             parent.window.dataReload();
+                             Common.info("添加成功");
+                             Lib.closeFrame();
+                         });
+                     }
+
+                });
+            });
+        
+            $("#addButton-cancel").click(function(){
+                Lib.closeFrame();
+            });
+        }
+    			
+    }
+    exports('add',view);
+});

web/src/main/resources/static/js/jlw/teacherOpenCourseMergeResourcesInfo/del.js

@@ -0,0 +1,23 @@
+layui.define(['table', 'teacherOpenCourseMergeResourcesInfoApi'], function(exports) {
+    var teacherOpenCourseMergeResourcesInfoApi = layui.teacherOpenCourseMergeResourcesInfoApi;
+    var table=layui.table;
+    var view = {
+        init:function(){
+        },
+        delBatch:function(){
+            var data = Common.getMoreDataFromTable(table,"teacherOpenCourseMergeResourcesInfoTable");
+            if(data==null){
+                return ;
+            }
+            Common.openConfirm("确认要删除这些开课资源拉取?",function(){
+            var ids =Common.concatBatchId(data,"teacherOpenCourseMergeResourcesInfoId");
+            teacherOpenCourseMergeResourcesInfoApi.del(ids,function(){
+                Common.info("删除成功");
+                    dataReload();
+                })
+            })
+        }
+    }
+    exports('del',view);
+	
+});

web/src/main/resources/static/js/jlw/teacherOpenCourseMergeResourcesInfo/edit.js

@@ -0,0 +1,28 @@
+layui.define([ 'form', 'laydate', 'table','teacherOpenCourseMergeResourcesInfoApi'], function(exports) {
+    var form = layui.form;
+    var teacherOpenCourseMergeResourcesInfoApi = layui.teacherOpenCourseMergeResourcesInfoApi;
+    var index = layui.index;
+    var view = {
+        init:function(){
+	        Lib.initGenrealForm($("#updateForm"),form);
+	        this.initSubmit();
+        },
+        initSubmit:function(){
+            $("#updateButton").click(function(){
+                form.on('submit(form)', function(){
+                    teacherOpenCourseMergeResourcesInfoApi.updateTeacherOpenCourseMergeResourcesInfo($('#updateForm'),function(){
+                       parent.window.dataReload();
+                       Common.info("更新成功");
+                       Lib.closeFrame();
+                    });
+                });
+            });
+            $("#updateButton-cancel").click(function(){
+                Lib.closeFrame();
+            });
+        }
+            
+    }
+    exports('edit',view);
+	
+});

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

@@ -0,0 +1,196 @@
+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var teacherOpenCourseMergeResourcesInfoTable = null;
+    var view ={
+        init:function(){
+            var that = this
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),teacherOpenCourseMergeResourcesInfoTable)
+                that.initToolBar();
+            }
+        },
+        initTable:function(){
+            var sx_ = localStorage.getItem("teacherOpenCourseMergeResourcesInfoTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存
+            if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);}
+            teacherOpenCourseMergeResourcesInfoTable = table.render({
+                elem : '#teacherOpenCourseMergeResourcesInfoTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/jlw/teacherOpenCourseMergeResourcesInfo/list.json' // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,toolbar: '#toolbar_teacherOpenCourseMergeResourcesInfo' //自定义头部左侧工具栏
+                ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
+                ,limit : 10,
+                cols : [ [ // 表头
+                    {
+                        type : 'checkbox',
+
+                    },
+                {
+                    field : 'teacherOpenCourseMergeResourcesInfoId', 
+                    title : 'ID',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherOpenCourseMergeResourcesInfoId'])?false:sx_['teacherOpenCourseMergeResourcesInfoId'],
+
+                        width : 60,
+                },
+                {
+                    field : 'courseInfoIdText', //数据字典类型为 teacher_open_course_merge_course_info.course_info_name.course_info_status=1
+                    title : '开课课程ID',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['courseInfoIdText'])?false:sx_['courseInfoIdText'],
+                },
+                {
+                    field : 'teacherOpenCourseIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1
+                    title : '教师开课ID',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherOpenCourseIdText'])?false:sx_['teacherOpenCourseIdText'],
+                },
+                {
+                    field : 'resourcesInfoName', 
+                    title : '资源名称',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['resourcesInfoName'])?false:sx_['resourcesInfoName'],
+                },
+                {
+                    field : 'resourcesInfoTypeText', //数据字典类型为 resources_info_type
+                    title : '资源类型 数据字典（resources_info_type）',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['resourcesInfoTypeText'])?false:sx_['resourcesInfoTypeText'],
+                },
+                {
+                    field : 'resourcesInfoContent', 
+                    title : '资源内容',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['resourcesInfoContent'])?false:sx_['resourcesInfoContent'],
+                },
+                {
+                    field : 'orgId', 
+                    title : '组织机构ID',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'],
+                },
+                {
+                    field : 'userId', 
+                    title : '后台用户ID',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
+                }
+                ,{
+                    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>';
+                        return htm;
+                    }
+                }
+
+        ] ]
+
+        });
+
+            table.on('checkbox(teacherOpenCourseMergeResourcesInfoTable)', function(obj){
+                var teacherOpenCourseMergeResourcesInfo = obj.data;
+                if(obj.checked){
+                    //按钮逻辑Lib.buttonEnable()
+                }else{
+
+                }
+            })
+        },
+
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),teacherOpenCourseMergeResourcesInfoTable,form);
+        },
+
+        initToolBar:function(){
+            toolbar = {
+                add: function () {
+                    var url = "/jlw/teacherOpenCourseMergeResourcesInfo/add.do";
+                    Common.openDlg(url,"开课资源拉取管理>新增");
+                },
+                edit: function () {
+                    var data = Common.getOneFromTable(table,"teacherOpenCourseMergeResourcesInfoTable");
+                    if(data==null){
+                        return ;
+                    }
+                    var url = "/jlw/teacherOpenCourseMergeResourcesInfo/add.do?teacherOpenCourseMergeResourcesInfoId="+data.teacherOpenCourseMergeResourcesInfoId;
+                    Common.openDlg(url,"开课资源拉取管理>"+data.teacherOpenCourseMergeResourcesInfoId+">编辑");
+                },
+                del: function () {
+                    layui.use(['del'], function(){
+                        var delView = layui.del
+                        delView.delBatch();
+                    });
+                },
+                search: function () {
+                    Lib.doSearchForm($("#searchForm"), teacherOpenCourseMergeResourcesInfoTable, 1);
+                    view.initToolBar()
+                },
+                refresh: function () {
+                    searchForm.reset();
+                    Lib.doSearchForm($("#searchForm"), teacherOpenCourseMergeResourcesInfoTable, 1);
+                    view.initToolBar()
+                },
+                exportDocument: function () {
+                    layui.use([ 'teacherOpenCourseMergeResourcesInfoApi' ], function() {
+                        var teacherOpenCourseMergeResourcesInfoApi = layui.teacherOpenCourseMergeResourcesInfoApi
+                        Common.openConfirm("确认要导出这些开课资源拉取数据?", function() {
+                            teacherOpenCourseMergeResourcesInfoApi.exportExcel($("#searchForm"), function(fileId) {
+                                Lib.download(fileId);
+                            })
+                        })
+                    });
+                },
+                importDocument: function () {
+                    var uploadUrl = Common.ctxPath+"/jlw/teacherOpenCourseMergeResourcesInfo/importTemplate.json";
+                    //模板,
+                    var templatePath= Common.ctxPath+"/jlw/teacherOpenCourseMergeResourcesInfo/downloadTemplate.json";
+                    //公共的简单上传文件处理
+                    var url = "/core/file/simpleUpload.do?uploadUrl="+uploadUrl+"&templatePath="+templatePath;
+                    Common.openDlg(url, "开课资源拉取管理>上传");
+                }
+            }
+            //触发事件
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+
+        }, initTableTool: table.on('tool(teacherOpenCourseMergeResourcesInfoTable)', function (obj) {
+            var data = obj.data;
+            if (obj.event === 'edit') {
+                var url = "/jlw/teacherOpenCourseMergeResourcesInfo/add.do?teacherOpenCourseMergeResourcesInfoId="+data.teacherOpenCourseMergeResourcesInfoId;
+                Common.openDlg(url,"开课资源拉取管理>"+data.teacherOpenCourseMergeResourcesInfoId+">编辑");
+            }else if(obj.event === "del"){
+                layer.confirm('是否确定删除该信息？', function (index) {
+                    var ret = Common.postAjax("/jlw/teacherOpenCourseMergeResourcesInfo/delete.json",{ids:data.teacherOpenCourseMergeResourcesInfoId});
+                    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/static/js/jlw/teacherOpenCourseMergeResourcesInfo/teacherOpenCourseMergeResourcesInfoApi.js

@@ -0,0 +1,26 @@
+/*访问后台的代码*/
+layui.define([], function(exports) {
+    var api={
+            updateTeacherOpenCourseMergeResourcesInfo:function(form,callback){
+                Lib.submitForm("/jlw/teacherOpenCourseMergeResourcesInfo/edit.json",form,{},callback)
+            },
+            addTeacherOpenCourseMergeResourcesInfo:function(form,callback){
+                Lib.submitForm("/jlw/teacherOpenCourseMergeResourcesInfo/add.json",form,{},callback)
+            },
+            del:function(ids,callback){
+                Common.post("/jlw/teacherOpenCourseMergeResourcesInfo/delete.json",{"ids":ids},function(){
+                    callback();
+                })
+            }
+            ,
+            exportExcel:function(form,callback){
+                var formPara = form.serializeJson();
+                Common.downLoad("/jlw/teacherOpenCourseMergeResourcesInfo/excel/export.json", formPara, 'POST')
+                // Common.post("/jlw/teacherOpenCourseMergeResourcesInfo/excel/export.json", formPara, function(fileId) {
+                //     callback(fileId);
+                // })
+            }
+		
+    };
+    exports('teacherOpenCourseMergeResourcesInfoApi',api);
+});

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

@@ -49,11 +49,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     hide:$.isEmpty(sx_['teacherOpenCourseIdText'])?false:sx_['teacherOpenCourseIdText'],
                 },
                 {
-                    field : 'teacherOpenCourseMergeCourseInfoIdText', //数据字典类型为 teacher_open_course_merge_course_info.course_info_name.course_info_status=1
+                    field : 'courseInfoIdText', //数据字典类型为 teacher_open_course_merge_course_info.course_info_name.course_info_status=1
                     title : '课程ID',
                     align:"center",
                     hideField :false,
-                    hide:$.isEmpty(sx_['teacherOpenCourseMergeCourseInfoIdText'])?false:sx_['teacherOpenCourseMergeCourseInfoIdText'],
+                    hide:$.isEmpty(sx_['courseInfoIdText'])?false:sx_['courseInfoIdText'],
                 },
                 {
                     field : 'questionType', 

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

@@ -142,7 +142,7 @@
         </div>
     </div>
 	<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
-	<input type="hidden" name="teacherOpenCourseMergeCourseInfoId" value="${teacherOpenCourseMergeCourseInfo.teacherOpenCourseMergeCourseInfoId}" />
+	<input type="hidden" name="courseInfoId" value="${teacherOpenCourseMergeCourseInfo.courseInfoId}" />
     <layui:submitButtons id="addButton" buttonType="" showExamine="2" />
 </form>
 <!--#} -->

web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/edit.html

@@ -142,7 +142,7 @@
         </div>
     </div>
 	<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
-	<input type="hidden" name="teacherOpenCourseMergeCourseInfoId" value="${teacherOpenCourseMergeCourseInfo.teacherOpenCourseMergeCourseInfoId}" />
+	<input type="hidden" name="courseInfoId" value="${teacherOpenCourseMergeCourseInfo.courseInfoId}" />
     <layui:submitButtons id="updateButton"  buttonType="" showExamine="2" />
 </form>
 <!--#} -->

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

@@ -0,0 +1,75 @@
+<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseMergeResourcesInfo/"}){ -->
+
+<form class="layui-form" id="addForm">
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            	<label class="layui-form-label">开课课程ID</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course_merge_course_info.course_info_name.course_info_status=1"
+											id="courseInfoId" name="courseInfoId" value="${teacherOpenCourseMergeResourcesInfo.courseInfoId}" layVerify="" />
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">教师开课ID</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1"
+											id="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseMergeResourcesInfo.teacherOpenCourseId}" layVerify="" />
+				</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            	<label class="layui-form-label">资源名称</label>
+				<div class="layui-input-inline">
+					<input type="text" id="resourcesInfoName" name="resourcesInfoName"  value="${teacherOpenCourseMergeResourcesInfo.resourcesInfoName}"   class="layui-input" >
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">资源类型 数据字典（resources_info_type）</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect style='layui-input-inline' type="resources_info_type"
+											id="resourcesInfoType" name="resourcesInfoType" value="${teacherOpenCourseMergeResourcesInfo.resourcesInfoType}" layVerify="" />
+				</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            	<label class="layui-form-label">资源内容</label>
+				<div class="layui-input-inline">
+					<input type="text" id="resourcesInfoContent" name="resourcesInfoContent"  value="${teacherOpenCourseMergeResourcesInfo.resourcesInfoContent}"   class="layui-input" >
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">组织机构ID</label>
+				<div class="layui-input-inline">
+					<input type="text" id="orgId" name="orgId"  value="${teacherOpenCourseMergeResourcesInfo.orgId}"   class="layui-input" >
+				</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            	<label class="layui-form-label">后台用户ID</label>
+				<div class="layui-input-inline">
+					<input type="text" id="userId" name="userId"  value="${teacherOpenCourseMergeResourcesInfo.userId}"   class="layui-input" >
+				</div>
+            </div>
+        </div>
+    </div>
+	<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
+	<input type="hidden" name="teacherOpenCourseMergeResourcesInfoId" value="${teacherOpenCourseMergeResourcesInfo.teacherOpenCourseMergeResourcesInfoId}" />
+    <layui:submitButtons id="addButton" buttonType="" showExamine="2" />
+</form>
+<!--#} -->
+<script>
+layui.use(['add'], function(){
+    var teacherOpenCourseMergeResourcesInfoAdd = layui.add
+    teacherOpenCourseMergeResourcesInfoAdd.init();
+});
+</script>

web/src/main/resources/templates/jlw/teacherOpenCourseMergeResourcesInfo/edit.html

@@ -0,0 +1,75 @@
+<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseMergeResourcesInfo/"}){ -->
+
+<form class="layui-form" id="updateForm">
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            	<label class="layui-form-label">开课课程ID</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course_merge_course_info.course_info_name.course_info_status=1"
+						id="courseInfoId" name="courseInfoId" value="${teacherOpenCourseMergeResourcesInfo.courseInfoId}" layVerify="" />
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">教师开课ID</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1"
+						id="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseMergeResourcesInfo.teacherOpenCourseId}" layVerify="" />
+				</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            	<label class="layui-form-label">资源名称</label>
+				<div class="layui-input-inline">
+					<input type="text" id="resourcesInfoName" name="resourcesInfoName"  value="${teacherOpenCourseMergeResourcesInfo.resourcesInfoName}"   class="layui-input" >
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">资源类型 数据字典（resources_info_type）</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect style='layui-input-inline' type="resources_info_type"
+						id="resourcesInfoType" name="resourcesInfoType" value="${teacherOpenCourseMergeResourcesInfo.resourcesInfoType}" layVerify="" />
+				</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            	<label class="layui-form-label">资源内容</label>
+				<div class="layui-input-inline">
+					<input type="text" id="resourcesInfoContent" name="resourcesInfoContent"  value="${teacherOpenCourseMergeResourcesInfo.resourcesInfoContent}"   class="layui-input" >
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">组织机构ID</label>
+				<div class="layui-input-inline">
+					<input type="text" id="orgId" name="orgId"  value="${teacherOpenCourseMergeResourcesInfo.orgId}"   class="layui-input" >
+				</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            	<label class="layui-form-label">后台用户ID</label>
+				<div class="layui-input-inline">
+					<input type="text" id="userId" name="userId"  value="${teacherOpenCourseMergeResourcesInfo.userId}"   class="layui-input" >
+				</div>
+            </div>
+        </div>
+    </div>
+	<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
+	<input type="hidden" name="teacherOpenCourseMergeResourcesInfoId" value="${teacherOpenCourseMergeResourcesInfo.teacherOpenCourseMergeResourcesInfoId}" />
+    <layui:submitButtons id="updateButton"  buttonType="" showExamine="2" />
+</form>
+<!--#} -->
+<script>
+layui.use(['edit'], function(){
+    var teacherOpenCourseMergeResourcesInfoEdit = layui.edit
+    teacherOpenCourseMergeResourcesInfoEdit.init();
+});
+</script>

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

@@ -0,0 +1,31 @@
+<!--#layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseMergeResourcesInfo/"}){ -->
+<layui:searchForm formId="searchForm" searchList="" condition="${search}">
+</layui:searchForm>
+<table id="teacherOpenCourseMergeResourcesInfoTable" lay-filter="teacherOpenCourseMergeResourcesInfoTable"></table>
+<!--#} -->
+
+<script type="text/html" id="toolbar_teacherOpenCourseMergeResourcesInfo">
+    <div class="layui-btn-container">
+        <div class="layui-btn-group" >
+            <!--# if(core.searchIsShow(search)) {-->
+            <layui:accessButton function="teacherOpenCourseMergeResourcesInfo.query"  id="searchFormSearch" action="search"><i class="layui-icon">&#xe615;</i>搜索</layui:accessButton>
+            <!--# }-->
+            <layui:accessButton function="teacherOpenCourseMergeResourcesInfo.add"  action="add">添加</layui:accessButton>
+            <layui:accessButton function="teacherOpenCourseMergeResourcesInfo.edit"  action="edit">修改</layui:accessButton>
+            <layui:accessButton function="teacherOpenCourseMergeResourcesInfo.del"  action="del">删除</layui:accessButton>
+            <!--#            if(!isEmpty(search)) {-->
+            <layui:accessButton function="teacherOpenCourseMergeResourcesInfo.query"  action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton>
+            <!--#            }-->
+            <layui:accessButton function="teacherOpenCourseMergeResourcesInfo.exportDocument"  action="exportDocument">导出</layui:accessButton>
+            <layui:accessButton function="teacherOpenCourseMergeResourcesInfo.importTemplate"  action="importDocument">导入</layui:accessButton>
+        </div>
+    </div>
+</script>
+<script>
+
+layui.use(['index'], function(){
+    var index = layui.index;
+    index.init();
+});
+
+</script>

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

@@ -14,7 +14,7 @@
             	<label class="layui-form-label">课程ID</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course_merge_course_info.course_info_name.course_info_status=1"
-											id="teacherOpenCourseMergeCourseInfoId" name="teacherOpenCourseMergeCourseInfoId" value="${teacherOpenCourseMergeResourcesQuestion.teacherOpenCourseMergeCourseInfoId}" layVerify="" />
+											id="courseInfoId" name="courseInfoId" value="${teacherOpenCourseMergeResourcesQuestion.courseInfoId}" layVerify="" />
 				</div>
             </div>
         </div>

web/src/main/resources/templates/jlw/teacherOpenCourseMergeResourcesQuestion/edit.html

@@ -14,7 +14,7 @@
             	<label class="layui-form-label">课程ID</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course_merge_course_info.course_info_name.course_info_status=1"
-						id="teacherOpenCourseMergeCourseInfoId" name="teacherOpenCourseMergeCourseInfoId" value="${teacherOpenCourseMergeResourcesQuestion.teacherOpenCourseMergeCourseInfoId}" layVerify="" />
+						id="courseInfoId" name="courseInfoId" value="${teacherOpenCourseMergeResourcesQuestion.courseInfoId}" layVerify="" />
 				</div>
             </div>
         </div>