From 754055ae2b87efad4d96cca59ad87819a54064d7 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 23 Sep 2024 13:30:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wjxWjxx/controller/WjxWjxxController.java | 45 +++-- .../controller/WjxWjxxTmlbController.java | 43 ++++- .../kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java | 9 +- .../kc/wjxWjxxTmlb/entity/WjxWjxxTmxx.java | 2 - .../mapper/xml/WjxWjxxTmlbMapper.xml | 7 +- .../service/impl/WjxWjxxTmlbServiceImpl.java | 17 +- .../kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java | 9 +- .../controller/ZyGonggaoController.java | 2 +- .../zyInfo/controller/ZyInfoController.java | 111 ++++++++--- .../kc/zyInfo/mapper/ZyInfoMapper.java | 1 + .../kc/zyInfo/mapper/xml/ZyInfoMapper.xml | 8 +- .../kc/zyInfo/service/IZyInfoService.java | 1 + .../service/impl/ZyInfoServiceImpl.java | 1 + .../controller/ZyInfoStudentController.java | 88 ++++++++- .../zyInfoStudent/entity/ZyInfoStudent.java | 4 + .../mapper/ZyInfoStudentMapper.java | 2 + .../mapper/xml/ZyInfoStudentMapper.xml | 14 ++ .../service/IZyInfoStudentService.java | 2 + .../impl/ZyInfoStudentServiceImpl.java | 5 + .../zyZyxx/controller/ZyZyxxController.java | 174 ++++++++++++++++++ .../modules/kc/zyZyxx/entity/ZyZyxx.java | 75 ++++++++ .../kc/zyZyxx/mapper/ZyZyxxMapper.java | 17 ++ .../kc/zyZyxx/mapper/xml/ZyZyxxMapper.xml | 5 + .../kc/zyZyxx/service/IZyZyxxService.java | 14 ++ .../service/impl/ZyZyxxServiceImpl.java | 19 ++ 25 files changed, 598 insertions(+), 77 deletions(-) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyZyxx/controller/ZyZyxxController.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyZyxx/entity/ZyZyxx.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyZyxx/mapper/ZyZyxxMapper.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyZyxx/mapper/xml/ZyZyxxMapper.xml create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyZyxx/service/IZyZyxxService.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyZyxx/service/impl/ZyZyxxServiceImpl.java diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java index 20e8725c..4d0ce3d3 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java @@ -115,7 +115,7 @@ public class WjxWjxxController extends JeecgController // Page page = new Page(pageNo, pageSize); // IPage pageList = wjxWjxxService.page(page, queryWrapper); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - wjxWjxx.setCreateBy(user.getUsername()); +// wjxWjxx.setCreateBy(user.getUsername()); Page pageList = wjxWjxxService.findPage(wjxWjxx, new Page<>(pageNo, pageSize)); return Result.OK(pageList); } @@ -218,7 +218,7 @@ public class WjxWjxxController extends JeecgController LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); QueryWrapper zyInfoQueryWrapper = new QueryWrapper<>(); zyInfoQueryWrapper.eq("xqxn",zyInfo.getXqxn()); - zyInfoQueryWrapper.eq("create_by",sysUser.getUsername()); +// zyInfoQueryWrapper.eq("create_by",sysUser.getUsername()); zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); zyInfoQueryWrapper.eq("atype",zyInfo.getAtype()); List list = wjxWjxxService.list(zyInfoQueryWrapper); @@ -282,7 +282,6 @@ public class WjxWjxxController extends JeecgController wjxWjxxService.removeById(id); QueryWrapper zyInfoQueryWrapper = new QueryWrapper<>(); zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); - zyInfoQueryWrapper.eq("create_by",zyInfo.getCreateBy()); zyInfoQueryWrapper.eq("xqxn",zyInfo.getXqxn()); zyInfoQueryWrapper.eq("atype",zyInfo.getAtype()); zyInfoQueryWrapper.orderByAsc("sort-0"); @@ -406,15 +405,15 @@ public class WjxWjxxController extends JeecgController LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); zyDbtx.setFbr(user.getUsername()); zyDbtxService.save(zyDbtx); - try { - KcWechatSendLog kcWechatSendLog = new KcWechatSendLog(); - kcWechatSendLog.setOpenid(xxhbbks.getXh()); -// kcWechatSendLog.setOpenid("2016900057");//指定曹老师账号 - kcWechatSendLog.setYtkcs(zyDbtx.getContent()); - sendWxmessage(kcWechatSendLog); - }catch (Exception e){ - e.printStackTrace(); - } +// try { +// KcWechatSendLog kcWechatSendLog = new KcWechatSendLog(); +// kcWechatSendLog.setOpenid(xxhbbks.getXh()); +//// kcWechatSendLog.setOpenid("2016900057");//指定曹老师账号 +// kcWechatSendLog.setYtkcs(zyDbtx.getContent()); +// sendWxmessage(kcWechatSendLog); +// }catch (Exception e){ +// e.printStackTrace(); +// } } return Result.OK(res); } @@ -435,17 +434,17 @@ public class WjxWjxxController extends JeecgController }else{ content = sysUser.getRealname()+"教师发起了["+wjxWjxx.getKcmc()+"]课程“"+wjxWjxx.getTitle()+"”问卷,该问卷完成时间： "+DateUtils.formatDate(wjxWjxx.getStartTime(),"yyyy-MM-dd")+" ~ "+DateUtils.formatDate(wjxWjxx.getEndTime(),"yyyy-MM-dd")+"，请及时完成"; } - for(Xxhbbks xxhbbks:list){ - try { - KcWechatSendLog kcWechatSendLog = new KcWechatSendLog(); - kcWechatSendLog.setOpenid(xxhbbks.getXh()); -// kcWechatSendLog.setOpenid("2016900057");//指定曹老师账号 - kcWechatSendLog.setYtkcs(content); - sendWxmessage(kcWechatSendLog); - }catch (Exception e){ - e.printStackTrace(); - } - } +// for(Xxhbbks xxhbbks:list){ +// try { +// KcWechatSendLog kcWechatSendLog = new KcWechatSendLog(); +// kcWechatSendLog.setOpenid(xxhbbks.getXh()); +//// kcWechatSendLog.setOpenid("2016900057");//指定曹老师账号 +// kcWechatSendLog.setYtkcs(content); +// sendWxmessage(kcWechatSendLog); +// }catch (Exception e){ +// e.printStackTrace(); +// } +// } return Result.OK(null); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java index 9978195b..6e441862 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java @@ -106,7 +106,7 @@ public class WjxWjxxTmlbController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(wjxWjxxTmlb, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - queryWrapper.groupBy("wj_title,wj_score,wj_sytype,wj_type,wj_answer"); + queryWrapper.groupBy("wj_title,wj_score,wj_type,wj_answer"); IPage pageList = wjxWjxxTmlbService.distinctList(page, queryWrapper); if(pageList.getRecords()!=null){ for(WjxWjxxTmlb par:pageList.getRecords()){ @@ -302,7 +302,6 @@ public class WjxWjxxTmlbController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; @@ -369,4 +368,44 @@ public class WjxWjxxTmlbController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(wjxWjxxTmlb, request.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + //配置选中数据查询条件 + String selections = request.getParameter("selections"); + if(oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + queryWrapper.in("id",selectionList); + } + //Step.2 获取导出数据 + List wjxWjxxTmlbList = wjxWjxxTmlbService.list(queryWrapper); + + // Step.3 组装pageList + List pageList = new ArrayList(); + for (WjxWjxxTmlb main : wjxWjxxTmlbList) { + WjxWjxxTmlbPage vo = new WjxWjxxTmlbPage(); + BeanUtils.copyProperties(main, vo); + List wjxWjxxTmxxList = wjxWjxxTmxxService.selectByMainId(main.getId()); + vo.setWjxWjxxTmxxList(wjxWjxxTmxxList); + pageList.add(vo); + } + + // Step.4 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + mv.addObject(NormalExcelConstants.FILE_NAME, "题目信息列表"); + mv.addObject(NormalExcelConstants.CLASS, WjxWjxxTmlbPage.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("题目信息数据", "导出人:"+sysUser.getRealname(), "题目信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java index 203e31fd..3dbbd345 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java @@ -47,7 +47,6 @@ public class WjxWjxxTmlb implements Serializable { @ApiModelProperty(value = "修改时间") private java.util.Date updateTime; /**问卷id*/ - @Excel(name = "问卷id", width = 15) @ApiModelProperty(value = "问卷id") private java.lang.String mainId; /**题目编号*/ @@ -55,11 +54,11 @@ public class WjxWjxxTmlb implements Serializable { @ApiModelProperty(value = "题目编号") private java.lang.Integer wjIndex; /**题目类型*/ - @Excel(name = "题目类型", width = 15) + @Excel(name = "题目类型", width = 15,dicCode = "wj_type") @ApiModelProperty(value = "题目类型") + @Dict(dicCode = "wj_type") private java.lang.Integer wjType; /**题目细分类*/ - @Excel(name = "题目细分类", width = 15) @ApiModelProperty(value = "题目细分类") private java.lang.Integer wjSubtype; /**问题标题*/ @@ -67,11 +66,9 @@ public class WjxWjxxTmlb implements Serializable { @ApiModelProperty(value = "问题标题") private java.lang.String wjTitle; /**是否必填*/ - @Excel(name = "是否必填", width = 15) @ApiModelProperty(value = "是否必填") private java.lang.String isRequir; /**是否是考试*/ - @Excel(name = "是否是考试", width = 15) @ApiModelProperty(value = "是否是考试") private java.lang.String wjCeshi; /**问题分值*/ @@ -79,7 +76,6 @@ public class WjxWjxxTmlb implements Serializable { @ApiModelProperty(value = "问题分值") private java.lang.Double wjScore; /**题目解析*/ - @Excel(name = "题目解析", width = 15) @ApiModelProperty(value = "题目解析") private java.lang.String wjParsing; /**正确答案*/ @@ -87,7 +83,6 @@ public class WjxWjxxTmlb implements Serializable { @ApiModelProperty(value = "正确答案") private java.lang.String wjAnswer; /**填写提示*/ - @Excel(name = "填写提示", width = 15) @ApiModelProperty(value = "填写提示") private java.lang.String prompt; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmxx.java index 33b6e711..cbb257a3 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmxx.java @@ -57,7 +57,6 @@ public class WjxWjxxTmxx implements Serializable { @ApiModelProperty(value = "选项标题") private java.lang.String itemTitle; /**选项文字描述*/ - @Excel(name = "选项文字描述", width = 15) @ApiModelProperty(value = "选项文字描述") private java.lang.String itemImageText; /**正确答案*/ @@ -66,7 +65,6 @@ public class WjxWjxxTmxx implements Serializable { @Dict(dicCode = "wj_zqda") private java.lang.String itemSelected; /**选项分值*/ - @Excel(name = "选项分值", width = 15) @ApiModelProperty(value = "选项分值") private java.lang.Double itemScore; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmlbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmlbMapper.xml index 3918726a..086c75ec 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmlbMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmlbMapper.xml @@ -3,8 +3,11 @@ \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java index 3b9c7748..b132ec2e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java @@ -46,20 +46,21 @@ public class WjxWjxxTmlbServiceImpl extends ServiceImpl wjxWjxxTmxxList) { + wjxWjxxTmlb.setWjLeixing("6"); wjxWjxxTmlbMapper.insert(wjxWjxxTmlb); if(wjxWjxxTmxxList!=null && wjxWjxxTmxxList.size()>0) { for(WjxWjxxTmxx entity:wjxWjxxTmxxList) { //外键设置 entity.setMainId(wjxWjxxTmlb.getId()); entity.setWjIndex(wjxWjxxTmlb.getWjIndex()); - String itemSelected[] = wjxWjxxTmlb.getItemSelected().split(","); - String sfxz = "false"; - for(String par:itemSelected){ - if(StringUtils.equals(par, entity.getItemIndex().toString())){ - sfxz = "true"; - } - } - entity.setItemSelected(sfxz); +// String itemSelected[] = wjxWjxxTmlb.getItemSelected().split(","); +// String sfxz = wjxWjxxTmlb.getItemSelected(); +// for(String par:itemSelected){ +// if(StringUtils.equals(par, entity.getItemIndex().toString())){ +// sfxz = "true"; +// } +// } +// entity.setItemSelected(sfxz); wjxWjxxTmxxMapper.insert(entity); } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java index a0551ef0..a2fe27c9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java @@ -44,7 +44,6 @@ public class WjxWjxxTmlbPage { @ApiModelProperty(value = "修改时间") private java.util.Date updateTime; /**问卷id*/ - @Excel(name = "问卷id", width = 15) @ApiModelProperty(value = "问卷id") private java.lang.String mainId; /**题目编号*/ @@ -52,11 +51,11 @@ public class WjxWjxxTmlbPage { @ApiModelProperty(value = "题目编号") private java.lang.Integer wjIndex; /**题目类型*/ - @Excel(name = "题目类型", width = 15) + @Excel(name = "题目类型", width = 15,dicCode = "wj_type") @ApiModelProperty(value = "题目类型") + @Dict(dicCode = "wj_type") private java.lang.Integer wjType; /**题目细分类*/ - @Excel(name = "题目细分类", width = 15) @ApiModelProperty(value = "题目细分类") private java.lang.Integer wjSubtype; /**问题标题*/ @@ -64,11 +63,9 @@ public class WjxWjxxTmlbPage { @ApiModelProperty(value = "问题标题") private java.lang.String wjTitle; /**是否必填*/ - @Excel(name = "是否必填", width = 15) @ApiModelProperty(value = "是否必填") private java.lang.String isRequir; /**是否是考试*/ - @Excel(name = "是否是考试", width = 15) @ApiModelProperty(value = "是否是考试") private java.lang.String wjCeshi; /**问题分值*/ @@ -76,7 +73,6 @@ public class WjxWjxxTmlbPage { @ApiModelProperty(value = "问题分值") private java.lang.Double wjScore; /**题目解析*/ - @Excel(name = "题目解析", width = 15) @ApiModelProperty(value = "题目解析") private java.lang.String wjParsing; /**正确答案*/ @@ -84,7 +80,6 @@ public class WjxWjxxTmlbPage { @ApiModelProperty(value = "正确答案") private java.lang.String wjAnswer; /**填写提示*/ - @Excel(name = "填写提示", width = 15) @ApiModelProperty(value = "填写提示") private java.lang.String prompt; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/controller/ZyGonggaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/controller/ZyGonggaoController.java index 3c9c0122..3b932a89 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/controller/ZyGonggaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/controller/ZyGonggaoController.java @@ -69,7 +69,7 @@ public class ZyGonggaoController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyGonggao, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - queryWrapper.eq(StringUtils.isNotBlank(zyGonggao.getTeano()),"create_by",zyGonggao.getTeano()); +// queryWrapper.eq(StringUtils.isNotBlank(zyGonggao.getTeano()),"create_by",zyGonggao.getTeano()); IPage pageList = zyGonggaoService.page(page, queryWrapper); return Result.OK(pageList); } 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 8d08fd0b..196191ad 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 @@ -103,7 +103,7 @@ public class ZyInfoController extends JeecgController { QueryWrapper queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.eq("create_by",zyInfo.getTeano()); +// queryWrapper2.eq("create_by",zyInfo.getTeano()); queryWrapper2.eq("rwbh",zyInfo.getRwbh()); queryWrapper2.eq("xnxq",zyInfo.getXnxq()); queryWrapper2.eq("zy_status","0"); @@ -130,11 +130,11 @@ public class ZyInfoController extends JeecgController { List list = xxhbbksService.getXsxkbAllList(queryWrapper); zyInfoStudentService.deleteMainId(zyInfo2.getId()); for(Xxhbbks xxhbbks:list){ - ZyInfoStudent zyInfoStudent = new ZyInfoStudent(); - zyInfoStudent.setMainId(zyInfo2.getId()); - zyInfoStudent.setCreateBy(xxhbbks.getXh()); - zyInfoStudent.setStudentName(xxhbbks.getXm()); - zyInfoStudentService.save(zyInfoStudent); +// ZyInfoStudent zyInfoStudent = new ZyInfoStudent(); +// zyInfoStudent.setMainId(zyInfo2.getId()); +// zyInfoStudent.setCreateBy(xxhbbks.getXh()); +// zyInfoStudent.setStudentName(xxhbbks.getXm()); +// zyInfoStudentService.save(zyInfoStudent); //作业代办提醒 ZyDbtx zyDbtx = new ZyDbtx(); @@ -175,9 +175,16 @@ public class ZyInfoController extends JeecgController { queryWrapper.eq(StringUtils.isNotBlank(zyInfo.getTeano()),"a.create_by",zyInfo.getTeano()); queryWrapper.orderByAsc("a.sort - 0"); IPage pageList = zyInfoService.page(page, queryWrapper); + pageList.getRecords().forEach(zyInfo1 -> { + String xkrs = kcKechengbiao.getXkrs(); + zyInfo1.setXkxs(xkrs); + int wtj = Integer.parseInt(xkrs)-Integer.parseInt(zyInfo1.getDpynum())-Integer.parseInt(zyInfo1.getYpynum()); + zyInfo1.setWtjnum(wtj+""); + }); return Result.OK(pageList); } - + + /** * 添加 * @@ -221,7 +228,7 @@ public class ZyInfoController extends JeecgController { QueryWrapper zyInfoQueryWrapper = new QueryWrapper<>(); zyInfoQueryWrapper.eq("xnxq",zyInfo.getXnxq()); - zyInfoQueryWrapper.eq("create_by",zyInfo.getTeano()); +// zyInfoQueryWrapper.eq("create_by",zyInfo.getTeano()); zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); if(StringUtils.isNotBlank(zyInfo.getZyLeixing())){ zyInfoQueryWrapper.eq("zy_leixing",zyInfo.getZyLeixing()); @@ -248,6 +255,69 @@ public class ZyInfoController extends JeecgController { @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ZyInfo zyInfo) { zyInfoService.updateById(zyInfo); + + + ZyInfo zyInfo2 = zyInfoService.getById(zyInfo.getId()); + if(StringUtils.equals(zyInfo2.getZyStatus(),"1")){ + QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); + 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","2");//发送作业 + zyDbtxQueryWrapper.eq("rwbh",zyInfo.getRwbh()); + 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); + } + List list = xxhbbksService.getXsxkbAllList(queryWrapper); + + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + for(Xxhbbks xxhbbks:list) { + + //作业代办提醒 + ZyDbtx zyDbtx = new ZyDbtx(); + zyDbtx.setCreateBy(xxhbbks.getXh()); + zyDbtx.setMainId(zyInfo.getId()); + zyDbtx.setRwbh(zyInfo.getRwbh()); + String hpts = ""; + if (StringUtils.equals(zyInfo.getXshpkg(), "1")) { + hpts = "互评时间：" + DateUtils.formatDate(zyInfo.getXshpkssj(), "yyyy-MM-dd HH:mm") + " ~ " + DateUtils.formatDate(zyInfo.getXshpjssj(), "yyyy-MM-dd HH:mm"); + } + + if (StringUtils.equals(zyInfo.getZyLeixing(), "0")) { + zyDbtx.setType("0");//0发布作业 1评分 2测验 3问卷 4讨论 + zyDbtx.setContent(user.getRealname() + "老师主讲的[" + kcKechengbiao.getKcmc() + "]课程于" + DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss") + "发布了一篇题目为“" + zyInfo.getTitle() + "”的作业，该作业提交时间为：" + DateUtils.formatDate(zyInfo.getStartTime(), "yyyy-MM-dd HH:mm") + " ~ " + DateUtils.formatDate(zyInfo.getEndTime(), "yyyy-MM-dd HH:mm") + "，请按时完成！ " + hpts); + } else if (StringUtils.equals(zyInfo.getZyLeixing(), "1")) { + zyDbtx.setType("10");//0发布作业 1评分 2测验 3问卷 4讨论 + zyDbtx.setContent(user.getRealname() + "老师主讲的[" + kcKechengbiao.getKcmc() + "]课程于" + DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss") + "发布了一篇题目为“" + zyInfo.getTitle() + "”的期末考试，该期末考试提交时间为：" + DateUtils.formatDate(zyInfo.getStartTime(), "yyyy-MM-dd HH:mm") + " ~ " + DateUtils.formatDate(zyInfo.getEndTime(), "yyyy-MM-dd HH:mm") + "，请按时完成！ " + hpts); + } + zyDbtx.setFlag("0"); + zyDbtx.setFbr(user.getUsername()); + zyDbtxService.save(zyDbtx); + +// try { +// KcWechatSendLog kcWechatSendLog = new KcWechatSendLog(); +// kcWechatSendLog.setOpenid(xxhbbks.getXh()); +// kcWechatSendLog.setYtkcs(zyDbtx.getContent()); +// sendWxmessage(kcWechatSendLog); +// } catch (Exception e) { +// e.printStackTrace(); +// } + } + } + return Result.OK("编辑成功!"); } @@ -313,12 +383,12 @@ public class ZyInfoController extends JeecgController { kcKechengbiaoQueryWrapper.last("limit 1"); KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); for(Xxhbbks xxhbbks:list){ - ZyInfoStudent zyInfoStudent = new ZyInfoStudent(); - zyInfoStudent.setMainId(zyInfo.getId()); - zyInfoStudent.setCreateBy(xxhbbks.getXh()); - zyInfoStudent.setStudentName(xxhbbks.getXm()); - zyInfoStudent.setZyLeixing(zyInfo.getZyLeixing()); - zyInfoStudentService.save(zyInfoStudent); +// ZyInfoStudent zyInfoStudent = new ZyInfoStudent(); +// zyInfoStudent.setMainId(zyInfo.getId()); +// zyInfoStudent.setCreateBy(xxhbbks.getXh()); +// zyInfoStudent.setStudentName(xxhbbks.getXm()); +// zyInfoStudent.setZyLeixing(zyInfo.getZyLeixing()); +// zyInfoStudentService.save(zyInfoStudent); //作业代办提醒 ZyDbtx zyDbtx = new ZyDbtx(); @@ -418,7 +488,6 @@ public class ZyInfoController extends JeecgController { zyInfoService.removeById(id); QueryWrapper zyInfoQueryWrapper = new QueryWrapper<>(); zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); - zyInfoQueryWrapper.eq("create_by",zyInfo.getCreateBy()); zyInfoQueryWrapper.eq("xnxq",zyInfo.getXnxq()); zyInfoQueryWrapper.eq("zy_leixing","0"); zyInfoQueryWrapper.orderByAsc("sort-0"); @@ -497,10 +566,9 @@ public class ZyInfoController extends JeecgController { HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfo, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - queryWrapper.apply("a.id = b.main_id "); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - queryWrapper.eq("b.create_by",sysUser.getUsername()); - queryWrapper.eq(StringUtils.isNotBlank(zyInfo.getTeano()),"a.create_by",zyInfo.getTeano()); + queryWrapper.eq("c.KCAPZBBH",zyInfo.getRwbh()); + queryWrapper.eq("c.xh",sysUser.getUsername()); queryWrapper.orderByDesc("a.sort"); IPage pageList = zyInfoService.stuList(page, queryWrapper); return Result.OK(pageList); @@ -610,8 +678,8 @@ public class ZyInfoController extends JeecgController { @ApiOperation(value="作业发布-通过id查询", notes="作业发布-通过id查询") @GetMapping(value = "/queryZyinfoByStuId") public Result queryZyinfoByStuId(@RequestParam(name="id",required=true) String id) { - ZyInfoStudent zyInfoStudent = zyInfoStudentService.getById(id); - ZyInfo zyInfo = zyInfoService.getById(zyInfoStudent.getMainId()); +// ZyInfoStudent zyInfoStudent = zyInfoStudentService.getById(id); + ZyInfo zyInfo = zyInfoService.getById(id); return Result.OK(zyInfo); } @@ -746,7 +814,8 @@ public class ZyInfoController extends JeecgController { @ApiOperation(value="作业发布-通过id查询", notes="作业发布-通过id查询") @GetMapping(value = "/zyzb") - public Result> zyzb(@RequestParam(name="rwbh") String rwbh,@RequestParam(name="xqxn") String xqxn,@RequestParam(name="teano") String teano,@RequestParam(name="zyLeixing") String zyLeixing) { + public Result> zyzb(@RequestParam(name="rwbh") String rwbh,@RequestParam(name="xqxn") String xqxn,@RequestParam(name="zyLeixing") String zyLeixing) { + String teano = null; List zyInfo = zyInfoService.zyzb(rwbh,xqxn,teano,zyLeixing); return Result.OK(zyInfo); } 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 772c5da7..81bbcbc6 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 @@ -28,4 +28,5 @@ public interface ZyInfoMapper extends BaseMapper { ZyInfo getKechengById(@Param("id") String id); List zyzb(@Param("rwbh")String rwbh, @Param("xqxn")String xqxn, @Param("teano")String teano, @Param("zyLeixing")String zyLeixing); + } 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 a4c06e96..f9699109 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 @@ -3,9 +3,13 @@ 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 577149ca..260e86a3 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 @@ -26,4 +26,5 @@ public interface IZyInfoService extends IService { ZyInfo getKechengById(String id); List zyzb(String rwbh, String xqxn, String teano, String zyLeixing); + } 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 70de599f..89ce2ddd 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 @@ -46,4 +46,5 @@ public class ZyInfoServiceImpl extends ServiceImpl impleme public List zyzb(String rwbh, String xqxn, String teano, String zyLeixing) { return baseMapper.zyzb(rwbh,xqxn,teano,zyLeixing); } + } 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 bed3838f..ef3f48e7 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 @@ -195,6 +195,74 @@ public class ZyInfoStudentController extends JeecgController> getList2(ZyInfoStudent zyInfoStudent, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfoStudent, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + + if(StringUtils.isNotEmpty(zyInfoStudent.getQueryType())){ + if(StringUtils.equals("1",zyInfoStudent.getQueryType())){//未提交 + queryWrapper.isNull("a.file_path"); + }else if(StringUtils.equals("2",zyInfoStudent.getQueryType())){//已提交 + queryWrapper.isNotNull("a.file_path"); + }else if(StringUtils.equals("3",zyInfoStudent.getQueryType())){//未评阅 + queryWrapper.isNull("a.score"); + }else if(StringUtils.equals("4",zyInfoStudent.getQueryType())){//已评阅 + queryWrapper.isNotNull("a.score"); + }else if(StringUtils.equals("5",zyInfoStudent.getQueryType())){//已评阅 + queryWrapper.isNull("a.score"); + queryWrapper.isNotNull("a.file_path"); + } + } + queryWrapper.eq(StringUtils.isNotEmpty(zyInfoStudent.getYwid()),"b.id",zyInfoStudent.getYwid()); + queryWrapper.eq(StringUtils.isNotEmpty(zyInfoStudent.getRwbh()),"c.KCAPZBBH",zyInfoStudent.getRwbh()); + IPage pageList = zyInfoStudentService.getList2(page, queryWrapper); + for(ZyInfoStudent ZyInfoStudentPar:pageList.getRecords()){ + List list = zyInfoStudentService.getCcjg(ZyInfoStudentPar); + for(ZyInfoStudent par:list){ + if(StringUtils.equals(par.getCcType(),"0")){//外网 + ZyInfoStudentPar.setWwpaperdownurl(par.getPaperdownurl()); + ZyInfoStudentPar.setWwpaperviewurl(par.getPaperviewurl()); + ZyInfoStudentPar.setWwfilestateid(par.getFilestateid()); + ZyInfoStudentPar.setWwmessage(par.getMessage()); + }else if(StringUtils.equals(par.getCcType(),"1")){//作业 + ZyInfoStudentPar.setZypaperdownurl(par.getPaperdownurl()); + ZyInfoStudentPar.setZypaperviewurl(par.getPaperviewurl()); + ZyInfoStudentPar.setZyfilestateid(par.getFilestateid()); + ZyInfoStudentPar.setZymessage(par.getMessage()); + }else if(StringUtils.equals(par.getCcType(),"2")){//aigc + ZyInfoStudentPar.setAigcpaperdownurl(par.getPaperdownurl()); + ZyInfoStudentPar.setAigcpaperviewurl(par.getPaperviewurl()); + ZyInfoStudentPar.setAigcfilestateid(par.getFilestateid()); + ZyInfoStudentPar.setAigcmessage(par.getMessage()); + }else if(StringUtils.equals(par.getCcType(),"3")){//学校 + ZyInfoStudentPar.setXxpaperdownurl(par.getPaperdownurl()); + ZyInfoStudentPar.setXxpaperviewurl(par.getPaperviewurl()); + ZyInfoStudentPar.setXxfilestateid(par.getFilestateid()); + ZyInfoStudentPar.setXxmessage(par.getMessage()); + } + } + } + return Result.OK(pageList); + } /** * 添加 @@ -528,8 +596,24 @@ public class ZyInfoStudentController extends JeecgController zyscStu(@RequestBody ZyInfoStudent zyInfoStudent, HttpServletResponse response) { - ZyInfoStudent stuPar = zyInfoStudentService.getById(zyInfoStudent.getId()); - ZyInfo zyInfo = zyInfoService.getById(stuPar.getMainId()); + ZyInfoStudent stuPar = zyInfoStudentService.getById(zyInfoStudent.getStuId()); + ZyInfo zyInfo = zyInfoService.getById(zyInfoStudent.getMainId()); + if(stuPar==null) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + ZyInfoStudent zyInfoStudent1 = new ZyInfoStudent(); + zyInfoStudent1.setMainId(zyInfo.getId()); + zyInfoStudent1.setCreateBy(user.getUsername()); + zyInfoStudent1.setCreateTime(new Date()); + zyInfoStudent1.setFilePath(zyInfoStudent.getFilePath()); + zyInfoStudent1.setStudentName(user.getRealname()); + zyInfoStudentService.save(zyInfoStudent1); + stuPar =zyInfoStudent1; + zyInfoStudent =zyInfoStudent1; + }else{ + stuPar.setFilePath(zyInfoStudent.getFilePath()); + + zyInfoStudent =stuPar; + } //判断是否可以取消代办xshpkg if(StringUtils.equals("0",zyInfo.getXshpkg())){ diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java index 4b582409..c5a56523 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java @@ -217,5 +217,9 @@ public class ZyInfoStudent implements Serializable { private String pfbz;//评分标准 @TableField(exist = false) private String sturead;//评分标准是否允许学生查看 + @TableField(exist = false) + private String ywid;//业务id + @TableField(exist = false) + private String stuId;//学生作业临时id } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java index f5501110..3a76b1e8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java @@ -42,4 +42,6 @@ public interface ZyInfoStudentMapper extends BaseMapper { IPage getHpxxList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper,@Param("zyStuId")String zyStuId); void updateJxfs2(ZyInfo jspc); + + IPage getList2(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml index a6993de8..d3ad859b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml @@ -19,6 +19,20 @@ ${ew.customSqlSegment} + +