yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2023-08-12 08:44:23 +08:00
parent f976137501
commit 5d4a66de00
16 changed files with 736 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/controller/KcSysConfigController.java
View File

@ -29,8 +29,12 @@ import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService;
import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao;
import org.jeecg.modules.kc.ktgl.entity.KcKechengbiaoHis;
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiaoHis;
import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoHisService;
import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService;
import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoHisService;
import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@ -66,10 +70,14 @@ public class KcSysConfigController extends JeecgController<KcSysConfig, IKcSysCo
@Autowired
private IKcKechengbiaoService kcKechengbiaoService;
@Autowired
private IKcKechengbiaoHisService kcKechengbiaoHisService;
@Autowired
private IKcKetangbiaoService kcKetangbiaoService;
@Autowired
private IKcKetangbiaoHisService kcKetangbiaoHisService;
@Autowired
private IKcXqxnHistoryService kcXqxnHistoryService;
/**
* 分页列表查询
@ -267,10 +275,61 @@ public class KcSysConfigController extends JeecgController<KcSysConfig, IKcSysCo
@GetMapping(value = "/listKcxx")
public Result<IPage<KcSysConfig>> listKcxx(KcSysConfig kcSysConfig,HttpServletRequest req) {
try {
KcKechengbiao kcKechengbiao = new KcKechengbiao();
kcKechengbiaoService.syncKechengbiao(kcKechengbiao);
kcSysConfig = kcSysConfigService.getById("1");
Date dateNow = new Date();
//-----------------向历史数据添加数据--------------------------
List<KcKechengbiao> listKcb = kcKechengbiaoService.list();
List<KcKechengbiaoHis> listHisKcb = new ArrayList<>();
for(int i=0;i<listKcb.size();i++){
KcKechengbiaoHis his = new KcKechengbiaoHis();
KcKechengbiao KcKechengbiaoPar = listKcb.get(i);
BeanUtils.copyProperties(KcKechengbiaoPar,his);
his.setXnxq(kcSysConfig.getFlag1());
his.setSjc(dateNow);
listHisKcb.add(his);
}
kcKechengbiaoHisService.saveBatch(listHisKcb);
//-----------------向历史数据添加数据--------------------------
QueryWrapper<KcKechengbiao> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("xqxn",kcSysConfig.getFlag1());
kcKechengbiaoService.remove(queryWrapper);
//-----------------删除原来的数据-----------------------
//-----------------初始化数据------------------------
KcKechengbiao kcKechengbiao = new KcKechengbiao();
kcKechengbiao.setXqxn(kcSysConfig.getFlag1());
kcKechengbiaoService.syncKechengbiao(kcKechengbiao);
//-----------------初始化数据------------------------
//---------------向历史数据里添加记录----------------
List<KcKetangbiaoHis> arrayHisList = new ArrayList<>();
List<KcKetangbiao> KcKetangbiaoParList = kcKetangbiaoService.list();
for(int i=0;i<KcKetangbiaoParList.size();i++){
KcKetangbiao KcKetangbiaoPar = KcKetangbiaoParList.get(i);
KcKetangbiaoHis hisKtb = new KcKetangbiaoHis();
BeanUtils.copyProperties(KcKetangbiaoPar,hisKtb);
hisKtb.setXnxq(kcSysConfig.getFlag1());
hisKtb.setSjc(dateNow);
arrayHisList.add(hisKtb);
}
kcKetangbiaoHisService.saveBatch(arrayHisList);
//---------------向历史数据里添加记录----------------
//---------------删除对应数据--------------------
QueryWrapper<KcKetangbiao> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("xnxq",kcSysConfig.getFlag1());
kcKetangbiaoService.remove(queryWrapper2);
//---------------删除对应数据--------------------
String bxqkssj = kcSysConfig.getBxqkssj();
//插入数据
KcKetangbiao kcKetangbiao = new KcKetangbiao();
@ -295,7 +354,9 @@ public class KcSysConfigController extends JeecgController<KcSysConfig, IKcSysCo
String skrq = DateUtils.formatDate(c,"yyyy-MM-dd");
kcKetangbiaoAddNew.setSkrq(skrq);
kcKetangbiaoAddNew.setDijizhou(djz);
kcKetangbiaoAddNew.setXnxq(kcSysConfig.getFlag1());
arrayList.add(kcKetangbiaoAddNew);
}
}catch (Exception e){
e.printStackTrace();

19
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/controller/KcYuyueController.java
View File

@ -10,10 +10,13 @@ import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.date.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService;
import org.jeecg.modules.kc.kcYuyue.entity.KcYuyue;
import org.jeecg.modules.kc.kcYuyue.service.IKcYuyueService;
@ -52,7 +55,9 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
public class KcYuyueController extends JeecgController<KcYuyue, IKcYuyueService> {
@Autowired
private IKcYuyueService kcYuyueService;
@Autowired
private IKcXqxnHistoryService kcXqxnHistoryService;
/**
* 分页列表查询
*
@ -176,7 +181,17 @@ public class KcYuyueController extends JeecgController<KcYuyue, IKcYuyueService>
@ApiOperation(value="kc_yuyue-分页列表查询", notes="kc_yuyue-分页列表查询")
@GetMapping(value = "/findTingkeZuJiByPage")
public Result<IPage<?>> findTingkeZuJiByPage(KcYuyue kcYuyue,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<KcYuyue> queryWrapper = QueryGenerator.initQueryWrapper("a",kcYuyue, req.getParameterMap());
String xnxq = kcYuyue.getXnxq();
if(org.apache.commons.lang3.StringUtils.isNotBlank(xnxq)){
QueryWrapper<KcXqxnHistory> kcXqxnHistoryQueryWrapper = new QueryWrapper<>();
kcXqxnHistoryQueryWrapper.eq("title",xnxq);
kcXqxnHistoryQueryWrapper.last("limit 1");
KcXqxnHistory kcXqxnHistory =kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper);
kcYuyue.setStartTime(DateUtil.format(kcXqxnHistory.getStartTime(),"yyyy-MM-dd"));
kcYuyue.setEndTime(DateUtil.format(kcXqxnHistory.getEndTime(),"yyyy-MM-dd"));
}
QueryWrapper<KcYuyue> queryWrapper = QueryGenerator.initQueryWrapper("a",kcYuyue, req.getParameterMap());
if(kcYuyue.getIsOrderByNow() != null && kcYuyue.getIsOrderByNow()){
queryWrapper.orderByAsc("ABS(NOW() - str_to_date( CONCAT( kt.skrq, kt.hhks ), '%Y-%m-%d %H%i' ))");
}

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/entity/KcYuyue.java
View File

@ -86,4 +86,6 @@ public class KcYuyue implements Serializable {
private String jieci;
@TableField(exist = false)
private String ywmc;
@TableField(exist = false)
private String xnxq;
}

1
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java
View File

@ -237,6 +237,7 @@ public class KcKechengbiao implements Serializable {
private java.lang.String kcdl;
private java.lang.String szkc;//思政课程
private String xqxn;
/**课程名称或教师名*/
@TableField(exist = false)

