From ec498256c107854350bb072d3894063361f8d0d1 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 20 Mar 2024 15:16:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SynchronizationService/SyncKcktStat.java | 12 ++ .../controller/KcSysConfigController.java | 18 ++- .../kc/kcSysConfig/entity/KcSysConfig.java | 10 +- .../controller/KcTingkeBmdController.java | 14 ++ .../controller/KcKetangbiaoController.java | 82 ++++++---- .../modules/kc/ktgl/entity/KcKetangbiao.java | 17 ++ .../kc/ktgl/entity/KcKetangbiaoNum.java | 21 +++ .../kc/ktgl/mapper/KcKechengbiaoMapper.java | 2 + .../kc/ktgl/mapper/KcKetangbiaoMapper.java | 8 +- .../ktgl/mapper/xml/KcKechengbiaoMapper.xml | 17 ++ .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 152 +++++++++++++++++- .../ktgl/service/IKcKechengbiaoService.java | 2 + .../kc/ktgl/service/IKcKetangbiaoService.java | 8 +- .../impl/KcKechengbiaoServiceImpl.java | 4 + .../service/impl/KcKetangbiaoServiceImpl.java | 18 ++- .../kc/tktj/mapper/xml/KcTingkeMapper.xml | 17 +- 16 files changed, 352 insertions(+), 50 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java index e478f0da..aeee1aeb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java @@ -110,6 +110,17 @@ public class SyncKcktStat extends BaseSync { kcKechengbiaoService.removeCfsj(KcKechengbiao); //------------------去除课程表重复数据 20231024新增----------------- + + + //------------------刨除指定表的数据 20240314新增 修改flag标志位---------------- + KcKechengbiao ktbExculde = new KcKechengbiao(); + ktbExculde.setXnxq(kcSysConfig.getFlag1()); + kcKechengbiaoService.updateKechengExculde(ktbExculde); + //------------------刨除指定表的数据 20240314新增 修改flag标志位---------------- + + + + //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- QueryWrapper KcKetangbiaoQueryWrapper = new QueryWrapper<>(); KcKetangbiaoQueryWrapper.eq("xnxq",kcSysConfig.getFlag1()); @@ -121,6 +132,7 @@ public class SyncKcktStat extends BaseSync { //插入数据 KcKetangbiao kcKetangbiao = new KcKetangbiao(); kcKetangbiao.setXnxq(kcSysConfig.getFlag1()); + kcKetangbiao.setFlag("0"); List list = kcKetangbiaoService.selectSyncList(kcKetangbiao); List arrayList = new ArrayList<>(); for(int i=0;i queryById(@RequestParam(name="id",required=true) String id) { KcSysConfig kcSysConfig = kcSysConfigService.getById(id); - if(kcSysConfig==null) { - return Result.error("未找到对应数据"); + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper query = new QueryWrapper(); + query.eq("jgh", user.getUsername()); + query.eq("xnxq", kcSysConfig.getFlag1()); + query.last("limit 1"); + KcTingkeBmd kcTingkeBmd = kcTingkeBmdService.getOne(query); + if(kcTingkeBmd==null) { + kcSysConfig.setSfbmd("n"); + }else{ + kcSysConfig.setSfbmd("y"); } return Result.OK(kcSysConfig); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/entity/KcSysConfig.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/entity/KcSysConfig.java index f203d995..7bb2441a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/entity/KcSysConfig.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/entity/KcSysConfig.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -108,4 +106,8 @@ public class KcSysConfig implements Serializable { @ApiModelProperty(value = "智慧教室播放错误提示文字") private java.lang.String videoPlayErrTitle; private java.lang.String flag9;//今日课表听课按钮 + + //是否白名单 y是 n否 + @TableField(exist = false) + private String sfbmd;//是否白名单 } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/controller/KcTingkeBmdController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/controller/KcTingkeBmdController.java index ab7c4454..ea2ab855 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/controller/KcTingkeBmdController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/controller/KcTingkeBmdController.java @@ -259,4 +259,18 @@ public class KcTingkeBmdController { return Result.OK("文件导入失败！"); } + + @ApiOperation(value="听课白名单教师信息-通过jgh查询", notes="听课白名单教师信息-通过id查询") + @GetMapping(value = "/getBmdInfo") + public Result getBmdInfo(@RequestParam(name="jgh",required=true) String jgh) { + QueryWrapper query = new QueryWrapper(); + query.eq("jgh", jgh); + query.last("limit 1"); + KcTingkeBmd kcTingkeBmd = kcTingkeBmdService.getOne(query); + if(kcTingkeBmd==null) { + return Result.OK("n"); + }else{ + return Result.OK("y"); + } + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java index e7cac616..d0e83347 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java @@ -835,28 +835,17 @@ public class KcKetangbiaoController extends JeecgController getKtcountList(KcKetangbiao kcKetangbiao, + @GetMapping(value = "/getKccountList") + public Result getKccountList(KcKetangbiao kcKetangbiao, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap()); + Page> page = new Page<>(pageNo, pageSize); if(StringUtils.isBlank(kcKetangbiao.getXnxq())){ KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); - queryWrapper.ge("skrq",kcSysConfig.getBxqkssj()); - queryWrapper.le("skrq",kcSysConfig.getBxqjssj()+" 23:59:59"); - }else{ - QueryWrapper kcXqxnHistoryQueryWrapper = new QueryWrapper(); - kcXqxnHistoryQueryWrapper.eq("title",kcKetangbiao.getXnxq()); - kcXqxnHistoryQueryWrapper.last("limit 1"); - KcXqxnHistory KcXqxnHistory = kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper); - queryWrapper.ge("skrq",KcXqxnHistory.getStartTime()); - queryWrapper.le("skrq",KcXqxnHistory.getEndTime()+" 23:59:59"); + kcKetangbiao.setXnxq(kcSysConfig.getFlag1()); } - queryWrapper.orderByDesc("xnxq"); - queryWrapper.groupBy("kkdw"); - Page> page = new Page<>(pageNo, pageSize); - IPage> kcKetangbiaoList = kcKetangbiaoService.getKtcountList(page,queryWrapper); + IPage> kcKetangbiaoList = kcKetangbiaoService.getKccountList(page,kcKetangbiao); return Result.OK(kcKetangbiaoList); } @@ -873,19 +862,9 @@ public class KcKetangbiaoController extends JeecgController kcXqxnHistoryQueryWrapper = new QueryWrapper(); - kcXqxnHistoryQueryWrapper.eq("title",object.getXnxq()); - kcXqxnHistoryQueryWrapper.last("limit 1"); - KcXqxnHistory KcXqxnHistory = kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper); - queryWrapper.ge("skrq",KcXqxnHistory.getStartTime()); - queryWrapper.le("skrq",KcXqxnHistory.getEndTime()+" 23:59:59"); + object.setXnxq(kcSysConfig.getFlag1()); } - queryWrapper.orderByDesc("xnxq"); - queryWrapper.groupBy("kkdw"); - List exportList = service.getKtcountExportList(queryWrapper); + List exportList = service.getKccountExportList(object); // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); @@ -902,4 +881,51 @@ public class KcKetangbiaoController extends JeecgController getKtcountList(KcKetangbiao kcKetangbiao, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap()); + if(StringUtils.isBlank(kcKetangbiao.getXnxq())){ + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + kcKetangbiao.setXnxq(kcSysConfig.getFlag1()); + } + Page> page = new Page<>(pageNo, pageSize); + IPage> kcKetangbiaoList = kcKetangbiaoService.getKtcountList(page,kcKetangbiao); + return Result.OK(kcKetangbiaoList); + } + + + @RequestMapping(value = "/exportKtnumXls") + public ModelAndView exportKtnumXls(HttpServletRequest request, KcKetangbiaoNum kcKetangbiaoNum) { + return exportKtnumXls(request, kcKetangbiaoNum, KcKetangbiaoNum.class, "课堂统计"); + } + protected ModelAndView exportKtnumXls(HttpServletRequest request, KcKetangbiaoNum object, Class clazz, String title) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + // Step.2 获取导出数据 + if(StringUtils.isBlank(object.getXnxq())){ + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + object.setXnxq(kcSysConfig.getFlag1()); + } + List exportList = service.getKtcountExportList(object); + + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, title); + mv.addObject(NormalExcelConstants.CLASS, clazz); + //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/ktgl/entity/KcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java index 213084d3..68e177ad 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java @@ -326,4 +326,21 @@ public class KcKetangbiao implements Serializable { private String zhjs; @TableField(exist = false) private String bmdId; + @TableField(exist = false) + private String a1; + @TableField(exist = false) + private String a2; + @TableField(exist = false) + private String a3; + @TableField(exist = false) + private String a4; + @TableField(exist = false) + private String a5; + @TableField(exist = false) + private String a6; + @TableField(exist = false) + private String a7; + + @TableField(exist = false) + private String flag; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiaoNum.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiaoNum.java index e8c5f585..14dbd44f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiaoNum.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiaoNum.java @@ -46,6 +46,27 @@ public class KcKetangbiaoNum implements Serializable { @Excel(name = "开课数量", width = 15) private String num; + @Excel(name = "专业教育选修课", width = 15) + private String a2; + + @Excel(name = "专业教育必修课", width = 15) + private String a1; + + @Excel(name = "通识教育必修课", width = 15) + private String a6; + + @Excel(name = "通识教育选修课", width = 15) + private String a7; + + @Excel(name = "教师教育必修课", width = 15) + private String a4; + + @Excel(name = "教师教育选修课", width = 15) + private String a5; + + @Excel(name = "发展方向课", width = 15) + private String a3; + private String startTime; private String endTime; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java index 6bd441d0..10c59ec2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java @@ -33,4 +33,6 @@ public interface KcKechengbiaoMapper extends BaseMapper { void saveOne(KcKechengbiao kcKechengbiaoPar); void removeCfsj(KcKechengbiao kcKechengbiao); + + void updateKechengExculde(KcKechengbiao ktbExculde); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java index 0af1c791..5fc15843 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java @@ -64,7 +64,11 @@ public interface KcKetangbiaoMapper extends BaseMapper { void updateSkxs(KcKetangbiao kcKetangbiaoup); - IPage> getKtcountList(Page> page, @Param(Constants.WRAPPER)QueryWrapper queryWrapper); + IPage> getKtcountList(Page> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao); - List getKtcountExportList(@Param(Constants.WRAPPER)QueryWrapper queryWrapper); + List getKtcountExportList(KcKetangbiaoNum kcKetangbiao); + + IPage> getKccountList(Page> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao); + + List getKccountExportList(KcKetangbiaoNum kcKetangbiao); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml index 3207d532..e2497cab 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml @@ -101,4 +101,21 @@ kc_kechengbiao t where t.xqxn = #{xqxn} GROUP BY kcbh,kcmc,skjs,rwbh,kkdw,kcxz,sksj,kkdwid,xq,jgh,jzglb,sfcj,xqxn)a) + + + update kc_kechengbiao kc,kc_kecheng_exclude kce + set kc.flag = '1' + where kc.xqxn = #{xnxq} + and kce.sfqtzs in ('否','待定') + and ifnull(kc.xqxn,'a') = ifnull(kce.xqxn,'a') + and ifnull(kc.kcmc,'a') = ifnull(kce.kcmc,'a') + and ifnull(kc.jgh,'a')=ifnull(kce.jgh,'a') + and ifnull(kc.skjs,'a')=ifnull(kce.skjs,'a') + and ifnull(kc.kkdw,'a')=ifnull(kce.kkdw,'a') + and ifnull(kc.kcxz,'a')=ifnull(kce.kcxz,'a') + and ifnull(kc.skdd,'a')=ifnull(kce.skdd,'a') + and ifnull(kc.sksj,'a')=ifnull(kce.sksj,'a') + and ifnull(replace(kc.jkzc,',',''),'a')=ifnull(replace(kce.jkzc,',',''),'a') + and ifnull(kc.xnxq,'a') = ifnull(kce.xnxq,'a') + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml index 709690cc..920a4842 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml @@ -160,6 +160,9 @@ and xqxn = #{xnxq} + + and flag = #{flag} + - select xnxq,kkdw,count('*') as num from kc_ketangbiao - ${ew.customSqlSegment} + select xnxq,kkdw,sum(kksl) as num,sum(a1) as a1,sum(a2) as a2,sum(a3) as a3,sum(a4) as a4,sum(a5) as a5, sum(a6) as a6, sum(a7) as a7 + from ( + select xnxq,kkdw,count('*') as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao + where xnxq = #{et.xnxq} + GROUP BY xnxq,kkdw + union + select xnxq,kkdw,0 as kksl,count('*') as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao + where xnxq = #{et.xnxq} and kcxz = '专业教育必修课' + GROUP BY xnxq,kkdw + union + select xnxq,kkdw,0 as kksl,0 as a1 ,count('*') as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao + where xnxq = #{et.xnxq} and kcxz = '专业教育选修课' + GROUP BY xnxq,kkdw + union + select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,count('*') as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao + where xnxq = #{et.xnxq} and kcxz = '发展方向课' + GROUP BY xnxq,kkdw + union + select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,count('*') as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao + where xnxq = #{et.xnxq} and kcxz = '教师教育必修课' + GROUP BY xnxq,kkdw + union + select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,count('*') as a5,0 as a6,0 as a7 from kc_ketangbiao + where xnxq = #{et.xnxq} and kcxz = '教师教育选修课' + GROUP BY xnxq,kkdw + union + select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,count('*') as a6,0 as a7 from kc_ketangbiao + where xnxq = #{et.xnxq} and kcxz = '通识教育必修课' + GROUP BY xnxq,kkdw + union + select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,count('*') as a7 from kc_ketangbiao + where xnxq = #{et.xnxq} and kcxz = '通识教育选修课' + GROUP BY xnxq,kkdw + + ) t GROUP BY xnxq,kkdw + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java index 05455a0d..122a50f0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java @@ -31,4 +31,6 @@ public interface IKcKechengbiaoService extends IService { void saveOne(KcKechengbiao kcKechengbiaoPar); void removeCfsj(KcKechengbiao kcKechengbiao); + + void updateKechengExculde(KcKechengbiao ktbExculde); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java index de6c4efc..16628d5b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java @@ -66,7 +66,11 @@ public interface IKcKetangbiaoService extends IService { void updateSkxs(KcKetangbiao kcKetangbiaoup); - IPage> getKtcountList(Page> page, QueryWrapper qw); + IPage> getKtcountList(Page> page, KcKetangbiao kcKetangbiao); - List getKtcountExportList(QueryWrapper queryWrapper); + List getKtcountExportList(KcKetangbiaoNum object); + + IPage> getKccountList(Page> page, KcKetangbiao kcKetangbiao); + + List getKccountExportList(KcKetangbiaoNum object); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java index 9f50c89e..ccaede00 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java @@ -61,4 +61,8 @@ public class KcKechengbiaoServiceImpl extends ServiceImpl> getKtcountList(Page> page, QueryWrapper qw) { - return baseMapper.getKtcountList(page,qw); + public IPage> getKtcountList(Page> page, KcKetangbiao kcKetangbiao) { + return baseMapper.getKtcountList(page,kcKetangbiao); } @Override - public List getKtcountExportList(QueryWrapper queryWrapper) { - return baseMapper.getKtcountExportList(queryWrapper); + public List getKtcountExportList(KcKetangbiaoNum object) { + return baseMapper.getKtcountExportList(object); + } + + @Override + public IPage> getKccountList(Page> page, KcKetangbiao kcKetangbiao) { + return baseMapper.getKccountList(page,kcKetangbiao); + } + + @Override + public List getKccountExportList(KcKetangbiaoNum object) { + return baseMapper.getKccountExportList(object); } } 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 7db6fd8c..41c27681 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 @@ -93,14 +93,23 @@ AND kcxz = #{kcxz} + + AND (tk.username like CONCAT('%',#{username},'%') or tk.userid like CONCAT('%',#{username},'%')) + + + AND tk.userid =#{userid} + GROUP BY tk.userid, tk.username, college ) tk LEFT JOIN ( - SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq,assesscode,dwmc - FROM kc_assessuser + + select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as tksf1 ,max(ytkcs-0) as tkyq from kc_export_config_tpkwcqkjzglx a + LEFT JOIN sys_dict_item b on a.tklx = b.item_value and dict_id = '1682386362753224705' + and a.xqxn = (select flag1 from kc_sys_config where id = 1) + WHERE 1 = 1 - AND assesscode = #{tksf} + and b.item_value = #{tksf} - WHERE 1 = 1 GROUP BY usercode, username + GROUP BY gh,xm ) au ON tk.userid = au.usercode ORDER BY sjtksl DESC