diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSuggestions/controller/KcSuggestionsController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSuggestions/controller/KcSuggestionsController.java index 9a48f78f..15bcaf8e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSuggestions/controller/KcSuggestionsController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSuggestions/controller/KcSuggestionsController.java @@ -71,7 +71,7 @@ public class KcSuggestionsController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcSuggestions, req.getParameterMap()); queryWrapper.ge(StringUtils.isNotBlank(kcSuggestions.getStartTime()),"suggestionstime",kcSuggestions.getStartTime()); - queryWrapper.le(StringUtils.isNotBlank(kcSuggestions.getEndTime()),"suggestionstime",kcSuggestions.getEndTime()); + queryWrapper.le(StringUtils.isNotBlank(kcSuggestions.getEndTime()),"suggestionstime",kcSuggestions.getEndTime()+" 23:59:59"); Page page = new Page(pageNo, pageSize); IPage pageList = kcSuggestionsService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java index 69da87de..ee529fa5 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java @@ -16,6 +16,7 @@ import org.jeecg.modules.kc.qa.entity.KcEvaluation; import org.jeecg.modules.kc.qa.service.IKcEvaluationService; import org.jeecg.modules.kc.tktj.entity.KcKkdw; import org.jeecg.modules.kc.tktj.entity.KcTingke; +import org.jeecg.modules.kc.tktj.entity.KcTkmx; import org.jeecg.modules.kc.tktj.service.IKcTingkeService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -359,7 +360,30 @@ public class KcTingkeController extends JeecgController pageList = kcTingkeService.getHtindexTkmxlist(kcTingke); return Result.OK(pageList); } + @RequestMapping(value = "/exportTkmxXls") + public ModelAndView exportTkmxXls(KcTkmx kcTkmx, HttpServletRequest request) { + String title = "听课明细"; + // Step.1 组装查询条件 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + // 过滤选中数据 + // Step.2 获取导出数据 + List exportList = kcTingkeService.selectTkmxExportList(kcTkmx); + + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, title); + mv.addObject(NormalExcelConstants.CLASS, KcTkmx.class); + //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- + ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); + exportParams.setImageBasePath(upLoadPath); + //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + return mv; + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTkmx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTkmx.java new file mode 100644 index 00000000..4fb6d2fc --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTkmx.java @@ -0,0 +1,223 @@ +package org.jeecg.modules.kc.tktj.entity; + +import java.io.Serializable; + +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 lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: kc_tingke + * @Author: jeecg-boot + * @Date: 2023-03-29 + * @Version: V1.0 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +public class KcTkmx implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + + /**用户id*/ + @Excel(name = "工号", width = 15) + @ApiModelProperty(value = "工号") + private java.lang.String userid; + + /**用户名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String username; + + /**usertksf1*/ + @Excel(name = "所在单位", width = 15) + @ApiModelProperty(value = "所在单位") + private java.lang.String college; + + /**听课身份*/ + @Excel(name = "听课身份", width = 15) + @ApiModelProperty(value = "听课身份") + @TableField(exist = false) + private java.lang.String tksf; + + @Excel(name = "开课单位", width = 15) + private java.lang.String kkdw; + + @Excel(name = "课程名称", width = 15) + private java.lang.String kcmc; + + @Excel(name = "课程性质", width = 15) + private java.lang.String kcxz; + + @Excel(name = "任课教师", width = 15) + private java.lang.String skjs; + + @Excel(name = "周次", width = 15) + private java.lang.String zc; + + @Excel(name = "节次", width = 15) + private java.lang.String jc; + + @Excel(name = "听课时间", width = 15) + private java.lang.String tingketime; + + + + @TableField(exist = false) + private java.lang.String tkyq; + + @TableField(exist = false) + private java.lang.String sjtksl; + + @TableField(exist = false) + private java.lang.String mltksl; + + private java.lang.String tkdw; + + private java.lang.Integer usertkyq; + private java.lang.String usertksf1; + + + /**听课时间*/ + /**检查时间*/ + private java.lang.String jianchatime; + /**课程表id*/ + private java.lang.String kechengbiaoid; + /**用户单位名称*/ + private java.lang.String userdwmc; + /**usertksf2*/ + private java.lang.String usertksf2; + /**usertksfcode*/ + private java.lang.String usertksfcode; + /**创建人*/ + @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; + + @TableField(exist = false) + private java.lang.String startTime; + @TableField(exist = false) + private java.lang.String endTime; + + + @TableField(exist = false) + private java.lang.String kkdwid; + @TableField(exist = false) + private java.lang.String kkkts; + @TableField(exist = false) + private java.lang.String tkkts; + @TableField(exist = false) + private java.lang.String tkrcs; + @TableField(exist = false) + private java.lang.String pkrcs; + @TableField(exist = false) + private java.lang.String pkkts; + @TableField(exist = false) + private java.lang.String bdwpkrcs; + @TableField(exist = false) + private java.lang.String bdwtkrcs; + @TableField(exist = false) + private java.lang.String bdwtks; + @TableField(exist = false) + private java.lang.String bdwpks; + @TableField(exist = false) + private java.lang.String kssl; + @TableField(exist = false) + private java.lang.String assesscode; + @TableField(exist = false) + private java.lang.String dwjc; + @TableField(exist = false) + private java.lang.String ljtkv; + @TableField(exist = false) + private java.lang.String avgtkv; + @TableField(exist = false) + private java.lang.String jrtkv; + @TableField(exist = false) + private java.lang.String jravgtkv; + @TableField(exist = false) + private java.lang.String xsid; + @TableField(exist = false) + private java.lang.String skrq; + @TableField(exist = false) + private java.lang.String szdw; + @TableField(exist = false) + private java.lang.String jsxm; + + @TableField(exist = false) + private java.lang.String pkrc; + @TableField(exist = false) + private java.lang.String ljqxpkrl; + + @TableField(exist = false) + private java.lang.Integer pageKs; + @TableField(exist = false) + private java.lang.Integer pageJs; + @TableField(exist = false) + private java.lang.String type; + + /** + * 课程名和教程明 + */ + @TableField(exist = false) + private java.lang.String searchInput; + + /** + * 是否评价，0否，1是，空全部 + */ + @TableField(exist = false) + private java.lang.String pj; + + + /** + * 分页 + */ + @TableField(exist = false) + private Integer pageSize; + + /** + * 开始时间搜索 + */ + @TableField(exist = false) + private String startDate; + + /** + * 结束时间搜索 + */ + @TableField(exist = false) + private String endDate; + + /** + * 节次 + */ + @TableField(exist = false) + private String hh; +// private java.lang.String tingketime; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java index 45060033..01f76110 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java @@ -9,6 +9,7 @@ import org.apache.poi.ss.formula.functions.T; import org.jeecg.modules.kc.tktj.entity.KcKkdw; import org.jeecg.modules.kc.tktj.entity.KcTingke; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.kc.tktj.entity.KcTkmx; import java.util.List; import java.util.Map; @@ -38,4 +39,6 @@ public interface KcTingkeMapper extends BaseMapper { IPage queryPageList(Page page, KcTingke kcTingke); List selectKkdwExportList(KcKkdw kcKkdw); + + List selectTkmxExportList(KcTkmx kcTkmx); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml index 11e0d73e..7849b892 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml @@ -430,6 +430,10 @@ AND tk.userid = #{userid} + + and kt.kkdw = #{kkdw} + + ORDER BY tk.tingketime DESC LIMIT 3 @@ -469,10 +473,10 @@ and tk.hh = #{hh} - + and score is null - + and score is not null @@ -715,4 +719,35 @@ ORDER BY tk.kkdwid + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java index 45062a81..6650dd45 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.kc.tktj.entity.KcKkdw; import org.jeecg.modules.kc.tktj.entity.KcTingke; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.kc.tktj.entity.KcTkmx; import java.util.List; import java.util.Map; @@ -35,4 +36,6 @@ public interface IKcTingkeService extends IService { IPage queryPageList(Page page, KcTingke kcTingke); List selectKkdwExportList(KcKkdw kcKkdw); + + List selectTkmxExportList(KcTkmx kcTkmx); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java index 3f7bbe3b..37a044b8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.poi.ss.formula.functions.T; import org.jeecg.modules.kc.tktj.entity.KcKkdw; import org.jeecg.modules.kc.tktj.entity.KcTingke; +import org.jeecg.modules.kc.tktj.entity.KcTkmx; import org.jeecg.modules.kc.tktj.mapper.KcTingkeMapper; import org.jeecg.modules.kc.tktj.service.IKcTingkeService; import org.springframework.stereotype.Service; @@ -68,4 +69,9 @@ public class KcTingkeServiceImpl extends ServiceImpl i public List selectKkdwExportList(KcKkdw kcKkdw) { return baseMapper.selectKkdwExportList(kcKkdw); } + + @Override + public List selectTkmxExportList(KcTkmx kcTkmx) { + return baseMapper.selectTkmxExportList(kcTkmx); + } }