diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/controller/KcSysConfigController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/controller/KcSysConfigController.java index 164ab61d..07460d29 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/controller/KcSysConfigController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/controller/KcSysConfigController.java @@ -200,10 +200,10 @@ public class KcSysConfigController extends JeecgController pageList = kcTingkeService.queryPageList(page, kcTingke); return Result.OK(pageList); } + + + @ApiOperation(value="kc_tingke-分页列表查询", notes="kc_tingke-分页列表查询") + @GetMapping(value = "/indexListPage") + public Result indexListPage(KcTingke kcTingke, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",kcTingke, req.getParameterMap()); + queryWrapper.apply(StringUtils.isNotBlank(kcTingke.getSearchInput()),"( a.kcmc like '%"+kcTingke.getSearchInput()+"%' or a.skjs like '%"+kcTingke.getSearchInput()+"%')"); + queryWrapper.ge(StringUtils.isNotBlank(kcTingke.getStartTime()),"a.tingketime",kcTingke.getStartDate()); + queryWrapper.le(StringUtils.isNotBlank(kcTingke.getEndTime()),"a.tingketime",kcTingke.getEndDate()+" 23:59:59"); + queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKkdw()),"a.kkdw",kcTingke.getKkdw()); + queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getHh()),"a.hh",kcTingke.getHh()); + if("0".equals(kcTingke.getPj())){ + queryWrapper.apply("score is null"); + }else if("1".equals(kcTingke.getPj())){ + queryWrapper.apply("score is not null"); + } + Page page = new Page(pageNo, pageSize); + IPage> pageList = kcTingkeService.indexListPage(page, queryWrapper); + 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 index 9fa16691..773ced15 100644 --- 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 @@ -223,5 +223,32 @@ public class KcTingke implements Serializable { @TableField(exist = false) private String ketangbiaoid; + @TableField(exist = false) + private String evaluationver; + @TableField(exist = false) + private String tkrq; + @TableField(exist = false) + private String shijian; + @TableField(exist = false) + private String hq; + @TableField(exist = false) + private String mq; + @TableField(exist = false) + private String WEEK; + @TableField(exist = false) + private String evaluationid; + @TableField(exist = false) + private String source; + @TableField(exist = false) + private String suibiId; + @TableField(exist = false) + private String suibiNotes; + @TableField(exist = false) + private String skdd; + @TableField(exist = false) + private String bh; + @TableField(exist = false) + private String kcbh; + // 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 ccbe5a34..077ed0fc 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 @@ -43,4 +43,6 @@ public interface KcTingkeMapper extends BaseMapper { List selectTkmxExportList(KcTkmx kcTkmx); List getSftk(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage> indexListPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } 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 9866967e..4071ce6d 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 @@ -46,7 +46,7 @@ AND (tk.username like CONCAT('%',#{kcTingke.username},'%') or tk.userid like CONCAT('%',#{kcTingke.username},'%')) - AND tk.userid =#{userid} + AND tk.userid =#{kcTingke.userid} GROUP BY tk.userid, tk.username, college ) tk LEFT JOIN ( @@ -780,4 +780,61 @@ select * from kc_tingke ${ew.customSqlSegment} + + + + + + \ 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 01fdc30a..a5009803 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 @@ -40,4 +40,6 @@ public interface IKcTingkeService extends IService { List selectTkmxExportList(KcTkmx kcTkmx); List getSftk(QueryWrapper queryWrapper); + + IPage> indexListPage(Page page, QueryWrapper queryWrapper); } 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 8b7cbf25..626824b9 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 @@ -79,4 +79,9 @@ public class KcTingkeServiceImpl extends ServiceImpl i public List getSftk(QueryWrapper queryWrapper) { return baseMapper.getSftk(queryWrapper); } + + @Override + public IPage> indexListPage(Page page, QueryWrapper queryWrapper) { + return baseMapper.indexListPage(page,queryWrapper); + } }