From 341655b377c5078ee472977d57ff69c86901ab2c Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 11 Nov 2024 18:34:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zyInfo/controller/ZyInfoController.java | 40 +++++++++++- .../modules/kc/zyInfo/entity/ZyInfoSys.java | 4 ++ .../kc/zyInfo/mapper/ZyInfoMapper.java | 6 ++ .../kc/zyInfo/mapper/xml/ZyInfoMapper.xml | 35 ++++++++++ .../kc/zyInfo/service/IZyInfoService.java | 3 + .../service/impl/ZyInfoServiceImpl.java | 64 +++++++++++++++++-- .../controller/ZyInfoStudentController.java | 24 +++---- 7 files changed, 159 insertions(+), 17 deletions(-) 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 9d786f5f..9ff521f4 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 @@ -598,7 +598,7 @@ public class ZyInfoController extends JeecgController { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); queryWrapper.eq("c.KCAPZBBH",zyInfo.getRwbh()); queryWrapper.eq("c.xh",sysUser.getUsername()); - queryWrapper.orderByDesc("a.sort"); + queryWrapper.orderByDesc("a.sort - 0"); IPage pageList = zyInfoService.stuList(page, queryWrapper); return Result.OK(pageList); } @@ -950,4 +950,42 @@ public class ZyInfoController extends JeecgController { } } + + + + @ApiOperation(value="统计作业测试使用情况", notes="统计作业测试使用情况") + @GetMapping(value = "/sysStaticNo") + public Result> sysStaticNo(ZyInfoSys zyInfoSys, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //-------------获取当前登陆人是否是管理员角色，如果不是都按照教务秘书处理--------------------------- + List roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername()); + String adminRole = "1";//0 admin 1教务秘书 + for(String role :roleList){ + if(org.apache.commons.lang.StringUtils.equals("admin",role)){ + adminRole = "0"; + break; + } + } + QueryWrapper queryWrapper = new QueryWrapper(); + if(org.apache.commons.lang.StringUtils.equals("1",adminRole)){ + QueryWrapper queryWrapperCon = new QueryWrapper(); + queryWrapperCon.eq("gh",sysUser.getUsername()); + queryWrapperCon.orderByDesc("create_time"); + queryWrapperCon.last("limit 1"); + KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(queryWrapperCon); + zyInfoSys.setKkdw(kcExportConfigTpkwcqkjzglx.getDwmc()); + } + + if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(zyInfoSys.getXqxn())){ + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + zyInfoSys.setXqxn(kcSysConfig.getFlag1()); + } + + Map pageList = zyInfoService.sysStaticNo(zyInfoSys); + return Result.OK(pageList); + } + } 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 cd62c28f..71bd57cd 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 @@ -56,4 +56,8 @@ public class ZyInfoSys implements Serializable { private String jgh; private String ywId; + + private String type; + private String count; + private String rownum; } 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 d150c876..3bfd3112 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 @@ -32,4 +32,10 @@ public interface ZyInfoMapper extends BaseMapper { IPage sysStaticList(Page page,@Param("zyInfoSys") ZyInfoSys zyInfoSys); IPage listOther(Page page,@Param("zyInfo") ZyInfo zyInfo); + + List getZyStaticNo(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + + List getZyTopList(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + + List getCyTopList(@Param("zyInfoSys") ZyInfoSys zyInfoSys); } 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 a7663f5d..6f3b55ff 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 @@ -143,4 +143,39 @@ and a.teacher_no = #{zyInfo.teacherNo} + + + + + + + \ 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 ba078d6c..7c3fbedb 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 @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.kc.zyInfo.entity.ZyInfoSys; import java.util.List; +import java.util.Map; /** * @Description: 作业发布 @@ -32,4 +33,6 @@ public interface IZyInfoService extends IService { IPage sysStaticList(Page page, ZyInfoSys zyInfoSys); IPage listOther(Page page, ZyInfo zyInfo); + + Map sysStaticNo(ZyInfoSys zyInfoSys); } 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 9c991430..101fc30b 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 @@ -27,10 +27,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.web.client.RestTemplate; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @Description: 作业发布 @@ -167,6 +164,65 @@ public class ZyInfoServiceImpl extends ServiceImpl impleme return baseMapper.listOther(page, zyInfo); } + @Override + public Map sysStaticNo(ZyInfoSys zyInfoSys) { + Map map = new HashMap<>(); + + String xn_zy_syzcs = "0"; + String xn_zy_hpzcs = "0"; + String xn_zy_ywczcs = "0"; + String xn_cy_syzcs = "0"; + String xn_cy_ywczcs = "0"; + String jr_zy_syzcs = "0"; + String jr_zy_hpzcs = "0"; + String jr_zy_ywczcs = "0"; + String jr_cy_syzcs = "0"; + String jr_cy_ywczcs = "0"; + + List list = baseMapper.getZyStaticNo(zyInfoSys); + for(ZyInfoSys par : list){ + if(StringUtils.equals("1",par.getType())){ + xn_zy_syzcs = par.getCount(); + }else if(StringUtils.equals("2",par.getType())){ + xn_zy_hpzcs = par.getCount(); + }else if(StringUtils.equals("3",par.getType())){ + xn_zy_ywczcs = par.getCount(); + }else if(StringUtils.equals("4",par.getType())){ + jr_zy_syzcs = par.getCount(); + }else if(StringUtils.equals("5",par.getType())){ + jr_zy_hpzcs = par.getCount(); + }else if(StringUtils.equals("6",par.getType())){ + jr_zy_ywczcs = par.getCount(); + }else if(StringUtils.equals("7",par.getType())){ + xn_cy_syzcs = par.getCount(); + }else if(StringUtils.equals("8",par.getType())){ + xn_cy_ywczcs = par.getCount(); + }else if(StringUtils.equals("9",par.getType())){ + jr_cy_syzcs = par.getCount(); + }else if(StringUtils.equals("10",par.getType())){ + jr_cy_ywczcs = par.getCount(); + } + } + + List list1 = baseMapper.getZyTopList(zyInfoSys); + 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 + return map; + } + // appId private static final String appId = "wx031697a8ca09a5ce";//东师 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java index 7931e288..3c3b39fc 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java @@ -688,17 +688,17 @@ public class ZyInfoStudentController extends JeecgController zyInfoStudentQueryWrapper = new QueryWrapper<>(); -// zyInfoStudentQueryWrapper.eq("create_by",user.getUsername()); -// zyInfoStudentQueryWrapper.eq("main_id",zyInfoStudent.getMainId()); -// zyInfoStudentQueryWrapper.last("limit 1"); -// ZyInfoStudent zyInfoStudent2 = zyInfoStudentService.getOne(zyInfoStudentQueryWrapper); -// if(zyInfoStudent2!=null){ -// //20241107新增判断，看原来是否有数据，防止重复添加，将原来的id赋值到请求数据里 -// zyInfoStudent.setId(zyInfoStudent2.getId()); -// stuPar.setFilePath(zyInfoStudent.getFilePath()); -// zyInfoStudent =stuPar; -// }else{ + QueryWrapper zyInfoStudentQueryWrapper = new QueryWrapper<>(); + zyInfoStudentQueryWrapper.eq("a.create_by",user.getUsername()); + zyInfoStudentQueryWrapper.eq("a.main_id",zyInfoStudent.getMainId()); + zyInfoStudentQueryWrapper.last("limit 1"); + ZyInfoStudent zyInfoStudent2 = zyInfoStudentService.getOne(zyInfoStudentQueryWrapper); + if(zyInfoStudent2!=null){ + //20241107新增判断，看原来是否有数据，防止重复添加，将原来的id赋值到请求数据里 + stuPar = zyInfoStudent2; + stuPar.setFilePath(zyInfoStudent.getFilePath()); + zyInfoStudent =stuPar; + }else{ ZyInfoStudent zyInfoStudent1 = new ZyInfoStudent(); zyInfoStudent1.setMainId(zyInfo.getId()); zyInfoStudent1.setCreateBy(user.getUsername()); @@ -708,7 +708,7 @@ public class ZyInfoStudentController extends JeecgController