diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/KccyglSys.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/KccyglSys.java index 88eeb9db..9e5b1c51 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/KccyglSys.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/KccyglSys.java @@ -45,4 +45,11 @@ public class KccyglSys implements Serializable { private String jgh; private String ywId; private String atype; + + @Excel(name = "发布作业次数", width = 15) + private Integer fbzycs; + @Excel(name = "作业完成次数", width = 15) + private Integer zywccs; + @Excel(name = "超时未完成次数", width = 15) + private Integer cswwccs; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml index c2418df8..e7aa90ac 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml @@ -84,9 +84,21 @@ + + @@ -158,4 +227,4 @@ - \ No newline at end of file + diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java index 32248cdd..320c88d4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java @@ -529,7 +529,7 @@ public class ZyInfoController extends JeecgController { } return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -544,7 +544,7 @@ public class ZyInfoController extends JeecgController { this.zyInfoService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } - + /** * 通过id查询 * @@ -642,7 +642,7 @@ public class ZyInfoController extends JeecgController { queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(zyInfoSys.getKcmc()),"kcmc",zyInfoSys.getKcmc()); queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(zyInfoSys.getKcbh()),"kcbh",zyInfoSys.getKcbh()); queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(zyInfoSys.getSkjs()),"skjs",zyInfoSys.getSkjs()); - + queryWrapper.eq("flag",0); Page page = new Page(pageNo, pageSize); IPage pageList = zyInfoService.sysList(page, queryWrapper); return Result.OK(pageList); @@ -706,15 +706,22 @@ public class ZyInfoController extends JeecgController { queryWrapperCon.orderByDesc("create_time"); queryWrapperCon.last("limit 1"); KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(queryWrapperCon); - zyInfoSys.setKkdw(kcExportConfigTpkwcqkjzglx.getDwmc()); + queryWrapper.eq("kkdw",kcExportConfigTpkwcqkjzglx.getDwmc()); } if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(zyInfoSys.getXqxn())){ KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); - zyInfoSys.setXqxn(kcSysConfig.getFlag1()); + queryWrapper.eq("xqxn",kcSysConfig.getFlag1()); + }else{ + queryWrapper.eq("xqxn",zyInfoSys.getXqxn()); } + queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(zyInfoSys.getKkdw()),"kkdw",zyInfoSys.getKkdw()); + queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(zyInfoSys.getKcmc()),"kcmc",zyInfoSys.getKcmc()); + queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(zyInfoSys.getKcbh()),"kcbh",zyInfoSys.getKcbh()); + queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(zyInfoSys.getSkjs()),"skjs",zyInfoSys.getSkjs()); + queryWrapper.eq("flag",0); // Step.2 获取导出数据 - List exportList = service.exportSysXls(zyInfoSys); + List exportList = service.exportSysXls(zyInfoSys,queryWrapper); // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfoSys.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfoSys.java index c18d77de..e9e442bc 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfoSys.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfoSys.java @@ -37,13 +37,13 @@ public class ZyInfoSys implements Serializable { private String skjs; @Excel(name = "职称", width = 15) private String zc; - @Excel(name = "作业名称", width = 15) +// @Excel(name = "作业名称", width = 15) private String title; - @Excel(name = "是否完成", width = 15) +// @Excel(name = "是否完成", width = 15) private String sfwc; - @Excel(name = "是否发布", width = 15) +// @Excel(name = "是否发布", width = 15) private String sffb; - @Excel(name = "是否互评", width = 15) +// @Excel(name = "是否互评", width = 15) private String sfhp; private String sfcc; private Date startTime; @@ -63,4 +63,15 @@ public class ZyInfoSys implements Serializable { private String type; private String count; private String rownum; + + @Excel(name = "发布作业次数", width = 15) + private Integer fbzycs; + @Excel(name = "作业完成次数", width = 15) + private Integer zywccs; + @Excel(name = "查重次数", width = 15) + private Integer cccs; + @Excel(name = "互评次数", width = 15) + private Integer hpcs; + @Excel(name = "超时未完成次数", width = 15) + private Integer cswwccs; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java index 11dccaa1..2d3d168e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java @@ -24,7 +24,7 @@ public interface ZyInfoMapper extends BaseMapper { IPage sysList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); - List exportSysXls(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + List exportSysXls(@Param("zyInfoSys") ZyInfoSys zyInfoSys, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); ZyInfo getKechengById(@Param("id") String id); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml index 472ec0fe..34fd4855 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml @@ -29,26 +29,84 @@ + + - select count(*) as count,'1' as type from zy_info where xnxq = #{zyInfoSys.xqxn} and zy_status in (1,2) + select count(distinct zi.id) as count,'1' as type from zy_info zi join kc_kechengbiao kk on kk.jgh = zi.create_by AND kk.rwbh = zi.rwbh AND kk.xqxn = zi.xnxq where zi.zy_status in ('1','2') and zi.xnxq = #{zyInfoSys.xqxn} and kk.flag = 0 union all - select count(*) as count,'2' as type from zy_info where xnxq = #{zyInfoSys.xqxn} and zy_status in (1,2) and xshpkg = '1' + select count(distinct zi.id) as count,'2' as type from zy_info zi join kc_kechengbiao kk on kk.jgh = zi.create_by AND kk.rwbh = zi.rwbh AND kk.xqxn = zi.xnxq where zi.zy_status in ('1','2') and zi.xnxq = #{zyInfoSys.xqxn} and kk.flag = 0 and zi.xshpkg = '1' union all - select count(*) as count,'3' as type from zy_info where xnxq = #{zyInfoSys.xqxn} and zy_status in (2) + select count(distinct zi.id) as count,'3' as type from zy_info zi join kc_kechengbiao kk on kk.jgh = zi.create_by AND kk.rwbh = zi.rwbh AND kk.xqxn = zi.xnxq where zi.zy_status in ('2') and zi.xnxq = #{zyInfoSys.xqxn} and kk.flag = 0 union all - select count(*) as count,'4' as type from zy_info where (update_time = DATE_FORMAT(NOW(),'%Y-%m-%d') or create_time = DATE_FORMAT(NOW(),'%Y-%m-%d') ) and zy_status in (1,2) + select count(distinct zi.id) as count,'4' as type from zy_info zi join kc_kechengbiao kk on kk.jgh = zi.create_by AND kk.rwbh = zi.rwbh AND kk.xqxn = zi.xnxq where zi.zy_status in ('1','2') and (zi.update_time = DATE_FORMAT(NOW(),'%Y-%m-%d') or zi.create_time = DATE_FORMAT(NOW(),'%Y-%m-%d') ) and kk.flag = 0 union all - select count(*) as count,'5' as type from zy_info where (update_time = DATE_FORMAT(NOW(),'%Y-%m-%d') or create_time = DATE_FORMAT(NOW(),'%Y-%m-%d') ) and zy_status in (1,2) and xshpkg = '1' + select count(distinct zi.id) as count,'5' as type from zy_info zi join kc_kechengbiao kk on kk.jgh = zi.create_by AND kk.rwbh = zi.rwbh AND kk.xqxn = zi.xnxq where zi.zy_status in ('1','2') and (zi.update_time = DATE_FORMAT(NOW(),'%Y-%m-%d') or zi.create_time = DATE_FORMAT(NOW(),'%Y-%m-%d') ) and zi.xshpkg = '1' and kk.flag = 0 union all - select count(*) as count,'6' as type from zy_info where (update_time = DATE_FORMAT(NOW(),'%Y-%m-%d') or create_time = DATE_FORMAT(NOW(),'%Y-%m-%d') ) and zy_status in (2) + select count(distinct zi.id) as count,'6' as type from zy_info zi join kc_kechengbiao kk on kk.jgh = zi.create_by AND kk.rwbh = zi.rwbh AND kk.xqxn = zi.xnxq where zi.zy_status in ('2') and (zi.update_time = DATE_FORMAT(NOW(),'%Y-%m-%d') or zi.create_time = DATE_FORMAT(NOW(),'%Y-%m-%d') ) and kk.flag = 0 union all - select count(*) as count,'7' as type from wjx_wjxx where xqxn = #{zyInfoSys.xqxn} and qpublish in (1,2) + select count(distinct ww.id) as count,'7' as type from wjx_wjxx ww join kc_kechengbiao kk on kk.jgh = ww.create_by AND kk.rwbh = ww.rwbh AND kk.xqxn = ww.xqxn where ww.xqxn = #{zyInfoSys.xqxn} and ww.qpublish in (1,2) union all - select count(*) as count,'8' as type from wjx_wjxx where xqxn = #{zyInfoSys.xqxn} and qpublish = '2' + select count(distinct ww.id) as count,'8' as type from wjx_wjxx ww join kc_kechengbiao kk on kk.jgh = ww.create_by AND kk.rwbh = ww.rwbh AND kk.xqxn = ww.xqxn where ww.xqxn = #{zyInfoSys.xqxn} and ww.qpublish in (2) union all - select count(*) as count,'9' as type from wjx_wjxx where (update_time = DATE_FORMAT(NOW(),'%Y-%m-%d') or create_time = DATE_FORMAT(NOW(),'%Y-%m-%d') ) and qpublish in (1,2) + select count(distinct ww.id) as count,'9' as type from wjx_wjxx ww join kc_kechengbiao kk on kk.jgh = ww.create_by AND kk.rwbh = ww.rwbh AND kk.xqxn = ww.xqxn where (ww.update_time = DATE_FORMAT(NOW(),'%Y-%m-%d') or ww.create_time = DATE_FORMAT(NOW(),'%Y-%m-%d') ) and ww.qpublish in (1,2) union all - select count(*) as count,'10' as type from wjx_wjxx where (update_time = DATE_FORMAT(NOW(),'%Y-%m-%d') or create_time = DATE_FORMAT(NOW(),'%Y-%m-%d') ) and qpublish = '2' + select count(distinct ww.id) as count,'10' as type from wjx_wjxx ww join kc_kechengbiao kk on kk.jgh = ww.create_by AND kk.rwbh = ww.rwbh AND kk.xqxn = ww.xqxn where (ww.update_time = DATE_FORMAT(NOW(),'%Y-%m-%d') or ww.create_time = DATE_FORMAT(NOW(),'%Y-%m-%d') ) and ww.qpublish in (2) + union all + select count(distinct zi.id) as count,'11' as type from zy_info zi join kc_kechengbiao kk on kk.jgh = zi.create_by AND kk.rwbh = zi.rwbh AND kk.xqxn = zi.xnxq where zi.zy_status in ('1','2') and zi.xnxq = #{zyInfoSys.xqxn} and zi.sfcc in ('1','2') and kk.flag = 0 - \ No newline at end of file + diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java index 59b02c5d..29c4998f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java @@ -23,7 +23,7 @@ public interface IZyInfoService extends IService { IPage sysList(Page page, QueryWrapper queryWrapper); - List exportSysXls(ZyInfoSys zyInfoSys); + List exportSysXls(ZyInfoSys zyInfoSys, QueryWrapper queryWrapper); ZyInfo getKechengById(String id); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java index 1828ee22..ffcafb5d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java @@ -33,7 +33,7 @@ import java.util.*; /** * @Description: 作业发布 * @Author: jeecg-boot - * @Date: 2024-05-06 + * @Date: 2024-05-06 * @Version: V1.0 */ @Service @@ -57,8 +57,8 @@ public class ZyInfoServiceImpl extends ServiceImpl impleme } @Override - public List exportSysXls(ZyInfoSys zyInfoSys) { - return baseMapper.exportSysXls(zyInfoSys); + public List exportSysXls(ZyInfoSys zyInfoSys, QueryWrapper queryWrapper) { + return baseMapper.exportSysXls(zyInfoSys, queryWrapper); } @Override @@ -68,53 +68,52 @@ public class ZyInfoServiceImpl extends ServiceImpl impleme @Override public List zyzb(String rwbh, String xqxn, String teano, String zyLeixing) { - return baseMapper.zyzb(rwbh,xqxn,teano,zyLeixing); + return baseMapper.zyzb(rwbh, xqxn, teano, zyLeixing); } @Override public void updateInfoZyStatus() { QueryWrapper zyInfoQueryWrapper = new QueryWrapper<>(); - zyInfoQueryWrapper.le("start_time", DateUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss")); - zyInfoQueryWrapper.eq("zy_status","0"); + zyInfoQueryWrapper.le("start_time", DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")); + zyInfoQueryWrapper.eq("zy_status", "0"); List list2 = baseMapper.selectList(zyInfoQueryWrapper); - if(list2.size()>0){ + if (list2.size() > 0) { - for(ZyInfo zyInfo : list2){ + for (ZyInfo zyInfo : list2) { zyInfo.setZyStatus("1"); baseMapper.updateById(zyInfo); try { QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); - kcKechengbiaoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); - kcKechengbiaoQueryWrapper.eq("jgh",zyInfo.getCreateBy()); - kcKechengbiaoQueryWrapper.eq("xqxn",zyInfo.getXnxq()); + kcKechengbiaoQueryWrapper.eq("rwbh", zyInfo.getRwbh()); + kcKechengbiaoQueryWrapper.eq("jgh", zyInfo.getCreateBy()); + kcKechengbiaoQueryWrapper.eq("xqxn", zyInfo.getXnxq()); kcKechengbiaoQueryWrapper.last("limit 1"); KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); QueryWrapper zyDbtxQueryWrapper = new QueryWrapper<>(); - zyDbtxQueryWrapper.eq("type",zyInfo.getZyLeixing());//发送作业 - zyDbtxQueryWrapper.eq("rwbh",zyInfo.getRwbh()); - zyDbtxQueryWrapper.eq("main_id",zyInfo.getId()); + zyDbtxQueryWrapper.eq("type", zyInfo.getZyLeixing());//发送作业 + zyDbtxQueryWrapper.eq("rwbh", zyInfo.getRwbh()); + zyDbtxQueryWrapper.eq("main_id", zyInfo.getId()); List dbtxlist = zyDbtxService.list(zyDbtxQueryWrapper); String xharrs[] = new String[dbtxlist.size()]; - for(int i=0;i queryWrapper = new QueryWrapper<>(); queryWrapper.apply("a.xh = b.xh"); - queryWrapper.eq("b.KCAPZBBH",zyInfo2.getRwbh()); - if(xharrs.length>0){ - queryWrapper.notIn("a.xh",xharrs); + queryWrapper.eq("b.KCAPZBBH", zyInfo2.getRwbh()); + if (xharrs.length > 0) { + queryWrapper.notIn("a.xh", xharrs); } List list = xxhbbksService.getXsxkbAllList(queryWrapper); - - for(Xxhbbks xxhbbks:list) { + for (Xxhbbks xxhbbks : list) { //作业代办提醒 ZyDbtx zyDbtx = new ZyDbtx(); @@ -122,14 +121,14 @@ public class ZyInfoServiceImpl extends ServiceImpl impleme zyDbtx.setMainId(zyInfo.getId()); zyDbtx.setRwbh(zyInfo.getRwbh()); String hpts = ""; - if(StringUtils.equals(zyInfo.getXshpkg(),"1")){ - hpts = "互评时间："+ org.jeecg.common.util.DateUtils.formatDate(zyInfo.getXshpkssj(),"yyyy-MM-dd HH:mm")+" ~ "+ org.jeecg.common.util.DateUtils.formatDate(zyInfo.getXshpjssj(),"yyyy-MM-dd HH:mm"); + if (StringUtils.equals(zyInfo.getXshpkg(), "1")) { + hpts = "互评时间：" + org.jeecg.common.util.DateUtils.formatDate(zyInfo.getXshpkssj(), "yyyy-MM-dd HH:mm") + " ~ " + org.jeecg.common.util.DateUtils.formatDate(zyInfo.getXshpjssj(), "yyyy-MM-dd HH:mm"); } - if(StringUtils.equals(zyInfo.getZyLeixing(),"0")) { + if (StringUtils.equals(zyInfo.getZyLeixing(), "0")) { zyDbtx.setType("0");//0发布作业 1评分 2测验 3问卷 4讨论 zyDbtx.setContent(kcKechengbiao.getSkjs() + "老师主讲的[" + kcKechengbiao.getKcmc() + "]课程于" + org.jeecg.common.util.DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss") + "发布了一篇题目为“" + zyInfo.getTitle() + "”的作业，该作业提交时间为：" + org.jeecg.common.util.DateUtils.formatDate(zyInfo.getStartTime(), "yyyy-MM-dd HH:mm") + " ~ " + org.jeecg.common.util.DateUtils.formatDate(zyInfo.getEndTime(), "yyyy-MM-dd HH:mm") + "，请按时完成！ " + hpts); - }else if (StringUtils.equals(zyInfo.getZyLeixing(),"1")){ + } else if (StringUtils.equals(zyInfo.getZyLeixing(), "1")) { zyDbtx.setType("10");//0发布作业 1评分 2测验 3问卷 4讨论 zyDbtx.setContent(kcKechengbiao.getSkjs() + "老师主讲的[" + kcKechengbiao.getKcmc() + "]课程于" + org.jeecg.common.util.DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss") + "发布了一篇题目为“" + zyInfo.getTitle() + "”的期末考试，该期末考试提交时间为：" + org.jeecg.common.util.DateUtils.formatDate(zyInfo.getStartTime(), "yyyy-MM-dd HH:mm") + " ~ " + org.jeecg.common.util.DateUtils.formatDate(zyInfo.getEndTime(), "yyyy-MM-dd HH:mm") + "，请按时完成！ " + hpts); } @@ -157,7 +156,7 @@ public class ZyInfoServiceImpl extends ServiceImpl impleme } @Override - public IPage sysStaticList(Page page,ZyInfoSys zyInfoSys) { + public IPage sysStaticList(Page page, ZyInfoSys zyInfoSys) { return baseMapper.sysStaticList(page, zyInfoSys); } @@ -167,8 +166,8 @@ public class ZyInfoServiceImpl extends ServiceImpl impleme } @Override - public Map sysStaticNo(ZyInfoSys zyInfoSys) { - Map map = new HashMap<>(); + public Map sysStaticNo(ZyInfoSys zyInfoSys) { + Map map = new HashMap<>(); String xn_zy_syzcs = "0"; String xn_zy_hpzcs = "0"; @@ -180,29 +179,32 @@ public class ZyInfoServiceImpl extends ServiceImpl impleme String jr_zy_ywczcs = "0"; String jr_cy_syzcs = "0"; String jr_cy_ywczcs = "0"; + String xn_zy_cccs = "0"; //查重次数 List list = baseMapper.getZyStaticNo(zyInfoSys); - for(ZyInfoSys par : list){ - if(StringUtils.equals("1",par.getType())){ + for (ZyInfoSys par : list) { + if (StringUtils.equals("1", par.getType())) { xn_zy_syzcs = par.getCount(); - }else if(StringUtils.equals("2",par.getType())){ + } else if (StringUtils.equals("2", par.getType())) { xn_zy_hpzcs = par.getCount(); - }else if(StringUtils.equals("3",par.getType())){ + } else if (StringUtils.equals("3", par.getType())) { xn_zy_ywczcs = par.getCount(); - }else if(StringUtils.equals("4",par.getType())){ + } else if (StringUtils.equals("4", par.getType())) { jr_zy_syzcs = par.getCount(); - }else if(StringUtils.equals("5",par.getType())){ + } else if (StringUtils.equals("5", par.getType())) { jr_zy_hpzcs = par.getCount(); - }else if(StringUtils.equals("6",par.getType())){ + } else if (StringUtils.equals("6", par.getType())) { jr_zy_ywczcs = par.getCount(); - }else if(StringUtils.equals("7",par.getType())){ + } else if (StringUtils.equals("7", par.getType())) { xn_cy_syzcs = par.getCount(); - }else if(StringUtils.equals("8",par.getType())){ + } else if (StringUtils.equals("8", par.getType())) { xn_cy_ywczcs = par.getCount(); - }else if(StringUtils.equals("9",par.getType())){ + } else if (StringUtils.equals("9", par.getType())) { jr_cy_syzcs = par.getCount(); - }else if(StringUtils.equals("10",par.getType())){ + } else if (StringUtils.equals("10", par.getType())) { jr_cy_ywczcs = par.getCount(); + } else if (StringUtils.equals("11", par.getType())) { + xn_zy_cccs = par.getCount(); } } @@ -210,29 +212,31 @@ public class ZyInfoServiceImpl extends ServiceImpl impleme List list2 = baseMapper.getCyTopList(zyInfoSys); list.add(zyInfoSys); - map.put("xn_zy_syzcs",xn_zy_syzcs);//本学年作业使用总次数： - map.put("xn_zy_hpzcs",xn_zy_hpzcs);//本学年作业互评总次数： - map.put("xn_zy_ywczcs",xn_zy_ywczcs);//本学年作业已完成总次数： - map.put("xn_cy_syzcs",xn_cy_syzcs);//本学年测验使用总次数： - map.put("xn_cy_ywczcs",xn_cy_ywczcs);//本学年测验已完成总次数： - map.put("jr_zy_syzcs",jr_zy_syzcs);//今日作业使用总次数： - map.put("jr_zy_hpzcs",jr_zy_hpzcs);//今日作业互评总次数： - map.put("jr_zy_ywczcs",jr_zy_ywczcs);//今日作业已完成总次数： - map.put("jr_cy_syzcs",jr_cy_syzcs);//今日测验使用总次数： - map.put("jr_cy_ywczcs",jr_cy_ywczcs);//今日测验已完成总次数： - map.put("xntop10",list1);//本学年作业使用排行TOP10 - map.put("jrtop10",list2);//本学年测验使用排行TOP10 + map.put("xn_zy_syzcs", xn_zy_syzcs);//本学年作业使用总次数： + map.put("xn_zy_hpzcs", xn_zy_hpzcs);//本学年作业互评总次数： + map.put("xn_zy_ywczcs", xn_zy_ywczcs);//本学年作业已完成总次数： + map.put("xn_zy_cccs", xn_zy_cccs);//本学年查重次数： + map.put("xn_cy_syzcs", xn_cy_syzcs);//本学年测验使用总次数： + map.put("xn_cy_ywczcs", xn_cy_ywczcs);//本学年测验已完成总次数： + map.put("jr_zy_syzcs", jr_zy_syzcs);//今日作业使用总次数： + map.put("jr_zy_hpzcs", jr_zy_hpzcs);//今日作业互评总次数： + map.put("jr_zy_ywczcs", jr_zy_ywczcs);//今日作业已完成总次数： + map.put("jr_cy_syzcs", jr_cy_syzcs);//今日测验使用总次数： + map.put("jr_cy_ywczcs", jr_cy_ywczcs);//今日测验已完成总次数： + map.put("xntop10", list1);//本学年作业使用排行TOP10 + map.put("jrtop10", list2);//本学年测验使用排行TOP10 + return map; } @Override public IPage sysStaticZyList(Page page, ZyInfoSys zyInfoSys) { - return baseMapper.sysStaticZyList(page,zyInfoSys); + return baseMapper.sysStaticZyList(page, zyInfoSys); } @Override public IPage sysStaticCyList(Page page, CyInfoSys cyInfoSys) { - return baseMapper.sysStaticCyList(page,cyInfoSys); + return baseMapper.sysStaticCyList(page, cyInfoSys); } @Override @@ -242,7 +246,7 @@ public class ZyInfoServiceImpl extends ServiceImpl impleme @Override public IPage listKhcl(Page page, QueryWrapper queryWrapper) { - return baseMapper.listKhcl(page,queryWrapper); + return baseMapper.listKhcl(page, queryWrapper); } // appId