236
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiaoHis.java Normal file
View File

@ -0,0 +1,236 @@
package org.jeecg.modules.kc.ktgl.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 课程管理-主表
* @Author: jeecg-boot
* @Date: 2023-04-01
* @Version: V1.0
*/
@Data
@TableName("kc_kechengbiao_his")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="kc_kechengbiao对象", description="课程管理-主表")
public class KcKechengbiaoHis implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
/**课程编号*/
@Excel(name = "课程编号", width = 15)
@ApiModelProperty(value = "课程编号")
private String kcbh;
/**课程名称*/
@Excel(name = "课程名称", width = 15)
@ApiModelProperty(value = "课程名称")
private String kcmc;
/**授课教师*/
@Excel(name = "授课教师", width = 15)
@ApiModelProperty(value = "授课教师")
private String skjs;
/**职称*/
@Excel(name = "职称", width = 15)
@ApiModelProperty(value = "职称")
private String zc;
/**学科人数*/
@Excel(name = "学科人数", width = 15)
@ApiModelProperty(value = "学科人数")
private String xkrs;
/**评课人数*/
@Excel(name = "评课人数", width = 15)
@ApiModelProperty(value = "评课人数")
private String pkrs;
/**任务编号*/
@Excel(name = "任务编号", width = 15)
@ApiModelProperty(value = "任务编号")
private String rwbh;
/**开课单位*/
@Excel(name = "开课单位", width = 15, dicCode = "tkrszdw_view,college,college")
@Dict(dicCode = "tkrszdw_view,college,college")
@ApiModelProperty(value = "开课单位")
private String kkdw;
/**课程性质*/
@Excel(name = "课程性质", width = 15, dicCode = "kcxz")
@Dict(dicCode = "kcxz")
@ApiModelProperty(value = "课程性质")
private String kcxz;
/**教室编号*/
@Excel(name = "教室编号", width = 15)
private String jsbh;
/**上课地点*/
@Excel(name = "上课地点", width = 15)
@ApiModelProperty(value = "上课地点")
private String skdd;
/**授课时间*/
@Excel(name = "授课时间", width = 15)
@ApiModelProperty(value = "授课时间")
private String sksj;
/**上课周次*/
@Excel(name = "上课周次", width = 15, dicCode = "skzc")
@Dict(dicCode = "skzc")
@ApiModelProperty(value = "上课周次")
private String jkzc;
/**节次*/
@Excel(name = "节次", width = 15, dicCode = "skjc")
@Dict(dicCode = "skjc")
@ApiModelProperty(value = "节次")
private String hh;
/**星期几*/
@Excel(name = "周几", width = 15, dicCode = "week")
@Dict(dicCode = "week")
@ApiModelProperty(value = "星期几")
private String week;
/**课程开始时间*/
@Excel(name = "课程开始时间", width = 15)
@ApiModelProperty(value = "课程开始时间")
private String hhks;
/**课程结束时间*/
@Excel(name = "课程结束时间", width = 15)
@ApiModelProperty(value = "课程结束时间")
private String hhjs;
/**未知*/
@Excel(name = "未知", width = 15)
@ApiModelProperty(value = "未知")
private String dsz;
/**课程开始日期*/
@Excel(name = "课程开始日期", width = 15)
@ApiModelProperty(value = "课程开始日期")
private String wwks;
/**课程结束日期*/
@Excel(name = "课程结束日期", width = 15)
@ApiModelProperty(value = "课程结束日期")
private String wwjs;
/**直播方式*/
@Excel(name = "直播方式", width = 15, dicCode = "skpt")
@Dict(dicCode = "skpt")
@ApiModelProperty(value = "直播方式")
private String zbfs;
/**会议号*/
@Excel(name = "会议号", width = 15)
@ApiModelProperty(value = "会议号")
private String hyh;
/**会议密码*/
@Excel(name = "会议密码", width = 15)
@ApiModelProperty(value = "会议密码")
private String hymm;
/**课程链接*/
@Excel(name = "课程链接", width = 15)
@ApiModelProperty(value = "课程链接")
private String kclj;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String beizhu;
/**直播平台*/
@Excel(name = "直播平台", width = 15)
@ApiModelProperty(value = "直播平台")
private String zbpx;
/**开课单位id*/
@Excel(name = "开课单位id", width = 15)
@ApiModelProperty(value = "开课单位id")
private String kkdwid;
/**未知*/
@Excel(name = "未知", width = 15)
@ApiModelProperty(value = "未知")
private String jrfs;
/**二维码文件*/
@Excel(name = "二维码文件", width = 15)
@ApiModelProperty(value = "二维码文件")
private String ewmwj;
/**群名称*/
@Excel(name = "群名称", width = 15)
@ApiModelProperty(value = "群名称")
private String qmc;
/**群类型*/
@Excel(name = "群类型", width = 15)
@ApiModelProperty(value = "群类型")
private String qlx;
/**类型*/
@Excel(name = "类型", width = 15)
@ApiModelProperty(value = "类型")
private String leixing;
/**是否需要群主验证*/
@Excel(name = "是否需要群主验证", width = 15)
@ApiModelProperty(value = "是否需要群主验证")
private String isqzyz;
/**教课周次1*/
@Excel(name = "教课周次1", width = 15)
@ApiModelProperty(value = "教课周次1")
private String jkzc1;
/**学分*/
@Excel(name = "学分", width = 15)
@ApiModelProperty(value = "学分")
private String xf;
/**校区*/
@Excel(name = "校区", width = 15)
@ApiModelProperty(value = "校区")
private String xq;
/**教工号*/
@Excel(name = "教工号", width = 15)
@ApiModelProperty(value = "教工号")
private String jgh;
/**学年学期*/
@Excel(name = "学年学期", width = 15)
@ApiModelProperty(value = "学年学期")
private String xnxq;
/**教职工类别*/
@Excel(name = "教职工类别", width = 15)
@ApiModelProperty(value = "教职工类别")
private String jzglb;
/**是否出镜，0-出镜，1-不出镜*/
@Excel(name = "是否出镜，0-出镜，1-不出镜", width = 15)
@ApiModelProperty(value = "是否出镜，0-出镜，1-不出镜")
private Integer sfcj;
/**上课形式，0-线上，1-线下，2-线上线下混合*/
@Excel(name = "上课形式，0-线上，1-线下，2-线上线下混合", width = 15)
@ApiModelProperty(value = "上课形式，0-线上，1-线下，2-线上线下混合")
private Integer skxs;
/**是否正常？*/
@Excel(name = "是否正常？", width = 15)
@ApiModelProperty(value = "是否正常？")
private String sfzc;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String bz;
/**状态*/
@Excel(name = "状态", width = 15)
@ApiModelProperty(value = "状态")
private String zt;
private String kcdl;
private String szkc;//思政课程
private String xqxn;
private Date sjc;
/**课程名称或教师名*/
@TableField(exist = false)
private String searchInput;
@TableField(exist = false)
private String startTime;
@TableField(exist = false)
private String endTime;
@TableField(exist = false)
private String ts;
@TableField(exist = false)
private String ywcol;
}

