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

beetlsql3-dev
Mlxa0324 2 years ago
commit c448cc20f6

@ -88,7 +88,7 @@ CREATE TABLE `hands_on_achievement` (
`user_id` bigint(20) DEFAULT NULL COMMENT '后台用户ID',
PRIMARY KEY (`hand_on_achievement_id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=244 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='课程实操-实操成绩';
drop table if exists teacher_open_course_score_weight;
create table teacher_open_course_score_weight
(
teacher_open_course_id bigint not null comment '课程id',
@ -134,3 +134,17 @@ alter table teacher_open_course_score_weight comment '教师-我的课程-成绩
ALTER TABLE teacher_open_course_score_dashboard ADD COLUMN teacher_open_course_id bigint(20) COMMENT '课程开课ID';
ALTER TABLE resources_application ADD COLUMN link_secret_key varchar(255) COMMENT '链接秘钥';
drop table if exists teacher_open_course_knowledge_point_relation;
CREATE TABLE `teacher_open_course_knowledge_point_relation` (
`teacher_open_course_knowledge_relation_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '关联ID',
`teacher_open_course_knowledge_point_id` bigint(20) NOT NULL COMMENT '课程开课-知识点ID',
`bussiness_id` bigint(20) NOT NULL COMMENT '业务ID',
`bussiness_type` bigint(20) NOT NULL COMMENT '业务类型1章节练习2课程实操, 业务id是主键自增存在重复',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`org_id` bigint(20) DEFAULT NULL COMMENT '组织ID',
`user_id` bigint(20) DEFAULT NULL COMMENT '用户ID',
`del_flag` int(11) NOT NULL DEFAULT '0' COMMENT '是否删除 1删除0未删除',
PRIMARY KEY (`teacher_open_course_knowledge_relation_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='教师-课程开课-知识点-关联表';

@ -0,0 +1,28 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import java.util.Map;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.web.query.TeacherOpenCourseKnowledgePointRelationQuery;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.annotation.Update;
/**
* Dao
*/
@SqlResource("jlw.teacherOpenCourseKnowledgePointRelation")
public interface TeacherOpenCourseKnowledgePointRelationDao extends BaseMapper<TeacherOpenCourseKnowledgePointRelation>{
PageQuery<TeacherOpenCourseKnowledgePointRelation> queryByCondition(PageQuery query);
PageQuery<TeacherOpenCourseKnowledgePointRelation> queryByConditionQuery(PageQuery query);
@Update
void deleteTeacherOpenCourseKnowledgePointRelationByIds(String ids);
@Update
int updateGivenByIds(TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery);
List<TeacherOpenCourseKnowledgePointRelation> getByIds(String ids);
List<TeacherOpenCourseKnowledgePointRelation> getValuesByQuery(TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery);
List<TeacherOpenCourseKnowledgePointRelation> getValuesByQueryNotWithPermission(TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery);
}

@ -2,6 +2,7 @@ package com.ibeetl.jlw.entity;
import javax.validation.constraints.NotNull;
import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.entity.BaseEntity;
import org.beetl.sql.annotation.entity.*;
@ -60,6 +61,11 @@ public class HandsOnSimulationTasks extends BaseEntity{
//考核内容
private String assessmentContent ;
//附件地址
private String fileUrl;
//题目id
private String taskList;
//组织机构ID
@ -245,5 +251,19 @@ public class HandsOnSimulationTasks extends BaseEntity{
this.addTime = addTime;
}
public String getFileUrl() {
return fileUrl;
}
public void setFileUrl(String fileUrl) {
this.fileUrl = fileUrl;
}
public String getTaskList() {
return taskList;
}
public void setTaskList(String taskList) {
this.taskList = taskList;
}
}

@ -0,0 +1,167 @@
package com.ibeetl.jlw.entity;
import javax.validation.constraints.NotNull;
import com.ibeetl.admin.core.entity.BaseEntity;
import org.beetl.sql.annotation.entity.*;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.admin.core.annotation.Dict;
import java.math.BigDecimal;
import java.util.Date;
/*
* ---
* gen by Spring Boot2 Admin 2022-10-12
*/
public class TeacherOpenCourseKnowledgePointRelation extends BaseEntity{
//关联ID
private Long teacherOpenCourseKnowledgeRelationId ;
//课程开课-知识点ID
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
// @SeqID(name = ORACLE_CORE_SEQ_NAME)
@AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseKnowledgePointRelation")
private Long teacherOpenCourseKnowledgePointId ;
//业务ID
private Long bussinessId ;
//业务类型1章节练习2课程实操, 业务id是主键自增存在重复
private Long bussinessType ;
//创建时间
private Date createTime ;
//组织ID
private Long orgId ;
//用户ID
private Long userId ;
//是否删除 1删除0未删除
/*逻辑删除标志*/
@InsertIgnore
@LogicDelete(value = 1)
private Integer delFlag ;
public TeacherOpenCourseKnowledgePointRelation(){
}
/**ID
*@return
*/
public Long getTeacherOpenCourseKnowledgeRelationId(){
return teacherOpenCourseKnowledgeRelationId;
}
/**ID
*@param teacherOpenCourseKnowledgeRelationId
*/
public void setTeacherOpenCourseKnowledgeRelationId(Long teacherOpenCourseKnowledgeRelationId){
this.teacherOpenCourseKnowledgeRelationId = teacherOpenCourseKnowledgeRelationId;
}
/**-ID
*@return
*/
public Long getTeacherOpenCourseKnowledgePointId(){
return teacherOpenCourseKnowledgePointId;
}
/**-ID
*@param teacherOpenCourseKnowledgePointId
*/
public void setTeacherOpenCourseKnowledgePointId(Long teacherOpenCourseKnowledgePointId){
this.teacherOpenCourseKnowledgePointId = teacherOpenCourseKnowledgePointId;
}
/**ID
*@return
*/
public Long getBussinessId(){
return bussinessId;
}
/**ID
*@param bussinessId
*/
public void setBussinessId(Long bussinessId){
this.bussinessId = bussinessId;
}
/**12, id
*@return
*/
public Long getBussinessType(){
return bussinessType;
}
/**12, id
*@param bussinessType
*/
public void setBussinessType(Long bussinessType){
this.bussinessType = bussinessType;
}
/**
*@return
*/
public Date getCreateTime(){
return createTime;
}
/**
*@param createTime
*/
public void setCreateTime(Date createTime){
this.createTime = createTime;
}
/**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;
}
/** 10
*@return
*/
public Integer getDelFlag(){
return delFlag;
}
/** 10
*@param delFlag
*/
public void setDelFlag(Integer delFlag){
this.delFlag = delFlag;
}
}

@ -0,0 +1,171 @@
package com.ibeetl.jlw.service;
import java.io.*;
import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.math.BigDecimal;
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.util.TimeTool;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.TeacherOpenCourseKnowledgePointRelationDao;
import com.ibeetl.jlw.entity.TeacherOpenCourseKnowledgePointRelation;
import com.ibeetl.jlw.web.query.TeacherOpenCourseKnowledgePointRelationQuery;
import com.ibeetl.jlw.entity.FileEntity;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.util.PlatformException;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
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.engine.PageQuery;
import org.beetl.sql.core.SqlId;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
/**
* Service
* ID使insert(*,true)
*/
@Service
@Transactional
@Validated
public class TeacherOpenCourseKnowledgePointRelationService extends CoreBaseService<TeacherOpenCourseKnowledgePointRelation>{
@Resource private TeacherOpenCourseKnowledgePointRelationDao teacherOpenCourseKnowledgePointRelationDao;
public PageQuery<TeacherOpenCourseKnowledgePointRelation>queryByCondition(PageQuery query){
PageQuery ret = teacherOpenCourseKnowledgePointRelationDao.queryByCondition(query);
queryListAfter(ret.getList());
return ret;
}
public PageQuery<TeacherOpenCourseKnowledgePointRelation>queryByConditionQuery(PageQuery query){
PageQuery ret = teacherOpenCourseKnowledgePointRelationDao.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)){
teacherOpenCourseKnowledgePointRelationDao.deleteTeacherOpenCourseKnowledgePointRelationByIds(ids);
}
}
public void deleteTeacherOpenCourseKnowledgePointRelation(String ids){
try {
teacherOpenCourseKnowledgePointRelationDao.deleteTeacherOpenCourseKnowledgePointRelationByIds(ids);
} catch (Exception e) {
throw new PlatformException("批量删除知识点关联失败", e);
}
}
public String addAll(TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery){
String msg = "";
List<TeacherOpenCourseKnowledgePointRelation> teacherOpenCourseKnowledgePointRelationList = new ArrayList<>();
try {
teacherOpenCourseKnowledgePointRelationList = JSON.parseArray(teacherOpenCourseKnowledgePointRelationQuery.getTeacherOpenCourseKnowledgePointRelationJsonStr(), TeacherOpenCourseKnowledgePointRelation.class);
} catch (Exception e) {
try {
teacherOpenCourseKnowledgePointRelationList.add(JSONObject.parseObject(teacherOpenCourseKnowledgePointRelationQuery.getTeacherOpenCourseKnowledgePointRelationJsonStr(), TeacherOpenCourseKnowledgePointRelation.class));
} catch (Exception e1) {}
}
ToolUtils.deleteNullList(teacherOpenCourseKnowledgePointRelationList);
if(null != teacherOpenCourseKnowledgePointRelationList && teacherOpenCourseKnowledgePointRelationList.size()>0){
for(int i=0;i<teacherOpenCourseKnowledgePointRelationList.size();i++){
TeacherOpenCourseKnowledgePointRelation teacherOpenCourseKnowledgePointRelation = teacherOpenCourseKnowledgePointRelationList.get(i);
teacherOpenCourseKnowledgePointRelation.setUserId(teacherOpenCourseKnowledgePointRelationQuery.getUserId());
teacherOpenCourseKnowledgePointRelation.setOrgId(teacherOpenCourseKnowledgePointRelationQuery.getOrgId());
}
insertBatch(teacherOpenCourseKnowledgePointRelationList);
}
return msg;
}
public JsonResult add(TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery){
String msg = "";
TeacherOpenCourseKnowledgePointRelation teacherOpenCourseKnowledgePointRelation = teacherOpenCourseKnowledgePointRelationQuery.pojo();
teacherOpenCourseKnowledgePointRelationDao.insert(teacherOpenCourseKnowledgePointRelation);
teacherOpenCourseKnowledgePointRelationQuery.setTeacherOpenCourseKnowledgePointId(teacherOpenCourseKnowledgePointRelation.getTeacherOpenCourseKnowledgePointId());
JsonResult jsonResult = new JsonResult();
jsonResult.setData(teacherOpenCourseKnowledgePointRelation.getTeacherOpenCourseKnowledgePointId());//自增的ID丢进去
jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
jsonResult.setMsg(msg);
return jsonResult;
}
public String edit(TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery){
String msg = "";
TeacherOpenCourseKnowledgePointRelation teacherOpenCourseKnowledgePointRelation = teacherOpenCourseKnowledgePointRelationQuery.pojo();
teacherOpenCourseKnowledgePointRelationDao.updateTemplateById(teacherOpenCourseKnowledgePointRelation);
return msg;
}
public String updateGivenByIds(TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery){
String msg = "";
if(StringUtils.isNotBlank(teacherOpenCourseKnowledgePointRelationQuery.get_given())){
boolean flag = teacherOpenCourseKnowledgePointRelationDao.updateGivenByIds(teacherOpenCourseKnowledgePointRelationQuery) > 0;
if(!flag){
msg = "更新指定参数失败";
}
}else{
msg = "指定参数为空";
}
return msg;
}
public List<TeacherOpenCourseKnowledgePointRelation> getValues (Object paras){
return sqlManager.select(SqlId.of("jlw.teacherOpenCourseKnowledgePointRelation.getTeacherOpenCourseKnowledgePointRelationValues"), TeacherOpenCourseKnowledgePointRelation.class, paras);
}
public List<TeacherOpenCourseKnowledgePointRelation> getValuesByQuery (TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery){
return teacherOpenCourseKnowledgePointRelationDao.getValuesByQuery(teacherOpenCourseKnowledgePointRelationQuery);
}
public List<TeacherOpenCourseKnowledgePointRelation> getValuesByQueryNotWithPermission (TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery){
return teacherOpenCourseKnowledgePointRelationDao.getValuesByQueryNotWithPermission(teacherOpenCourseKnowledgePointRelationQuery);
}
public TeacherOpenCourseKnowledgePointRelation getInfo (Long teacherOpenCourseKnowledgePointId){
TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery = new TeacherOpenCourseKnowledgePointRelationQuery();
teacherOpenCourseKnowledgePointRelationQuery.setTeacherOpenCourseKnowledgePointId(teacherOpenCourseKnowledgePointId);
List<TeacherOpenCourseKnowledgePointRelation> list = teacherOpenCourseKnowledgePointRelationDao.getValuesByQuery(teacherOpenCourseKnowledgePointRelationQuery);
if(null != list && list.size()>0){
return list.get(0);
}else{
return null;
}
}
public TeacherOpenCourseKnowledgePointRelation getInfo (TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery){
List<TeacherOpenCourseKnowledgePointRelation> list = teacherOpenCourseKnowledgePointRelationDao.getValuesByQuery(teacherOpenCourseKnowledgePointRelationQuery);
if(null != list && list.size()>0){
return list.get(0);
}else{
return null;
}
}
}

@ -90,7 +90,7 @@ public class HandsOnAchievementController{
@GetMapping(MODEL + "/index2.do")
@Function("handsOnAchievement.query")
public ModelAndView index2() {
ModelAndView view = new ModelAndView("/jlw/handsOnAchievement/index2.html") ;
ModelAndView view = new ModelAndView("/jlw/handsOnAchievement/bindPoints.html") ;
view.addObject("search", HandsOnAchievementQuery.class.getName());
return view;
}

@ -0,0 +1,238 @@
package com.ibeetl.jlw.web;
import cn.hutool.core.collection.CollectionUtil;
import cn.jlw.Interceptor.RFile;
import cn.jlw.Interceptor.SCoreUser;
import cn.jlw.Interceptor.GetFile;
import cn.jlw.util.ToolUtils;
import cn.jlw.validate.ValidateConfig;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.util.ConvertUtil;
import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.util.TimeTool;
import com.ibeetl.admin.core.web.JsonResult;
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.*;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
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.validation.annotation.Validated;
import com.ibeetl.admin.console.web.dto.DictExcelImportData;
import com.ibeetl.admin.console.web.query.UserQuery;
import com.ibeetl.admin.core.annotation.Function;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.service.*;
import com.ibeetl.jlw.web.query.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
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.*;
import java.math.BigDecimal;
import javax.annotation.Resource;
/**
* ---
* 线
*/
@RestController
@Validated
public class TeacherOpenCourseKnowledgePointRelationController{
private final Log log = LogFactory.getLog(this.getClass());
private static final String MODEL = "/jlw/teacherOpenCourseKnowledgePointRelation";
private static final String API = "/api/teacherOpenCourseKnowledgePointRelation";
@Resource private TeacherOpenCourseKnowledgePointRelationService teacherOpenCourseKnowledgePointRelationService;
@Resource private TeacherOpenCourseKnowledgePointService teacherOpenCourseKnowledgePointService;
@Resource FileService fileService;
/* 前端接口 */
@PostMapping(API + "/getPageList.do")
public JsonResult<PageQuery> getPageList(TeacherOpenCourseKnowledgePointRelationQuery condition,@SCoreUser CoreUser coreUser){
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
PageQuery page = condition.getPageQuery();
teacherOpenCourseKnowledgePointRelationService.queryByConditionQuery(page);
return JsonResult.success(page);
}
}
@GetMapping(API + "/getInfo.do")
public JsonResult<TeacherOpenCourseKnowledgePointRelation>getInfo(TeacherOpenCourseKnowledgePointRelationQuery param,@SCoreUser CoreUser coreUser) {
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
TeacherOpenCourseKnowledgePointRelation teacherOpenCourseKnowledgePointRelation = teacherOpenCourseKnowledgePointRelationService.getInfo(param);
return JsonResult.success(teacherOpenCourseKnowledgePointRelation);
}
}
@GetMapping(API + "/getList.do")
public JsonResult<List<TeacherOpenCourseKnowledgePointRelation>>getList(TeacherOpenCourseKnowledgePointRelationQuery param,@SCoreUser CoreUser coreUser) {
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
List<TeacherOpenCourseKnowledgePointRelation>list = teacherOpenCourseKnowledgePointRelationService.getValuesByQuery(param);
return JsonResult.success(list);
}
}
/* 后台页面 */
@GetMapping(MODEL + "/index.do")
@Function("teacherOpenCourseKnowledgePointRelation.query")
public ModelAndView index() {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseKnowledgePointRelation/index.html") ;
view.addObject("search", TeacherOpenCourseKnowledgePointRelationQuery.class.getName());
return view;
}
@GetMapping(MODEL + "/edit.do")
@Function("teacherOpenCourseKnowledgePointRelation.edit")
public ModelAndView edit(Long teacherOpenCourseKnowledgePointId) {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseKnowledgePointRelation/edit.html");
TeacherOpenCourseKnowledgePointRelation teacherOpenCourseKnowledgePointRelation = teacherOpenCourseKnowledgePointRelationService.queryById(teacherOpenCourseKnowledgePointId);
view.addObject("teacherOpenCourseKnowledgePointRelation", teacherOpenCourseKnowledgePointRelation);
return view;
}
@GetMapping(MODEL + "/add.do")
@Function("teacherOpenCourseKnowledgePointRelation.add")
public ModelAndView add(Long teacherOpenCourseKnowledgePointId) {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseKnowledgePointRelation/add.html");
if(null != teacherOpenCourseKnowledgePointId){
TeacherOpenCourseKnowledgePointRelation teacherOpenCourseKnowledgePointRelation = teacherOpenCourseKnowledgePointRelationService.queryById(teacherOpenCourseKnowledgePointId);
view.addObject("teacherOpenCourseKnowledgePointRelation", teacherOpenCourseKnowledgePointRelation);
}else {
view.addObject("teacherOpenCourseKnowledgePointRelation", new TeacherOpenCourseKnowledgePointRelation());
}
return view;
}
/* 后台接口 */
@PostMapping(MODEL + "/list.json")
@Function("teacherOpenCourseKnowledgePointRelation.query")
public JsonResult<PageQuery> list(TeacherOpenCourseKnowledgePointRelationQuery condition){
PageQuery page = condition.getPageQuery();
teacherOpenCourseKnowledgePointRelationService.queryByCondition(page);
return JsonResult.success(page);
}
@PostMapping(MODEL + "/addAll.json")
@Function("teacherOpenCourseKnowledgePointRelation.add")
public JsonResult addAll(TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery,@SCoreUser CoreUser coreUser){
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
teacherOpenCourseKnowledgePointRelationQuery.setUserId(coreUser.getId());
teacherOpenCourseKnowledgePointRelationQuery.setOrgId(coreUser.getOrgId());
String msg = teacherOpenCourseKnowledgePointRelationService.addAll(teacherOpenCourseKnowledgePointRelationQuery);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
} else {
return JsonResult.failMessage("新增失败,"+msg);
}
}
}
@PostMapping(MODEL + "/add.json")
@Function("teacherOpenCourseKnowledgePointRelation.add")
public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery, BindingResult result,@SCoreUser CoreUser coreUser){
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else{
teacherOpenCourseKnowledgePointRelationQuery.setUserId(coreUser.getId());
teacherOpenCourseKnowledgePointRelationQuery.setOrgId(coreUser.getOrgId());
teacherOpenCourseKnowledgePointRelationQuery.setCreateTime(new Date());
teacherOpenCourseKnowledgePointRelationQuery.setDelFlag(0);
return teacherOpenCourseKnowledgePointRelationService.add(teacherOpenCourseKnowledgePointRelationQuery);
}
}
@PostMapping(MODEL + "/edit.json")
@Function("teacherOpenCourseKnowledgePointRelation.edit")
public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery, BindingResult result) {
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else {
teacherOpenCourseKnowledgePointRelationQuery.setUserId(null);
teacherOpenCourseKnowledgePointRelationQuery.setOrgId(null);
String msg = teacherOpenCourseKnowledgePointRelationService.edit(teacherOpenCourseKnowledgePointRelationQuery);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
} else {
return JsonResult.failMessage("更新失败,"+msg);
}
}
}
@GetMapping(MODEL + "/view.json")
@Function("teacherOpenCourseKnowledgePointRelation.query")
public JsonResult<TeacherOpenCourseKnowledgePointRelation>queryInfo(Long teacherOpenCourseKnowledgePointId) {
TeacherOpenCourseKnowledgePointRelation teacherOpenCourseKnowledgePointRelation = teacherOpenCourseKnowledgePointRelationService.queryById( teacherOpenCourseKnowledgePointId);
return JsonResult.success(teacherOpenCourseKnowledgePointRelation);
}
@GetMapping(MODEL + "/getValues.json")
@Function("teacherOpenCourseKnowledgePointRelation.query")
public JsonResult<List<TeacherOpenCourseKnowledgePointRelation>>getValues(TeacherOpenCourseKnowledgePointRelationQuery param) {
List<TeacherOpenCourseKnowledgePointRelation>list = teacherOpenCourseKnowledgePointRelationService.getValuesByQuery(param);
return JsonResult.success(list);
}
@PostMapping(MODEL + "/delete.json")
@Function("teacherOpenCourseKnowledgePointRelation.delete")
@ResponseBody
public JsonResult delete(String ids) {
teacherOpenCourseKnowledgePointRelationService.deleteTeacherOpenCourseKnowledgePointRelation(ids);
return JsonResult.success();
}
@GetMapping(MODEL + "/bindPoints.do")
public ModelAndView index2(Long bussiness_id) {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseKnowledgePointRelation/bindPoints.html");
// List<TeacherOpenCourseKnowledgePoint> objects = teacherOpenCourseKnowledgePointService.getValuesByQuery(new TeacherOpenCourseKnowledgePointQuery());
// TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery = new TeacherOpenCourseKnowledgePointRelationQuery();
// teacherOpenCourseKnowledgePointRelationQuery.setBussinessId(id);
// List<TeacherOpenCourseKnowledgePointRelation> teacherOpenCourseKnowledgePointRelations = teacherOpenCourseKnowledgePointRelationService.getValuesByQuery(teacherOpenCourseKnowledgePointRelationQuery);
view.addObject("bussinessId", bussiness_id);
// view.addObject("teacherOpenCourseKnowledgePointRelations1", objects);
// view.addObject("teacherOpenCourseKnowledgePointRelations2", teacherOpenCourseKnowledgePointRelations);
return view;
}
}

@ -37,6 +37,10 @@ public class HandsOnSimulationTasksQuery extends PageParam {
private String assessmentTime;
@Query(name = "考核内容", display = false)
private String assessmentContent;
@Query(name = "附件地址", display = false)
private String fileUrl;
@Query(name = "题目id", display = false)
private String taskList;
@Query(name = "组织机构ID", display = false)
private Long orgId;
@Query(name = "后台用户ID", display = false)
@ -132,6 +136,22 @@ public class HandsOnSimulationTasksQuery extends PageParam {
this.addTime = addTime;
}
public String getFileUrl() {
return fileUrl;
}
public void setFileUrl(String fileUrl) {
this.fileUrl = fileUrl;
}
public String getTaskList() {
return taskList;
}
public void setTaskList(String taskList) {
this.taskList = taskList;
}
public HandsOnSimulationTasks pojo(){
HandsOnSimulationTasks pojo = new HandsOnSimulationTasks();
pojo.setTaskId(this.getTaskId());
@ -144,6 +164,8 @@ public class HandsOnSimulationTasksQuery extends PageParam {
pojo.setAssessmentRequirements(this.getAssessmentRequirements());
pojo.setAssessmentTime(this.getAssessmentTime());
pojo.setAssessmentContent(this.getAssessmentContent());
pojo.setFileUrl(this.getFileUrl());
pojo.setTaskList(this.getTaskList());
pojo.setOrgId(this.getOrgId());
pojo.setUserId(this.getUserId());
pojo.setAddTime(this.getAddTime());

@ -0,0 +1,151 @@
package com.ibeetl.jlw.web.query;
import cn.jlw.validate.ValidateConfig;
import com.ibeetl.jlw.entity.TeacherOpenCourseKnowledgePointRelation;
import org.apache.commons.lang3.StringUtils;
import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.util.Tool;
import com.ibeetl.admin.core.util.enums.CoreDictType;
import com.ibeetl.admin.core.web.query.PageParam;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
/**
*
*/
public class TeacherOpenCourseKnowledgePointRelationQuery extends PageParam {
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
@Query(name = "关联ID", display = false)
private Long teacherOpenCourseKnowledgeRelationId;
@Query(name = "课程开课-知识点ID", display = false)
private Long teacherOpenCourseKnowledgePointId;
@Query(name = "业务ID", display = false)
private Long bussinessId;
@Query(name = "业务类型1章节练习2课程实操", display = false)
private Long bussinessType;
@Query(name = "创建时间", display = false)
private Date createTime;
@Query(name = "组织ID", display = false)
private Long orgId;
@Query(name = "用户ID", display = false)
private Long userId;
@Query(name = "是否删除 1删除0未删除", display = false)
private Integer delFlag;
private String teacherOpenCourseKnowledgeRelationIdPlural;
private String teacherOpenCourseKnowledgePointIdPlural;
private String bussinessIdPlural;
private String orgIdPlural;
private String userIdPlural;
private String teacherOpenCourseKnowledgePointRelationJsonStr;//json格式
private String _given;//指定更新的特定字段,多个逗号隔开
public Long getTeacherOpenCourseKnowledgeRelationId(){
return teacherOpenCourseKnowledgeRelationId;
}
public void setTeacherOpenCourseKnowledgeRelationId(Long teacherOpenCourseKnowledgeRelationId ){
this.teacherOpenCourseKnowledgeRelationId = teacherOpenCourseKnowledgeRelationId;
}
public Long getTeacherOpenCourseKnowledgePointId(){
return teacherOpenCourseKnowledgePointId;
}
public void setTeacherOpenCourseKnowledgePointId(Long teacherOpenCourseKnowledgePointId ){
this.teacherOpenCourseKnowledgePointId = teacherOpenCourseKnowledgePointId;
}
public Long getBussinessId(){
return bussinessId;
}
public void setBussinessId(Long bussinessId ){
this.bussinessId = bussinessId;
}
public Long getBussinessType(){
return bussinessType;
}
public void setBussinessType(Long bussinessType ){
this.bussinessType = bussinessType;
}
public Date getCreateTime(){
return createTime;
}
public void setCreateTime(Date createTime ){
this.createTime = createTime;
}
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 Integer getDelFlag(){
return delFlag;
}
public void setDelFlag(Integer delFlag ){
this.delFlag = delFlag;
}
public TeacherOpenCourseKnowledgePointRelation pojo(){
TeacherOpenCourseKnowledgePointRelation pojo = new TeacherOpenCourseKnowledgePointRelation();
pojo.setTeacherOpenCourseKnowledgeRelationId(this.getTeacherOpenCourseKnowledgeRelationId());
pojo.setTeacherOpenCourseKnowledgePointId(this.getTeacherOpenCourseKnowledgePointId());
pojo.setBussinessId(this.getBussinessId());
pojo.setBussinessType(this.getBussinessType());
pojo.setCreateTime(this.getCreateTime());
pojo.setOrgId(this.getOrgId());
pojo.setUserId(this.getUserId());
pojo.setDelFlag(this.getDelFlag());
return pojo;
}
public String getTeacherOpenCourseKnowledgeRelationIdPlural(){
return teacherOpenCourseKnowledgeRelationIdPlural;
}
public void setTeacherOpenCourseKnowledgeRelationIdPlural(String teacherOpenCourseKnowledgeRelationIdPlural){
this.teacherOpenCourseKnowledgeRelationIdPlural = teacherOpenCourseKnowledgeRelationIdPlural;
}
public String getTeacherOpenCourseKnowledgePointIdPlural(){
return teacherOpenCourseKnowledgePointIdPlural;
}
public void setTeacherOpenCourseKnowledgePointIdPlural(String teacherOpenCourseKnowledgePointIdPlural){
this.teacherOpenCourseKnowledgePointIdPlural = teacherOpenCourseKnowledgePointIdPlural;
}
public String getBussinessIdPlural(){
return bussinessIdPlural;
}
public void setBussinessIdPlural(String bussinessIdPlural){
this.bussinessIdPlural = bussinessIdPlural;
}
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 getTeacherOpenCourseKnowledgePointRelationJsonStr(){
return teacherOpenCourseKnowledgePointRelationJsonStr;
}
public void setTeacherOpenCourseKnowledgePointRelationJsonStr(String teacherOpenCourseKnowledgePointRelationJsonStr ){
this.teacherOpenCourseKnowledgePointRelationJsonStr = teacherOpenCourseKnowledgePointRelationJsonStr;
}
public String get_given() {
return _given;
}
public void set_given(String _given) {
this._given = _given;
}
}

@ -46,6 +46,12 @@ queryByCondition
@if(!isEmpty(assessmentContent)){
and t.assessment_content =#assessmentContent#
@}
@if(!isEmpty(fileUrl)){
and t.file_url =#fileUrl#
@}
@if(!isEmpty(taskList)){
and t.task_list =#taskList#
@}
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@}
@ -109,6 +115,12 @@ queryByConditionQuery
@if(!isEmpty(assessmentContent)){
and t.assessment_content =#assessmentContent#
@}
@if(!isEmpty(fileUrl)){
and t.file_url =#fileUrl#
@}
@if(!isEmpty(taskList)){
and t.task_list =#taskList#
@}
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@}
@ -213,6 +225,20 @@ updateGivenByIds
assessment_content = #assessmentContent# ,
@}
@}
@if(contain("fileUrl",_given)){
@if(isEmpty(fileUrl)){
file_url = null ,
@}else{
file_url = #fileUrl# ,
@}
@}
@if(contain("taskList",_given)){
@if(isEmpty(taskList)){
task_list = null ,
@}else{
tas_list = #taskList# ,
@}
@}
@if(contain("orgId",_given)){
@if(isEmpty(orgId)){
org_id = null ,
@ -277,6 +303,12 @@ getHandsOnSimulationTasksValues
@if(!isEmpty(assessmentContent)){
and t.assessment_content =#assessmentContent#
@}
@if(!isEmpty(fileUrl)){
and t.file_url =#fileUrl#
@}
@if(!isEmpty(taskList)){
and t.task_list =#taskList#
@}
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@}
@ -332,6 +364,12 @@ getValuesByQuery
@if(!isEmpty(assessmentContent)){
and t.assessment_content =#assessmentContent#
@}
@if(!isEmpty(fileUrl)){
and t.file_url =#fileUrl#
@}
@if(!isEmpty(taskList)){
and t.task_list =#taskList#
@}
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@}

@ -0,0 +1,315 @@
queryByCondition
===
* 根据不为空的参数进行分页查询
select
@pageTag(){
t.*
@}
from teacher_open_course_knowledge_point_relation t
where 1=1
@//数据权限该sql语句功能点,如果不考虑数据权限,可以删除此行
and #function("teacherOpenCourseKnowledgePointRelation.query")#
@if(!isEmpty(teacherOpenCourseKnowledgeRelationId)){
and t.teacher_open_course_knowledge_relation_id =#teacherOpenCourseKnowledgeRelationId#
@}
@if(!isEmpty(teacherOpenCourseKnowledgeRelationIdPlural)){
and find_in_set(t.teacher_open_course_knowledge_relation_id,#teacherOpenCourseKnowledgeRelationIdPlural#)
@}
@if(!isEmpty(teacherOpenCourseKnowledgePointId)){
and t.teacher_open_course_knowledge_point_id =#teacherOpenCourseKnowledgePointId#
@}
@if(!isEmpty(teacherOpenCourseKnowledgePointIdPlural)){
and find_in_set(t.teacher_open_course_knowledge_point_id,#teacherOpenCourseKnowledgePointIdPlural#)
@}
@if(!isEmpty(bussinessId)){
and t.bussiness_id =#bussinessId#
@}
@if(!isEmpty(bussinessIdPlural)){
and find_in_set(t.bussiness_id,#bussinessIdPlural#)
@}
@if(!isEmpty(bussinessType)){
and t.bussiness_type =#bussinessType#
@}
@if(!isEmpty(createTime)){
and t.create_time =#createTime#
@}
@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#)
@}
@if(!isEmpty(delFlag)){
and t.del_flag =#delFlag#
@}
queryByConditionQuery
===
* 根据不为空的参数进行分页查询(无权限)
select
@pageTag(){
t.*
@}
from teacher_open_course_knowledge_point_relation t
where 1=1
@if(!isEmpty(teacherOpenCourseKnowledgeRelationId)){
and t.teacher_open_course_knowledge_relation_id =#teacherOpenCourseKnowledgeRelationId#
@}
@if(!isEmpty(teacherOpenCourseKnowledgeRelationIdPlural)){
and find_in_set(t.teacher_open_course_knowledge_relation_id,#teacherOpenCourseKnowledgeRelationIdPlural#)
@}
@if(!isEmpty(teacherOpenCourseKnowledgePointId)){
and t.teacher_open_course_knowledge_point_id =#teacherOpenCourseKnowledgePointId#
@}
@if(!isEmpty(teacherOpenCourseKnowledgePointIdPlural)){
and find_in_set(t.teacher_open_course_knowledge_point_id,#teacherOpenCourseKnowledgePointIdPlural#)
@}
@if(!isEmpty(bussinessId)){
and t.bussiness_id =#bussinessId#
@}
@if(!isEmpty(bussinessIdPlural)){
and find_in_set(t.bussiness_id,#bussinessIdPlural#)
@}
@if(!isEmpty(bussinessType)){
and t.bussiness_type =#bussinessType#
@}
@if(!isEmpty(createTime)){
and t.create_time =#createTime#
@}
@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#)
@}
@if(!isEmpty(delFlag)){
and t.del_flag =#delFlag#
@}
deleteTeacherOpenCourseKnowledgePointRelationByIds
===
* 批量删除
delete from teacher_open_course_knowledge_point_relation where find_in_set(teacher_open_course_knowledge_point_id,#ids#)
getByIds
===
select * from teacher_open_course_knowledge_point_relation where find_in_set(teacher_open_course_knowledge_point_id,#ids#)
updateGivenByIds
===
* 批量更新指定字段,无论此字段是否有值
update teacher_open_course_knowledge_point_relation
set
@if(contain("teacherOpenCourseKnowledgeRelationId",_given)){
@if(isEmpty(teacherOpenCourseKnowledgeRelationId)){
teacher_open_course_knowledge_relation_id = null ,
@}else{
teacher_open_course_knowledge_relation_id = #teacherOpenCourseKnowledgeRelationId# ,
@}
@}
@if(contain("bussinessId",_given)){
@if(isEmpty(bussinessId)){
bussiness_id = null ,
@}else{
bussiness_id = #bussinessId# ,
@}
@}
@if(contain("bussinessType",_given)){
@if(isEmpty(bussinessType)){
bussiness_type = null ,
@}else{
bussiness_type = #bussinessType# ,
@}
@}
@if(contain("createTime",_given)){
@if(isEmpty(createTime)){
create_time = null ,
@}else{
create_time = #createTime# ,
@}
@}
@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# ,
@}
@}
@if(contain("delFlag",_given)){
@if(isEmpty(delFlag)){
del_flag = null ,
@}else{
del_flag = #delFlag# ,
@}
@}
teacher_open_course_knowledge_point_id = teacher_open_course_knowledge_point_id
where find_in_set(teacher_open_course_knowledge_point_id,#teacherOpenCourseKnowledgePointIdPlural#)
getTeacherOpenCourseKnowledgePointRelationValues
===
* 根据不为空的参数进行查询
select t.*
from teacher_open_course_knowledge_point_relation t
where 1=1
@if(!isEmpty(teacherOpenCourseKnowledgeRelationId)){
and t.teacher_open_course_knowledge_relation_id =#teacherOpenCourseKnowledgeRelationId#
@}
@if(!isEmpty(teacherOpenCourseKnowledgePointId)){
and t.teacher_open_course_knowledge_point_id =#teacherOpenCourseKnowledgePointId#
@}
@if(!isEmpty(bussinessId)){
and t.bussiness_id =#bussinessId#
@}
@if(!isEmpty(bussinessType)){
and t.bussiness_type =#bussinessType#
@}
@if(!isEmpty(createTime)){
and t.create_time =#createTime#
@}
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@}
@if(!isEmpty(userId)){
and t.user_id =#userId#
@}
@if(!isEmpty(delFlag)){
and t.del_flag =#delFlag#
@}
getValuesByQuery
===
* 根据不为空的参数进行查询
select t.*
from teacher_open_course_knowledge_point_relation t
where 1=1 and #function("teacherOpenCourseKnowledgePointRelation.query")#
@if(!isEmpty(teacherOpenCourseKnowledgeRelationId)){
and t.teacher_open_course_knowledge_relation_id =#teacherOpenCourseKnowledgeRelationId#
@}
@if(!isEmpty(teacherOpenCourseKnowledgeRelationIdPlural)){
and find_in_set(t.teacher_open_course_knowledge_relation_id,#teacherOpenCourseKnowledgeRelationIdPlural#)
@}
@if(!isEmpty(teacherOpenCourseKnowledgePointId)){
and t.teacher_open_course_knowledge_point_id =#teacherOpenCourseKnowledgePointId#
@}
@if(!isEmpty(teacherOpenCourseKnowledgePointIdPlural)){
and find_in_set(t.teacher_open_course_knowledge_point_id,#teacherOpenCourseKnowledgePointIdPlural#)
@}
@if(!isEmpty(bussinessId)){
and t.bussiness_id =#bussinessId#
@}
@if(!isEmpty(bussinessIdPlural)){
and find_in_set(t.bussiness_id,#bussinessIdPlural#)
@}
@if(!isEmpty(bussinessType)){
and t.bussiness_type =#bussinessType#
@}
@if(!isEmpty(createTime)){
and t.create_time =#createTime#
@}
@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#)
@}
@if(!isEmpty(delFlag)){
and t.del_flag =#delFlag#
@}
getValuesByQueryNotWithPermission
===
* 根据不为空的参数进行查询(不包含权限)
select t.*
from teacher_open_course_knowledge_point_relation t
where 1=1
@if(!isEmpty(teacherOpenCourseKnowledgeRelationId)){
and t.teacher_open_course_knowledge_relation_id =#teacherOpenCourseKnowledgeRelationId#
@}
@if(!isEmpty(teacherOpenCourseKnowledgeRelationIdPlural)){
and find_in_set(t.teacher_open_course_knowledge_relation_id,#teacherOpenCourseKnowledgeRelationIdPlural#)
@}
@if(!isEmpty(teacherOpenCourseKnowledgePointId)){
and t.teacher_open_course_knowledge_point_id =#teacherOpenCourseKnowledgePointId#
@}
@if(!isEmpty(teacherOpenCourseKnowledgePointIdPlural)){
and find_in_set(t.teacher_open_course_knowledge_point_id,#teacherOpenCourseKnowledgePointIdPlural#)
@}
@if(!isEmpty(bussinessId)){
and t.bussiness_id =#bussinessId#
@}
@if(!isEmpty(bussinessIdPlural)){
and find_in_set(t.bussiness_id,#bussinessIdPlural#)
@}
@if(!isEmpty(bussinessType)){
and t.bussiness_type =#bussinessType#
@}
@if(!isEmpty(createTime)){
and t.create_time =#createTime#
@}
@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#)
@}
@if(!isEmpty(delFlag)){
and t.del_flag =#delFlag#
@}

@ -148,6 +148,25 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
}
});
});
}else if(obj.event === "bindPoints"){
var url = "/jlw/teacherOpenCourseKnowledgePointRelation/bindPoints.do?bussiness_id="+data.handsOnId;
return layer.open({
type: 2,
area: ['800px', '600px'],
fix: false,
maxmin: true,
shade: 0.3,
title: "知识点绑定",
content: Common.ctxPath + url,
btn: ['确定', '关闭'],
yes: function(index, layero) {
var iframeWin = layero.find('iframe')[0];
iframeWin.contentWindow.submitHandler(index, layero);
},
cancel: function(index) {
return true;
}
});
}
})
}

@ -0,0 +1,38 @@
layui.define([ 'form', 'laydate', 'table','teacherOpenCourseKnowledgePointRelationApi'], function(exports) {
var form = layui.form;
var teacherOpenCourseKnowledgePointRelationApi = layui.teacherOpenCourseKnowledgePointRelationApi;
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 teacherOpenCourseKnowledgePointId = $("#addForm input[name='teacherOpenCourseKnowledgePointId']").val();
if(!$.isEmpty(teacherOpenCourseKnowledgePointId)){
teacherOpenCourseKnowledgePointRelationApi.updateTeacherOpenCourseKnowledgePointRelation($('#addForm'),function(){
parent.window.dataReload();
Common.info("更新成功");
Lib.closeFrame();
});
}else{
teacherOpenCourseKnowledgePointRelationApi.addTeacherOpenCourseKnowledgePointRelation($('#addForm'),function(){
parent.window.dataReload();
Common.info("添加成功");
Lib.closeFrame();
});
}
});
});
$("#addButton-cancel").click(function(){
Lib.closeFrame();
});
}
}
exports('add',view);
});

@ -0,0 +1,23 @@
layui.define(['table', 'teacherOpenCourseKnowledgePointRelationApi'], function(exports) {
var teacherOpenCourseKnowledgePointRelationApi = layui.teacherOpenCourseKnowledgePointRelationApi;
var table=layui.table;
var view = {
init:function(){
},
delBatch:function(){
var data = Common.getMoreDataFromTable(table,"teacherOpenCourseKnowledgePointRelationTable");
if(data==null){
return ;
}
Common.openConfirm("确认要删除这些知识点关联?",function(){
var ids =Common.concatBatchId(data,"teacherOpenCourseKnowledgePointId");
teacherOpenCourseKnowledgePointRelationApi.del(ids,function(){
Common.info("删除成功");
dataReload();
})
})
}
}
exports('del',view);
});

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

@ -0,0 +1,171 @@
layui.define([ 'form', 'laydate', 'table' ], function(exports) {
var form = layui.form;
var laydate = layui.laydate;
var table = layui.table;
var teacherOpenCourseKnowledgePointRelationTable = null;
var view ={
init:function(){
var that = this
this.initTable();
this.initSearchForm();
this.initToolBar();
window.dataReload = function(){
Lib.doSearchForm($("#searchForm"),teacherOpenCourseKnowledgePointRelationTable)
that.initToolBar();
}
},
initTable:function(){
var sx_ = localStorage.getItem("teacherOpenCourseKnowledgePointRelationTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存
if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);}
teacherOpenCourseKnowledgePointRelationTable = table.render({
elem : '#teacherOpenCourseKnowledgePointRelationTable',
height : Lib.getTableHeight(1),
cellMinWidth: 100,
method : 'post',
url : Common.ctxPath + '/jlw/teacherOpenCourseKnowledgePointRelation/list.json' // 数据接口
,page : Lib.tablePage // 开启分页
,toolbar: '#toolbar_teacherOpenCourseKnowledgePointRelation' //自定义头部左侧工具栏
,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
,limit : 10,
cols : [ [ // 表头
{
type : 'checkbox',
},
{
field : 'teacherOpenCourseKnowledgeRelationId',
title : '关联ID',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['teacherOpenCourseKnowledgeRelationId'])?false:sx_['teacherOpenCourseKnowledgeRelationId'],
width : 60,
},
{
field : 'teacherOpenCourseKnowledgePointId',
title : '课程开课-知识点ID',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['teacherOpenCourseKnowledgePointId'])?false:sx_['teacherOpenCourseKnowledgePointId'],
},
{
field : 'bussinessId',
title : '业务ID',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['bussinessId'])?false:sx_['bussinessId'],
},
{
field : 'bussinessType',
title : '业务类型1章节练习2课程实操',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['bussinessType'])?false:sx_['bussinessType'],
},
{
field : 'createTime',
title : '创建时间',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['createTime'])?false:sx_['createTime'],
},
{
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(teacherOpenCourseKnowledgePointRelationTable)', function(obj){
var teacherOpenCourseKnowledgePointRelation = obj.data;
if(obj.checked){
//按钮逻辑Lib.buttonEnable()
}else{
}
})
},
initSearchForm:function(){
Lib.initSearchForm( $("#searchForm"),teacherOpenCourseKnowledgePointRelationTable,form);
},
initToolBar:function(){
toolbar = {
add: function () {
var url = "/jlw/teacherOpenCourseKnowledgePointRelation/add.do";
Common.openDlg(url,"知识点关联管理>新增");
},
edit: function () {
var data = Common.getOneFromTable(table,"teacherOpenCourseKnowledgePointRelationTable");
if(data==null){
return ;
}
var url = "/jlw/teacherOpenCourseKnowledgePointRelation/add.do?teacherOpenCourseKnowledgePointId="+data.teacherOpenCourseKnowledgePointId;
Common.openDlg(url,"知识点关联管理>"+data.teacherOpenCourseKnowledgeRelationId+">编辑");
},
del: function () {
layui.use(['del'], function(){
var delView = layui.del
delView.delBatch();
});
},
search: function () {
Lib.doSearchForm($("#searchForm"), teacherOpenCourseKnowledgePointRelationTable, 1);
view.initToolBar()
},
refresh: function () {
searchForm.reset();
Lib.doSearchForm($("#searchForm"), teacherOpenCourseKnowledgePointRelationTable, 1);
view.initToolBar()
},
}
//触发事件
$('.ext-toolbar').on('click', function() {
var type = $(this).data('type');
toolbar[type] ? toolbar[type].call(this) : '';
});
}, initTableTool: table.on('tool(teacherOpenCourseKnowledgePointRelationTable)', function (obj) {
var data = obj.data;
if (obj.event === 'edit') {
var url = "/jlw/teacherOpenCourseKnowledgePointRelation/add.do?teacherOpenCourseKnowledgePointId="+data.teacherOpenCourseKnowledgePointId;
Common.openDlg(url,"知识点关联管理>"+data.teacherOpenCourseKnowledgeRelationId+">编辑");
}else if(obj.event === "del"){
layer.confirm('是否确定删除该信息?', function (index) {
var ret = Common.postAjax("/jlw/teacherOpenCourseKnowledgePointRelation/delete.json",{ids:data.teacherOpenCourseKnowledgePointId});
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);
});

@ -0,0 +1,18 @@
/*访问后台的代码*/
layui.define([], function(exports) {
var api={
updateTeacherOpenCourseKnowledgePointRelation:function(form,callback){
Lib.submitForm("/jlw/teacherOpenCourseKnowledgePointRelation/edit.json",form,{},callback)
},
addTeacherOpenCourseKnowledgePointRelation:function(form,callback){
Lib.submitForm("/jlw/teacherOpenCourseKnowledgePointRelation/add.json",form,{},callback)
},
del:function(ids,callback){
Common.post("/jlw/teacherOpenCourseKnowledgePointRelation/delete.json",{"ids":ids},function(){
callback();
})
}
};
exports('teacherOpenCourseKnowledgePointRelationApi',api);
});

@ -0,0 +1,67 @@
<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseKnowledgePointRelation/"}){ -->
<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">
<input type="text" id="teacherOpenCourseKnowledgeRelationId" name="teacherOpenCourseKnowledgeRelationId" value="${teacherOpenCourseKnowledgePointRelation.teacherOpenCourseKnowledgeRelationId}" 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="bussinessId" name="bussinessId" value="${teacherOpenCourseKnowledgePointRelation.bussinessId}" 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">业务类型1章节练习2课程实操</label>
<div class="layui-input-inline">
<input type="text" id="bussinessType" name="bussinessType" value="${teacherOpenCourseKnowledgePointRelation.bussinessType}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">创建时间</label>
<div class="layui-input-inline">
<input type="text" id="createTime" name="createTime" value="${teacherOpenCourseKnowledgePointRelation.createTime,"yyyy-MM-dd"}" class="layui-input input-date" >
</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="orgId" name="orgId" value="${teacherOpenCourseKnowledgePointRelation.orgId}" 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="userId" name="userId" value="${teacherOpenCourseKnowledgePointRelation.userId}" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
</div>
</div>
<!-- 业务对象须有hidden字段保存delFlag和version字段-->
<input type="hidden" name="delFlag" value=${teacherOpenCourseKnowledgePointRelation.delFlag} />
<input type="hidden" name="teacherOpenCourseKnowledgePointId" value="${teacherOpenCourseKnowledgePointRelation.teacherOpenCourseKnowledgePointId}" />
<layui:submitButtons id="addButton" buttonType="" showExamine="2" />
</form>
<!--#} -->
<script>
layui.use(['add'], function(){
var teacherOpenCourseKnowledgePointRelationAdd = layui.add
teacherOpenCourseKnowledgePointRelationAdd.init();
});
</script>

@ -0,0 +1,53 @@
<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseKnowledgePoint/"}){ -->
<form class="layui-form" id="updateForm">
<div id="test2" class="demo-transfer"></div>
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
</fieldset>
<!-- 业务对象须有hidden字段保存delFlag和version字段-->
<input type="hidden" name="bussinessId" value="${bussinessId}" />
</form>
<!--#} -->
<script>
var transfer;
layui.use(['transfer'], function(){
var $ = layui.$
;
transfer = layui.transfer;
var ret = Common.postAjax("/jlw/teacherOpenCourseKnowledgePoint/list.json");
var ret2 = Common.postAjax("/jlw/teacherOpenCourseKnowledgePointRelation/list.json", {bussinessId: "${bussinessId}"});
var data2 = [];
for (var i=0;i<ret2.data.length;i++) {
data2.push(ret2.data[i].teacherOpenCourseKnowledgePointId)
}
console.log(data2)
//模拟数据
var data1 = ret.data;
transfer.render({
elem: '#test2'
,data: data1
,id: 'key123'
,value: data2,
parseData: function(res){
return {
"value": res.teacherOpenCourseKnowledgePointId //数据值
,"title": res.knowledgePointContent //数据标题
}
}
})
});
function submitHandler(index) {
var data = transfer.getData('key123');
for (var i=0;i<data.length;i++) {
Common.postAjax("/jlw/teacherOpenCourseKnowledgePointRelation/add.json", {
bussinessId: "${bussinessId}",
teacherOpenCourseKnowledgePointId: data[i].value,
bussinessType: 2
})
}
parent.layer.close(index)
}
</script>

@ -0,0 +1,67 @@
<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseKnowledgePointRelation/"}){ -->
<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">
<input type="text" id="teacherOpenCourseKnowledgeRelationId" name="teacherOpenCourseKnowledgeRelationId" value="${teacherOpenCourseKnowledgePointRelation.teacherOpenCourseKnowledgeRelationId}" 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="bussinessId" name="bussinessId" value="${teacherOpenCourseKnowledgePointRelation.bussinessId}" 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">业务类型1章节练习2课程实操</label>
<div class="layui-input-inline">
<input type="text" id="bussinessType" name="bussinessType" value="${teacherOpenCourseKnowledgePointRelation.bussinessType}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">创建时间</label>
<div class="layui-input-inline">
<input type="text" id="createTime" name="createTime" value="${teacherOpenCourseKnowledgePointRelation.createTime,"yyyy-MM-dd"}" class="layui-input input-date" >
</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="orgId" name="orgId" value="${teacherOpenCourseKnowledgePointRelation.orgId}" 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="userId" name="userId" value="${teacherOpenCourseKnowledgePointRelation.userId}" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
</div>
</div>
<!-- 业务对象须有hidden字段保存delFlag和version字段-->
<input type="hidden" name="delFlag" value=${teacherOpenCourseKnowledgePointRelation.delFlag} />
<input type="hidden" name="teacherOpenCourseKnowledgePointId" value="${teacherOpenCourseKnowledgePointRelation.teacherOpenCourseKnowledgePointId}" />
<layui:submitButtons id="updateButton" buttonType="" showExamine="2" />
</form>
<!--#} -->
<script>
layui.use(['edit'], function(){
var teacherOpenCourseKnowledgePointRelationEdit = layui.edit
teacherOpenCourseKnowledgePointRelationEdit.init();
});
</script>

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