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 new file mode 100644 index 00000000..039c711d --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java @@ -0,0 +1,238 @@ +package org.jeecg.modules.kc.tktj.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.kc.tktj.entity.KcTingke; +import org.jeecg.modules.kc.tktj.service.IKcTingkeService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: kc_tingke + * @Author: jeecg-boot + * @Date: 2023-03-29 + * @Version: V1.0 + */ +@Api(tags="kc_tingke") +@RestController +@RequestMapping("/kcTingke/kcTingke") +@Slf4j +public class KcTingkeController extends JeecgController { + @Autowired + private IKcTingkeService kcTingkeService; + + /** + * 分页列表查询 + * + * @param kcTingke + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "kc_tingke-分页列表查询") + @ApiOperation(value="kc_tingke-分页列表查询", notes="kc_tingke-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(KcTingke kcTingke, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcTingke, req.getParameterMap()); + queryWrapper.ge(StringUtils.isNotBlank(kcTingke.getStartTime()),"tk.skrq",kcTingke.getStartTime()); + queryWrapper.le(StringUtils.isNotBlank(kcTingke.getEndTime()),"tk.skrq",kcTingke.getEndTime()+" 23:59:59"); + + queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getTksf()),"au.assesscode",kcTingke.getTksf()); + queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getSzdw()),"tk.tkdw",kcTingke.getSzdw()); + queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKkdw()),"au.dwmc",kcTingke.getKkdw()); + queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKcxz()),"tk.kcxz",kcTingke.getKcxz()); + + Page page = new Page(pageNo, pageSize); + IPage pageList = kcTingkeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param kcTingke + * @return + */ + @AutoLog(value = "kc_tingke-添加") + @ApiOperation(value="kc_tingke-添加", notes="kc_tingke-添加") + @RequiresPermissions("kcTingke:kc_tingke:add") + @PostMapping(value = "/add") + public Result add(@RequestBody KcTingke kcTingke) { + kcTingkeService.save(kcTingke); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param kcTingke + * @return + */ + @AutoLog(value = "kc_tingke-编辑") + @ApiOperation(value="kc_tingke-编辑", notes="kc_tingke-编辑") + @RequiresPermissions("kcTingke:kc_tingke:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody KcTingke kcTingke) { + kcTingkeService.updateById(kcTingke); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "kc_tingke-通过id删除") + @ApiOperation(value="kc_tingke-通过id删除", notes="kc_tingke-通过id删除") + @RequiresPermissions("kcTingke:kc_tingke:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + kcTingkeService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "kc_tingke-批量删除") + @ApiOperation(value="kc_tingke-批量删除", notes="kc_tingke-批量删除") + @RequiresPermissions("kcTingke:kc_tingke:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.kcTingkeService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "kc_tingke-通过id查询") + @ApiOperation(value="kc_tingke-通过id查询", notes="kc_tingke-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + KcTingke kcTingke = kcTingkeService.getById(id); + if(kcTingke==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(kcTingke); + } + + /** + * 导出excel + * + * @param request + * @param kcTingke + */ + @RequiresPermissions("kcTingke:kc_tingke:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, KcTingke kcTingke) { + return super.exportXls(request, kcTingke, KcTingke.class, "kc_tingke"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("kcTingke:kc_tingke:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, KcTingke.class); + } + + + @ApiOperation(value="kc_tingke-分页列表查询", notes="kc_tingke-分页列表查询") + @GetMapping(value = "/getTkmxlist") + public Result> getTkmxlist(KcTingke kcTingke, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcTingke, req.getParameterMap()); + queryWrapper.ge(StringUtils.isNotBlank(kcTingke.getStartTime()),"tk.tingketime",kcTingke.getStartTime()); + queryWrapper.le(StringUtils.isNotBlank(kcTingke.getEndTime()),"tk.tingketime",kcTingke.getEndTime()+" 23:59:59"); + queryWrapper.like(StringUtils.isNotBlank(kcTingke.getJsxm()),"cn",kcTingke.getJsxm()); + queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getSzdw()),"college",kcTingke.getSzdw()); + queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getTksf()),"sf.assesscode",kcTingke.getTksf()); + +// AND ( cn LIKE '%jiaoshi%' ) +// AND c.college = '国际合作与交流处' +// AND assesscode = '1101' +// queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getTksf()),"assesscode",kcTingke.getTksf()); +// queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getSzdw()),"tkdw",kcTingke.getSzdw()); +// queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKkdw()),"dwmc",kcTingke.getKkdw()); +// queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKcxz()),"kcxz",kcTingke.getKcxz()); + + Page page = new Page(pageNo, pageSize); + IPage pageList = kcTingkeService.getTkmxlist(page, queryWrapper); + return Result.OK(pageList); + } + + + @GetMapping(value = "/getKkdwlist") + public Result> getKkdwlist(KcTingke kcTingke, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + if(StringUtils.isNotBlank(kcTingke.getEndTime())){ + kcTingke.setEndTime(kcTingke.getEndTime()+" 23:59:59"); + } + IPage pageList = kcTingkeService.getKkdwlist(page, kcTingke); + return Result.OK(pageList); + } + + + /** + * 听课周统计 echarts + * @param kcTingke + * @return + */ + @GetMapping(value = "/getTkztjList") + public Result> getTkztjList(KcTingke kcTingke) { + List pageList = kcTingkeService.getTkztjList(kcTingke); + return Result.OK(pageList); + } + + /** + * 听课覆盖率统计 echarts + * @param kcTingke + * @return + */ + @GetMapping(value = "/getTkfglList") + public Result> getTkfglList(KcTingke kcTingke) { + List pageList = kcTingkeService.getTkfglList(kcTingke); + return Result.OK(pageList); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java new file mode 100644 index 00000000..134a1584 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java @@ -0,0 +1,172 @@ +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 +@TableName("kc_tingke") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="kc_tingke对象", description="kc_tingke") +public class KcTingke implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**听课时间*/ + @Excel(name = "听课时间", width = 15) + @ApiModelProperty(value = "听课时间") + private java.lang.String tingketime; + /**检查时间*/ + @Excel(name = "检查时间", width = 15) + @ApiModelProperty(value = "检查时间") + private java.lang.String jianchatime; + /**课程表id*/ + @Excel(name = "课程表id", width = 15) + @ApiModelProperty(value = "课程表id") + private java.lang.String kechengbiaoid; + /**用户id*/ + @Excel(name = "用户id", width = 15) + @ApiModelProperty(value = "用户id") + private java.lang.String userid; + /**用户名*/ + @Excel(name = "用户名", width = 15) + @ApiModelProperty(value = "用户名") + private java.lang.String username; + /**用户单位名称*/ + @Excel(name = "用户单位名称", width = 15) + @ApiModelProperty(value = "用户单位名称") + private java.lang.String userdwmc; + /**usertksf1*/ + @Excel(name = "usertksf1", width = 15) + @ApiModelProperty(value = "usertksf1") + private java.lang.String usertksf1; + /**usertksf2*/ + @Excel(name = "usertksf2", width = 15) + @ApiModelProperty(value = "usertksf2") + private java.lang.String usertksf2; + /**usertksfcode*/ + @Excel(name = "usertksfcode", width = 15) + @ApiModelProperty(value = "usertksfcode") + private java.lang.String usertksfcode; + /**usertkyq*/ + @Excel(name = "usertkyq", width = 15) + @ApiModelProperty(value = "usertkyq") + private java.lang.Integer usertkyq; + /**创建人*/ + @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 tksf1; + @TableField(exist = false) + private java.lang.String tkyq; + @TableField(exist = false) + private java.lang.String sjtksl; + @TableField(exist = false) + private java.lang.String mltksl; + @TableField(exist = false) + private java.lang.String tkdw; + @TableField(exist = false) + private java.lang.String startTime; + @TableField(exist = false) + private java.lang.String endTime; + + @TableField(exist = false) + private java.lang.String college; + @TableField(exist = false) + private java.lang.String tksf; + @TableField(exist = false) + private java.lang.String kkdw; + @TableField(exist = false) + private java.lang.String kcmc; + @TableField(exist = false) + private java.lang.String kcxz; + @TableField(exist = false) + private java.lang.String skjs; + @TableField(exist = false) + private java.lang.String zc; + @TableField(exist = false) + private java.lang.String jc; + + @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; + +// 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 new file mode 100644 index 00000000..89ed1261 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java @@ -0,0 +1,28 @@ +package org.jeecg.modules.kc.tktj.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.kc.tktj.entity.KcTingke; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + * @Description: kc_tingke + * @Author: jeecg-boot + * @Date: 2023-03-29 + * @Version: V1.0 + */ +public interface KcTingkeMapper extends BaseMapper { + + IPage getTkmxlist(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage getKkdwlist(Page page, KcTingke kcTingke); + + List getTkztjList(KcTingke kcTingke); + + List getTkfglList(KcTingke kcTingke); +} 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 new file mode 100644 index 00000000..cb787567 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml @@ -0,0 +1,340 @@ + + + + + + + + + + + + + + \ 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 new file mode 100644 index 00000000..efab53c5 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java @@ -0,0 +1,26 @@ +package org.jeecg.modules.kc.tktj.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.modules.kc.tktj.entity.KcTingke; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + * @Description: kc_tingke + * @Author: jeecg-boot + * @Date: 2023-03-29 + * @Version: V1.0 + */ +public interface IKcTingkeService extends IService { + + IPage getTkmxlist(Page page, QueryWrapper queryWrapper); + + IPage getKkdwlist(Page page, KcTingke kcTingke); + + List getTkztjList(KcTingke kcTingke); + + List getTkfglList(KcTingke kcTingke); +} 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 new file mode 100644 index 00000000..d244c243 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java @@ -0,0 +1,43 @@ +package org.jeecg.modules.kc.tktj.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 org.jeecg.modules.kc.tktj.entity.KcTingke; +import org.jeecg.modules.kc.tktj.mapper.KcTingkeMapper; +import org.jeecg.modules.kc.tktj.service.IKcTingkeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.List; + +/** + * @Description: kc_tingke + * @Author: jeecg-boot + * @Date: 2023-03-29 + * @Version: V1.0 + */ +@Service +public class KcTingkeServiceImpl extends ServiceImpl implements IKcTingkeService { + + @Override + public IPage getTkmxlist(Page page, QueryWrapper queryWrapper) { + return baseMapper.getTkmxlist(page,queryWrapper); + } + + @Override + public IPage getKkdwlist(Page page, KcTingke kcTingke) { + return baseMapper.getKkdwlist(page,kcTingke); + } + + @Override + public List getTkztjList(KcTingke kcTingke) { + return baseMapper.getTkztjList(kcTingke); + } + + @Override + public List getTkfglList(KcTingke kcTingke) { + return baseMapper.getTkfglList(kcTingke); + } +}