1
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java
View File

@ -246,6 +246,7 @@ public class KcKetangbiao implements Serializable {
@Excel(name = "是否删除（0：未删除，1：已删除）", width = 15)
@ApiModelProperty(value = "是否删除（0：未删除，1：已删除）")
private java.lang.Integer isDelete;
private java.lang.String xnxq;

303
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiaoHis.java Normal file
View File

@ -0,0 +1,303 @@
package org.jeecg.modules.kc.ktgl.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 课堂管理-子表
* @Author: jeecg-boot
* @Date: 2023-04-01
* @Version: V1.0
*/
@Data
@TableName("kc_ketangbiao_his")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="kc_ketangbiao对象", description="课堂管理-子表")
public class KcKetangbiaoHis implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
// /**创建人登录名称*/
// @ApiModelProperty(value = "创建人登录名称")
// private java.lang.String createBy;
// /**创建日期*/
// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
// @DateTimeFormat(pattern="yyyy-MM-dd")
// @ApiModelProperty(value = "创建日期")
// private java.util.Date createTime;
// /**更新人登录名称*/
// @ApiModelProperty(value = "更新人登录名称")
// private java.lang.String updateBy;
// /**更新日期*/
// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
// @DateTimeFormat(pattern="yyyy-MM-dd")
// @ApiModelProperty(value = "更新日期")
// private java.util.Date updateTime;
// /**所属部门*/
// @ApiModelProperty(value = "所属部门")
// private java.lang.String sysOrgCode;
/**课程编号*/
@Excel(name = "课程编号", width = 15)
@ApiModelProperty(value = "课程编号")
private String kcbh;
/**课程名称*/
@Excel(name = "课程名称", width = 15)
@ApiModelProperty(value = "课程名称")
private String kcmc;
/**学分*/
@Excel(name = "学分", width = 15)
@ApiModelProperty(value = "学分")
private String xf;
/**授课教师*/
@Excel(name = "授课教师", width = 15)
@ApiModelProperty(value = "授课教师")
private String skjs;
/**职称*/
@Excel(name = "职称", width = 15)
@ApiModelProperty(value = "职称")
private String zc;
/**教职工类别*/
@Excel(name = "教职工类别", width = 15)
@ApiModelProperty(value = "教职工类别")
private String jzglb;
/**选课人数*/
@Excel(name = "选课人数", width = 15)
@ApiModelProperty(value = "选课人数")
private String xkrs;
/**评课人数*/
@Excel(name = "评课人数", width = 15)
@ApiModelProperty(value = "评课人数")
private String pkrs;
/**任务编号*/
@Excel(name = "任务编号", width = 15)
@ApiModelProperty(value = "任务编号")
private String rwbh;
/**开课单位*/
@Excel(name = "开课单位", width = 15, dicCode = "tkrszdw_view,college,college")
@Dict(dicCode = "tkrszdw_view,college,college")
@ApiModelProperty(value = "开课单位")
private String kkdw;
/**课程性质*/
@Excel(name = "课程性质", width = 15, dicCode = "kcxz")
@Dict(dicCode = "kcxz")
@ApiModelProperty(value = "课程性质")
private String kcxz;
/**教室编号*/
@Excel(name = "教室编号", width = 15)
private String jsbh;
/**上课地点*/
@Excel(name = "上课地点", width = 15)
@ApiModelProperty(value = "上课地点")
private String skdd;
/**上课时间*/
@Excel(name = "上课时间", width = 15)
@ApiModelProperty(value = "上课时间")
private String sksj;
/**未知*/
@Excel(name = "未知", width = 15)
@ApiModelProperty(value = "未知")
private String jkzc;
/**节次*/
@Excel(name = "节次", width = 15, dicCode = "skjc")
@Dict(dicCode = "skjc")
@ApiModelProperty(value = "节次")
private String hh;
/**周几*/
@Excel(name = "周几", width = 15, dicCode = "week")
@Dict(dicCode = "week")
@ApiModelProperty(value = "周几")
private String week;
/**开始时间*/
@Excel(name = "开始时间", width = 15)
@ApiModelProperty(value = "开始时间")
private String hhks;
/**结束时间*/
@Excel(name = "结束时间", width = 15)
@ApiModelProperty(value = "结束时间")
private String hhjs;
/**未知*/
@Excel(name = "未知", width = 15)
@ApiModelProperty(value = "未知")
private String dsz;
/**课堂开始日期*/
@Excel(name = "课堂开始日期", width = 15)
@ApiModelProperty(value = "课堂开始日期")
private String wwks;
/**课堂结束日期*/
@Excel(name = "课堂结束日期", width = 15)
@ApiModelProperty(value = "课堂结束日期")
private String wwjs;
/**直播方式*/
@Excel(name = "直播方式", width = 15, dicCode = "skpt")
@Dict(dicCode = "skpt")
@ApiModelProperty(value = "直播方式")
private String zbfs;
/**会议id*/
@Excel(name = "会议id", width = 15)
@ApiModelProperty(value = "会议id")
private String hyid;
/**会议号*/
@Excel(name = "会议号", width = 15)
@ApiModelProperty(value = "会议号")
private String hyh;
/**会议密码*/
@Excel(name = "会议密码", width = 15)
@ApiModelProperty(value = "会议密码")
private String hymm;
/**课程链接*/
@Excel(name = "课程链接", width = 15)
@ApiModelProperty(value = "课程链接")
private String kclj;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String beizhu;
/**直播平台*/
@Excel(name = "直播平台", width = 15)
@ApiModelProperty(value = "直播平台")
private String zbpx;
/**开课单位id*/
@Excel(name = "开课单位id", width = 15)
@ApiModelProperty(value = "开课单位id")
private Integer kkdwid;
/**上课日期*/
@Excel(name = "上课日期", width = 15)
@ApiModelProperty(value = "上课日期")
private String skrq;
/**课程表id*/
@Excel(name = "课程表id", width = 15)
@ApiModelProperty(value = "课程表id")
private Integer kechengbiaoid;
/**听课次数*/
@Excel(name = "听课次数", width = 15)
@ApiModelProperty(value = "听课次数")
private Integer tingkecishu;
/**开课周次*/
@Excel(name = "开课周次", width = 15, dicCode = "skzc")
@Dict(dicCode = "skzc")
@ApiModelProperty(value = "开课周次")
private String kkzc;
/**第几周*/
@Excel(name = "第几周", width = 15)
@ApiModelProperty(value = "第几周")
private Integer dijizhou;
/**未知*/
@Excel(name = "未知", width = 15)
@ApiModelProperty(value = "未知")
private String jkzc1;
/**是否停课*/
@Excel(name = "是否停课", width = 15)
@ApiModelProperty(value = "是否停课")
private Integer sftk;
/**停课原因*/
@Excel(name = "停课原因", width = 15)
@ApiModelProperty(value = "停课原因")
private String tkyy;
/**补课计划*/
@Excel(name = "补课计划", width = 15)
@ApiModelProperty(value = "补课计划")
private String bkjh;
/**是否出镜，0-出镜，1-不出镜*/
@Excel(name = "是否出镜，0-出镜，1-不出镜", width = 15)
@ApiModelProperty(value = "是否出镜，0-出镜，1-不出镜")
private Integer sfcj;
/**上课形式，0-线上，1-线下，2-线上线下混合*/
@Excel(name = "上课形式，0-线上，1-线下，2-线上线下混合", width = 15)
@ApiModelProperty(value = "上课形式，0-线上，1-线下，2-线上线下混合")
private Integer skxs;
/**未知*/
@Excel(name = "未知", width = 15)
@ApiModelProperty(value = "未知")
private Integer kechengbiao1;
/**是否新生课 0 = 是*/
@Excel(name = "是否新生课 0 = 是", width = 15)
@ApiModelProperty(value = "是否新生课 0 = 是")
private String sfxsk;
/**教工号*/
@Excel(name = "教工号", width = 15)
@ApiModelProperty(value = "教工号")
private String jgh;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String bz;
/**状态*/
@Excel(name = "状态", width = 15)
@ApiModelProperty(value = "状态")
private String zt;
/**是否删除（0：未删除，1：已删除）*/
@Excel(name = "是否删除（0：未删除，1：已删除）", width = 15)
@ApiModelProperty(value = "是否删除（0：未删除，1：已删除）")
private Integer isDelete;
private String xnxq;
private Date sjc;
@TableField(exist = false)
private String jssj;
@TableField(exist = false)
private String ywmc;
@TableField(exist = false)
private String ywTime;
@TableField(exist = false)
private String ywskxs;
@TableField(exist = false)
private String sfyy;
@TableField(exist = false)
private String userid;
@TableField(exist = false)
private Integer isdeleted;
@TableField(exist = false)
private String startTime;
@TableField(exist = false)
private String endTime;
@TableField(exist = false)
private String xh;
@TableField(exist = false)
private String xjkssj;
@TableField(exist = false)
private String stars;
@TableField(exist = false)
private String ts;
@TableField(exist = false)
private String zhjsId;
@TableField(exist = false)
private String sfyzhjs;
@TableField(exist = false)
private String jzwh;
@TableField(exist = false)
private String szkc;
@TableField(exist = false)
private boolean searchByNowXqxn;
@TableField(exist = false)
private String score;
@TableField(exist = false)
private String jspjPjf;
@TableField(exist = false)
private String xspjPjf;
}

