From e485fcbca9502cb2bbc8d3275f5e60eae0bd4ec2 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 23 Aug 2024 22:21:34 +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 --- .../kc/zyJxdgBanben/entity/ZyJxdgMain.java | 5 + .../service/impl/ZyJxdgBanbenServiceImpl.java | 8 +- .../ZyJxdgTeacherMainController.java | 23 +++-- .../entity/ZyJxdgTeacherMain.java | 4 + .../service/IZyJxdgTeacherMainService.java | 2 + .../impl/ZyJxdgTeacherMainServiceImpl.java | 97 ++++++++++++++++++- 6 files changed, 122 insertions(+), 17 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgBanben/entity/ZyJxdgMain.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgBanben/entity/ZyJxdgMain.java index 4c1a8cb3..918f992b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgBanben/entity/ZyJxdgMain.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgBanben/entity/ZyJxdgMain.java @@ -80,6 +80,11 @@ public class ZyJxdgMain implements Serializable { @TableField(exist = false) private java.lang.String content; + @TableField(exist = false) + private java.lang.String rwbh; + @TableField(exist = false) + private java.lang.String teacherNo; + @TableField(exist = false) @ApiModelProperty(value = "教学大纲配置信息") private List zyJxdgPzxxList; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgBanben/service/impl/ZyJxdgBanbenServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgBanben/service/impl/ZyJxdgBanbenServiceImpl.java index f8a48412..289b6ace 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgBanben/service/impl/ZyJxdgBanbenServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgBanben/service/impl/ZyJxdgBanbenServiceImpl.java @@ -42,10 +42,10 @@ public class ZyJxdgBanbenServiceImpl extends ServiceImpl0 && (StringUtils.equals("4",entity.getType()) || StringUtils.equals("5",entity.getType()) || StringUtils.equals("9",entity.getType()) || StringUtils.equals("10",entity.getType()))) { + if(entity.getZyJxdgPzxxList()!=null && entity.getZyJxdgPzxxList().size()>0 && (StringUtils.equals("4",entity.getType()) || StringUtils.equals("5",entity.getType()) || StringUtils.equals("9",entity.getType()) || StringUtils.equals("10",entity.getType()) || StringUtils.equals("11",entity.getType()))) { for(ZyJxdgPzxx zyJxdgPzxx:entity.getZyJxdgPzxxList()) { - zyJxdgPzxx.setMainId(entity.getId()); - zyJxdgPzxx.setTwoMainId(zyJxdgBanben.getId()); + zyJxdgPzxx.setMainId(zyJxdgBanben.getId()); + zyJxdgPzxx.setTwoMainId(entity.getId()); zyJxdgPzxxMapper.insert(zyJxdgPzxx); } } @@ -70,7 +70,7 @@ public class ZyJxdgBanbenServiceImpl extends ServiceImpl0 && (StringUtils.equals("4",entity.getType()) || StringUtils.equals("5",entity.getType()) || StringUtils.equals("9",entity.getType()) || StringUtils.equals("10",entity.getType()))) { + if(entity.getZyJxdgPzxxList()!=null && entity.getZyJxdgPzxxList().size()>0 && (StringUtils.equals("4",entity.getType()) || StringUtils.equals("5",entity.getType()) || StringUtils.equals("9",entity.getType()) || StringUtils.equals("10",entity.getType())|| StringUtils.equals("11",entity.getType()))) { for(ZyJxdgPzxx zyJxdgPzxx:entity.getZyJxdgPzxxList()) { zyJxdgPzxx.setMainId(zyJxdgBanben.getId()); zyJxdgPzxx.setTwoMainId(entity.getId()); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/controller/ZyJxdgTeacherMainController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/controller/ZyJxdgTeacherMainController.java index 3b4cd071..079e8691 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/controller/ZyJxdgTeacherMainController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/controller/ZyJxdgTeacherMainController.java @@ -109,17 +109,16 @@ public class ZyJxdgTeacherMainController { */ @AutoLog(value = "教师填写教学大纲-编辑") @ApiOperation(value="教师填写教学大纲-编辑", notes="教师填写教学大纲-编辑") - @RequiresPermissions("zyJxdgTeacherMain:zy_jxdg_teacher_main:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ZyJxdgTeacherMainPage zyJxdgTeacherMainPage) { ZyJxdgTeacherMain zyJxdgTeacherMain = new ZyJxdgTeacherMain(); BeanUtils.copyProperties(zyJxdgTeacherMainPage, zyJxdgTeacherMain); - ZyJxdgTeacherMain zyJxdgTeacherMainEntity = zyJxdgTeacherMainService.getById(zyJxdgTeacherMain.getId()); - if(zyJxdgTeacherMainEntity==null) { - return Result.error("未找到对应数据"); - } - zyJxdgTeacherMainService.updateMain(zyJxdgTeacherMain, zyJxdgTeacherMainPage.getZyJxdgTeacherCenterList()); - return Result.OK("编辑成功!"); +// ZyJxdgTeacherMain zyJxdgTeacherMainEntity = zyJxdgTeacherMainService.getById(zyJxdgTeacherMain.getId()); +// if(zyJxdgTeacherMainEntity==null) { +// return Result.error("未找到对应数据"); +// } + zyJxdgTeacherMainService.updateById(zyJxdgTeacherMain); + return Result.OK("操作成功!"); } /** @@ -301,9 +300,17 @@ public class ZyJxdgTeacherMainController { public Result queryByRwbh(ZyJxdgTeacherMain zyJxdgTeacherMain) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("rwbh",zyJxdgTeacherMain.getRwbh()); - queryWrapper.eq("teacher_no",zyJxdgTeacherMain.getTeacherNo()); +// queryWrapper.eq("teacher_no",zyJxdgTeacherMain.getTeacherNo()); queryWrapper.last("limit 1"); ZyJxdgTeacherMain list = zyJxdgTeacherMainService.getOne(queryWrapper); + return Result.OK(list); + } + + + @ApiOperation(value="获取教学大纲教师填写信息", notes="获取教学大纲教师填写信息") + @GetMapping(value = "/queryZyJxdgMainListByMainId3") + public Result> queryZyJxdgMainListByMainId3(ZyJxdgMain zyJxdgMain) { + List list = zyJxdgTeacherMainService.queryZyJxdgMainListByMainId3(zyJxdgMain); if(list==null) { return Result.error("未找到对应数据"); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/entity/ZyJxdgTeacherMain.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/entity/ZyJxdgTeacherMain.java index 61d7e169..8e778bde 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/entity/ZyJxdgTeacherMain.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/entity/ZyJxdgTeacherMain.java @@ -85,4 +85,8 @@ public class ZyJxdgTeacherMain implements Serializable { @Excel(name = "选课人数", width = 15) @ApiModelProperty(value = "选课人数") private java.lang.String xkrs; + /**学期学年*/ + @Excel(name = "学期学年", width = 15) + @ApiModelProperty(value = "学期学年") + private java.lang.String xqxn; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/service/IZyJxdgTeacherMainService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/service/IZyJxdgTeacherMainService.java index 33ca6762..26d4827e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/service/IZyJxdgTeacherMainService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/service/IZyJxdgTeacherMainService.java @@ -53,4 +53,6 @@ public interface IZyJxdgTeacherMainService extends IService { List queryByRwbhList(String id, String teacherNo); void editMap(Map map); + + List queryZyJxdgMainListByMainId3(ZyJxdgMain zyJxdgMain); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/service/impl/ZyJxdgTeacherMainServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/service/impl/ZyJxdgTeacherMainServiceImpl.java index cf33f63e..9f205eb0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/service/impl/ZyJxdgTeacherMainServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/service/impl/ZyJxdgTeacherMainServiceImpl.java @@ -105,7 +105,9 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl kcKechengbiaoQueryWrapper = new QueryWrapper<>(); kcKechengbiaoQueryWrapper.eq("xqxn",kcSysConfig.getFlag1()); kcKechengbiaoQueryWrapper.eq("rwbh",rwbh); - kcKechengbiaoQueryWrapper.eq("jgh",teacherNo); + if(StringUtils.isNotEmpty(teacherNo)&&!StringUtils.equals(teacherNo,"null")){ + kcKechengbiaoQueryWrapper.eq("jgh",teacherNo); + } kcKechengbiaoQueryWrapper.last("limit 1"); KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); @@ -115,6 +117,8 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl zyJxdgTeacherCenterList = new ArrayList<>(); List> list = (List>) map.get("list"); @@ -158,6 +162,9 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl par3 : list3){ String threeId = par2.get("id")+""; String content = par3.get(threeId)+""; + if(StringUtils.equals(content,"null")){ + content = ""; + } ZyJxdgTeacherCenter ZyJxdgTeacherCenter = new ZyJxdgTeacherCenter(); ZyJxdgTeacherCenter.setOneId(oneId); ZyJxdgTeacherCenter.setTwoId(twoId); @@ -174,6 +181,9 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl par2 : list2){ String content = par2.get("title")+""; + if(StringUtils.equals(content,"null")){ + content = ""; + } ZyJxdgTeacherCenter ZyJxdgTeacherCenter = new ZyJxdgTeacherCenter(); ZyJxdgTeacherCenter.setOneId(oneId); ZyJxdgTeacherCenter.setTwoId(twoId); @@ -195,7 +205,8 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("rwbh",rwbh); - queryWrapper.eq("teacher_no",teacherNo); +// queryWrapper.eq("teacher_no",teacherNo); queryWrapper.last("limit 1"); ZyJxdgTeacherMain zyJxdgTeacherMain= zyJxdgTeacherMainMapper.selectOne(queryWrapper); List conlist = zyJxdgTeacherCenterMapper.selectByMainId(zyJxdgTeacherMain.getId()); @@ -239,7 +250,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl> listmap2 = new ArrayList<>(); for(int i=0;i< list2.size();i++){ @@ -317,7 +328,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl> list2 = (List>) par.get("zyJxdgPzxxList"); List> list3 = (List>) par.get("list"); for(Map par2 : list2){ @@ -325,6 +336,9 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl> list2 = (List>) par.get("list"); for(Map par2 : list2){ String content = par2.get("title")+""; + if(StringUtils.equals(content,"null")){ + content = ""; + } ZyJxdgTeacherCenter ZyJxdgTeacherCenter = new ZyJxdgTeacherCenter(); ZyJxdgTeacherCenter.setOneId(oneId); ZyJxdgTeacherCenter.setTwoId(twoId); @@ -370,4 +387,74 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl queryZyJxdgMainListByMainId3(ZyJxdgMain zyJxdgMain) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("rwbh",zyJxdgMain.getRwbh()); + queryWrapper.eq("teacher_no",zyJxdgMain.getTeacherNo()); + queryWrapper.last("limit 1"); + ZyJxdgTeacherMain zyJxdgTeacherMain= zyJxdgTeacherMainMapper.selectOne(queryWrapper); + List conlist = new ArrayList<>(); + if(zyJxdgTeacherMain!=null){ + conlist = zyJxdgTeacherCenterMapper.selectByMainId(zyJxdgTeacherMain.getId()); + } + + + List list = zyJxdgMainMapper.selectByMainId(zyJxdgMain.getMainId()); + for(ZyJxdgMain par : list){ + List list2 = zyJxdgPzxxMapper.selectByTwoMainId(par.getId()); + List> listMap = new ArrayList<>(); + if(StringUtils.equals(par.getType(),"4")){ + for(ZyJxdgPzxx par2 : list2){ + for(ZyJxdgTeacherCenter par3 : conlist){ + if(StringUtils.equals(par2.getId(),par3.getThreeId())){ + par2.setContent(par3.getContent()); + } + } + } + }else if(StringUtils.equals(par.getType(),"6") || StringUtils.equals(par.getType(),"7") || StringUtils.equals(par.getType(),"8")){ + for(ZyJxdgTeacherCenter par3 : conlist){ + if(StringUtils.equals(par.getId(),par3.getTwoId())&&StringUtils.isEmpty(par3.getThreeId())){ + Map map = new HashMap<>(); + map.put("title", par3.getContent()); + listMap.add(map); + } + } + }else if(StringUtils.equals(par.getType(),"5") || StringUtils.equals(par.getType(),"9")|| StringUtils.equals(par.getType(),"10")|| StringUtils.equals(par.getType(),"11")){ + + List> listmap2 = new ArrayList<>(); + for(int i=0;i< list2.size();i++){ + int j=0; + ZyJxdgPzxx par2 = list2.get(i); + for(ZyJxdgTeacherCenter par3 : conlist){ + if(StringUtils.equals(par2.getId(),par3.getThreeId())) { + Map map3 = new HashMap<>(); + if(i==0){ + map3.put(par2.getId(), par3.getContent()); + listmap2.add(map3); + }else{ + listmap2.get(j).put(par3.getThreeId(), par3.getContent()); + } + j++; + } + } + } + listMap = listmap2; + }else{ + for(ZyJxdgTeacherCenter par3 : conlist){ + if(StringUtils.equals(par.getId(),par3.getTwoId())&&StringUtils.isEmpty(par3.getThreeId())){ + par.setContent(par3.getContent()); + } + } + } + par.setList(listMap); + par.setZyJxdgPzxxList(list2); + } + + + + return list; + } + }