14
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoHisMapper.java Normal file
View File

@ -0,0 +1,14 @@
package org.jeecg.modules.kc.ktgl.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.kc.ktgl.entity.KcKechengbiaoHis;
/**
* @Description: 课程管理-主表
* @Author: jeecg-boot
* @Date: 2023-04-01
* @Version: V1.0
*/
public interface KcKechengbiaoHisMapper extends BaseMapper<KcKechengbiaoHis> {
}

13
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoHisMapper.java Normal file
View File

@ -0,0 +1,13 @@
package org.jeecg.modules.kc.ktgl.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiaoHis;
/**
* @Description: 课堂管理-子表
* @Author: jeecg-boot
* @Date: 2023-04-01
* @Version: V1.0
*/
public interface KcKetangbiaoHisMapper extends BaseMapper<KcKetangbiaoHis> {
}

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoHisMapper.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.kc.ktgl.mapper.KcKechengbiaoHisMapper">
</mapper>

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
View File

@ -6,7 +6,7 @@
insert into kc_kechengbiao (
kcbh,kcmc,skjs,zc,xkrs,pkrs,rwbh,kkdw,kcxz,skdd,sksj,jkzc,hh,week,hhks,hhjs,dsz,
wwks,wwjs,zbfs,hyh,hymm,kclj,beizhu,zbpx,kkdwid,
jrfs,ewmwj,qmc,qlx,leixing,isqzyz,jkzc1,xf,xq,jgh,xnxq,jzglb,sfcj,skxs,sfzc,bz,zt,kcdl
jrfs,ewmwj,qmc,qlx,leixing,isqzyz,jkzc1,xf,xq,jgh,xnxq,jzglb,sfcj,skxs,sfzc,bz,zt,kcdl,xqxn
) select
kcbh,kcmc,xm as skjs,zc,xkrs,pkrs,rwbh,kkdw,kcxz,skdd,sksj,
substring(jkzc,2,length(jkzc)-2) as jkzc,concat(substring(sksj,2,2),'、',substring(sksj,4,2)) as hh,substring(sksj,1,1) as week,
@ -17,7 +17,7 @@
when xqbh = 'J' then '净月'
when xqbh = 'U' then '全部'
ELSE '' END as xq,
jgh,xnxq,jzglb,1 as sfcj,sfxsk as skxs,'' as sfzc,'' as bz,'' as zt,kcdl
jgh,xnxq,jzglb,1 as sfcj,sfxsk as skxs,'' as sfzc,'' as bz,'' as zt,kcdl,#{xqxn}
from xxhbkckb t,kc_jieci jc where concat(substring(sksj,2,2),'、',substring(sksj,4,2)) = jc.jieci and t.kcdl != '毕业设计'
<!-- <if test="startTime != null and startTime != ''">-->
<!-- and sksj > #{startTime}-->

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoHisMapper.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.kc.ktgl.mapper.KcKetangbiaoHisMapper">
</mapper>

15
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoHisService.java Normal file
View File

@ -0,0 +1,15 @@
package org.jeecg.modules.kc.ktgl.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.kc.ktgl.entity.KcKechengbiaoHis;
/**
* @Description: 课程管理-主表
* @Author: jeecg-boot
* @Date: 2023-04-01
* @Version: V1.0
*/
public interface IKcKechengbiaoHisService extends IService<KcKechengbiaoHis> {
}

14
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoHisService.java Normal file
View File

@ -0,0 +1,14 @@
package org.jeecg.modules.kc.ktgl.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiaoHis;
/**
* @Description: 课堂管理-子表
* @Author: jeecg-boot
* @Date: 2023-04-01
* @Version: V1.0
*/
public interface IKcKetangbiaoHisService extends IService<KcKetangbiaoHis> {
}

18
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoHisServiceImpl.java Normal file
View File

@ -0,0 +1,18 @@
package org.jeecg.modules.kc.ktgl.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.kc.ktgl.entity.KcKechengbiaoHis;
import org.jeecg.modules.kc.ktgl.mapper.KcKechengbiaoHisMapper;
import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoHisService;
import org.springframework.stereotype.Service;
/**
* @Description: 课程管理-主表
* @Author: jeecg-boot
* @Date: 2023-04-01
* @Version: V1.0
*/
@Service
public class KcKechengbiaoHisServiceImpl extends ServiceImpl<KcKechengbiaoHisMapper, KcKechengbiaoHis> implements IKcKechengbiaoHisService {
}

28
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoHisServiceImpl.java Normal file
View File

@ -0,0 +1,28 @@
package org.jeecg.modules.kc.ktgl.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiaoHis;
import org.jeecg.modules.kc.ktgl.mapper.KcKetangbiaoHisMapper;
import org.jeecg.modules.kc.ktgl.mapper.KcKetangbiaoMapper;
import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoHisService;
import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* @Description: 课堂管理-子表
* @Author: jeecg-boot
* @Date: 2023-04-01
* @Version: V1.0
*/
@Service
public class KcKetangbiaoHisServiceImpl extends ServiceImpl<KcKetangbiaoHisMapper, KcKetangbiaoHis> implements IKcKetangbiaoHisService {
}