From c38b280ded6c969898a22f231479ef09b10bf04f Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 26 Aug 2024 10:15:33 +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 | 4 + .../kc/zyJxdgBanben/entity/ZyJxdgMain.java | 5 + .../service/impl/ZyJxdgBanbenServiceImpl.java | 4 +- .../entity/ZyJxdgTeacherMain.java | 8 + .../impl/ZyJxdgTeacherMainServiceImpl.java | 278 ++++++++++++++++-- .../vo/ZyJxdgTeacherMainPage.java | 13 + 6 files changed, 292 insertions(+), 20 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 85778ae5..911cff58 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 @@ -223,6 +223,9 @@ public class ZyInfoController extends JeecgController { zyInfoQueryWrapper.eq("xnxq",zyInfo.getXnxq()); zyInfoQueryWrapper.eq("create_by",zyInfo.getTeano()); zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); + if(StringUtils.isNotBlank(zyInfo.getZyLeixing())){ + zyInfoQueryWrapper.eq("zy_leixing",zyInfo.getZyLeixing()); + } List list = zyInfoService.list(zyInfoQueryWrapper); zyInfo.setSort(list.size()+1); @@ -417,6 +420,7 @@ public class ZyInfoController extends JeecgController { 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"); List list = zyInfoService.list(zyInfoQueryWrapper); for(int i=0;i> list; + @TableField(exist = false) + @ApiModelProperty(value = "教学大纲配置信息") + private List>> list2Map; } 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 289b6ace..908a8a31 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,7 +42,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()) || StringUtils.equals("11",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())|| StringUtils.equals("12",entity.getType())|| StringUtils.equals("13",entity.getType())|| StringUtils.equals("14",entity.getType())|| StringUtils.equals("15",entity.getType()))) { for(ZyJxdgPzxx zyJxdgPzxx:entity.getZyJxdgPzxxList()) { zyJxdgPzxx.setMainId(zyJxdgBanben.getId()); zyJxdgPzxx.setTwoMainId(entity.getId()); @@ -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())|| StringUtils.equals("11",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())|| StringUtils.equals("12",entity.getType())|| StringUtils.equals("13",entity.getType())|| StringUtils.equals("14",entity.getType())|| StringUtils.equals("15",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/entity/ZyJxdgTeacherMain.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/entity/ZyJxdgTeacherMain.java index 8e778bde..1157cd76 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 @@ -89,4 +89,12 @@ public class ZyJxdgTeacherMain implements Serializable { @Excel(name = "学期学年", width = 15) @ApiModelProperty(value = "学期学年") private java.lang.String xqxn; + /**版本名称*/ + @Excel(name = "版本名称", width = 15) + @ApiModelProperty(value = "版本名称") + private java.lang.String banbenName; + /**发布名称*/ + @Excel(name = "发布名称", width = 15) + @ApiModelProperty(value = "发布名称") + private java.lang.String fbName; } 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 9f205eb0..083218cd 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 @@ -11,6 +11,7 @@ import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService; import org.jeecg.modules.kc.zyJxdgBanben.entity.ZyJxdgBanben; import org.jeecg.modules.kc.zyJxdgBanben.entity.ZyJxdgMain; import org.jeecg.modules.kc.zyJxdgBanben.entity.ZyJxdgPzxx; +import org.jeecg.modules.kc.zyJxdgBanben.mapper.ZyJxdgBanbenMapper; import org.jeecg.modules.kc.zyJxdgBanben.mapper.ZyJxdgMainMapper; import org.jeecg.modules.kc.zyJxdgBanben.mapper.ZyJxdgPzxxMapper; import org.jeecg.modules.kc.zyJxdgTeacherMain.entity.ZyJxdgTeacherMain; @@ -47,6 +48,8 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl zyJxdgTeacherCenterList = new ArrayList<>(); List> list = (List>) map.get("list"); @@ -154,7 +161,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl> list2 = (List>) par.get("zyJxdgPzxxList"); List> list3 = (List>) par.get("list"); if(list2!=null && list3!=null){ @@ -193,6 +200,56 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl>> list2 = (List>>) par.get("list2Map"); + for(List> par2 : list2){ + for(Map par3 : par2){ + String threeId = par3.get("key")+""; + String content = par3.get("title")+""; + if(StringUtils.equals(content,"null")){ + content = ""; + } + ZyJxdgTeacherCenter ZyJxdgTeacherCenter = new ZyJxdgTeacherCenter(); + ZyJxdgTeacherCenter.setOneId(oneId); + ZyJxdgTeacherCenter.setTwoId(twoId); + ZyJxdgTeacherCenter.setThreeId(threeId); + ZyJxdgTeacherCenter.setContent(content); + ZyJxdgTeacherCenter.setType(par.get("type")+""); + zyJxdgTeacherCenterList.add(ZyJxdgTeacherCenter); + } + } + }else if(StringUtils.equals(par.get("type")+"","13")){ + List> list2 = (List>) par.get("zyJxdgPzxxList"); + List> list3 = (List>) par.get("list"); + for(Map par2 : list2){ + for(Map par3 : list3){ + List> map4 = (List>) par3.get("list"); + for(Map par4 : map4){ + String threeId = par2.get("id")+""; + String key = par4.get("key")+""; + if(StringUtils.equals(threeId,key)){ + String content = par4.get("content")+""; + if(StringUtils.equals(content,"null")){ + content = ""; + }else{ + if(content.indexOf("[")>-1){ + content = content.replace("[",""); + content = content.replace("]",""); + } + } + ZyJxdgTeacherCenter ZyJxdgTeacherCenter = new ZyJxdgTeacherCenter(); + ZyJxdgTeacherCenter.setOneId(oneId); + ZyJxdgTeacherCenter.setTwoId(twoId); + ZyJxdgTeacherCenter.setThreeId(threeId); + ZyJxdgTeacherCenter.setContent(content); + ZyJxdgTeacherCenter.setType(par4.get("type")+""); + zyJxdgTeacherCenterList.add(ZyJxdgTeacherCenter); + } + + } + } + } + } } @@ -206,6 +263,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl conlist = zyJxdgTeacherCenterMapper.selectByMainId(zyJxdgTeacherMain.getId()); - List list = zyJxdgMainMapper.selectByMainId(zyJxdgTeacherMain.getBanbenId()); for(ZyJxdgMain par : list){ List list2 = zyJxdgPzxxMapper.selectByTwoMainId(par.getId()); List> listMap = new ArrayList<>(); + List>> list2Map = new ArrayList<>(); if(StringUtils.equals(par.getType(),"4")){ for(ZyJxdgPzxx par2 : list2){ for(ZyJxdgTeacherCenter par3 : conlist){ @@ -250,7 +308,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl> listmap2 = new ArrayList<>(); for(int i=0;i< list2.size();i++){ @@ -267,10 +325,81 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl>> listmap2 = new ArrayList<>(); + for(int i=0;i< list2.size();i++){ + ZyJxdgPzxx par2 = list2.get(i); + int j=0; + for(ZyJxdgTeacherCenter par3 : conlist){ + if(StringUtils.equals(par2.getId(),par3.getThreeId())) { + + List> map3 = new ArrayList<>(); + Map map4 = new HashMap<>(); + map4.put("key", par3.getThreeId()); + map4.put("title", par3.getContent()); + if(i==0){ + map3.add(map4); + listmap2.add(map3); + }else{ + listmap2.get(j).add(map4); + } + j++; + } + } + + } + list2Map = listmap2; + }else if(StringUtils.equals("13",par.getType())){ + 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())) { + + + + if(i==0){ + Map map = new HashMap<>(); + List> listmap3333 = new ArrayList<>(); + Map map3 = new HashMap<>(); + map3.put("title", par2.getTitle()); + map3.put("type", par3.getType()); + map3.put("content", par3.getContent()); + map3.put("key", par3.getThreeId()); + listmap3333.add(map3); + map.put("list", listmap3333); + listmap2.add(map); + }else{ + Map map = new HashMap<>(); + List> listmap3333 = (List>) listmap2.get(j).get("list"); + Map map3 = new HashMap<>(); + map3.put("title", par2.getTitle()); + map3.put("type", par3.getType()); + map3.put("content", par3.getContent()); + map3.put("key", par3.getThreeId()); + listmap3333.add(map3); + map.put("list", listmap3333); +// listmap2.get(j) = map; +// 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()); @@ -278,11 +407,11 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl zyJxdgTeacherCenterList = new ArrayList<>(); List> list = (List>) map.get("list"); @@ -328,7 +453,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl> list2 = (List>) par.get("zyJxdgPzxxList"); List> list3 = (List>) par.get("list"); for(Map par2 : list2){ @@ -364,17 +489,61 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl>> list2 = (List>>) par.get("list2Map"); + for(List> par2 : list2){ + for(Map par3 : par2){ + String threeId = par3.get("key")+""; + String content = par3.get("title")+""; + if(StringUtils.equals(content,"null")){ + content = ""; + } + ZyJxdgTeacherCenter ZyJxdgTeacherCenter = new ZyJxdgTeacherCenter(); + ZyJxdgTeacherCenter.setOneId(oneId); + ZyJxdgTeacherCenter.setTwoId(twoId); + ZyJxdgTeacherCenter.setThreeId(threeId); + ZyJxdgTeacherCenter.setContent(content); + ZyJxdgTeacherCenter.setType(par.get("type")+""); + zyJxdgTeacherCenterList.add(ZyJxdgTeacherCenter); + } + } + }else if(StringUtils.equals(par.get("type")+"","13")){ + List> list2 = (List>) par.get("zyJxdgPzxxList"); + List> list3 = (List>) par.get("list"); + for(Map par2 : list2){ + for(Map par3 : list3){ + List> map4 = (List>) par3.get("list"); + for(Map par4 : map4){ + String threeId = par2.get("id")+""; + String key = par4.get("key")+""; + if(StringUtils.equals(threeId,key)){ + String content = par4.get("content")+""; + if(StringUtils.equals(content,"null")){ + content = ""; + }else{ + if(content.indexOf("[")>-1){ + content = content.replace("[",""); + content = content.replace("]",""); + } + } + ZyJxdgTeacherCenter ZyJxdgTeacherCenter = new ZyJxdgTeacherCenter(); + ZyJxdgTeacherCenter.setOneId(oneId); + ZyJxdgTeacherCenter.setTwoId(twoId); + ZyJxdgTeacherCenter.setThreeId(threeId); + ZyJxdgTeacherCenter.setContent(content); + ZyJxdgTeacherCenter.setType(par4.get("type")+""); + zyJxdgTeacherCenterList.add(ZyJxdgTeacherCenter); + } + } + } + } + } } ZyJxdgTeacherMain zyJxdgTeacherMain = new ZyJxdgTeacherMain(); zyJxdgTeacherMain.setBanbenId(banbenId); - zyJxdgTeacherMain.setKcmc(kcmc); - zyJxdgTeacherMain.setKkdw(kkdw); - zyJxdgTeacherMain.setKkdwid(kkdwid); - zyJxdgTeacherMain.setXkrs(xkrs); - zyJxdgTeacherMain.setSffb(sffb); zyJxdgTeacherMain.setId(id); zyJxdgTeacherMainMapper.updateById(zyJxdgTeacherMain); zyJxdgTeacherCenterMapper.deleteByMainId(id); @@ -405,6 +574,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl list2 = zyJxdgPzxxMapper.selectByTwoMainId(par.getId()); List> listMap = new ArrayList<>(); + List>> list2Map = new ArrayList<>(); if(StringUtils.equals(par.getType(),"4")){ for(ZyJxdgPzxx par2 : list2){ for(ZyJxdgTeacherCenter par3 : conlist){ @@ -421,7 +591,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl> listmap2 = new ArrayList<>(); for(int i=0;i< list2.size();i++){ @@ -441,7 +611,78 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl>> listmap2 = new ArrayList<>(); + for(int i=0;i< list2.size();i++){ + ZyJxdgPzxx par2 = list2.get(i); + int j=0; + for(ZyJxdgTeacherCenter par3 : conlist){ + if(StringUtils.equals(par2.getId(),par3.getThreeId())) { + + List> map3 = new ArrayList<>(); + Map map4 = new HashMap<>(); + map4.put("key", par3.getThreeId()); + map4.put("title", par3.getContent()); + if(i==0){ + map3.add(map4); + listmap2.add(map3); + }else{ + listmap2.get(j).add(map4); + } + j++; + } + } + + } + list2Map = listmap2; + }else if(StringUtils.equals("13",par.getType())){ + 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())) { + + + + if(i==0){ + Map map = new HashMap<>(); + List> listmap3333 = new ArrayList<>(); + Map map3 = new HashMap<>(); + map3.put("title", par2.getTitle()); + map3.put("type", par3.getType()); + map3.put("content", par3.getContent()); + map3.put("key", par3.getThreeId()); + listmap3333.add(map3); + map.put("list", listmap3333); + listmap2.add(map); + }else{ + Map map = new HashMap<>(); + List> listmap3333 = (List>) listmap2.get(j).get("list"); + Map map3 = new HashMap<>(); + map3.put("title", par2.getTitle()); + map3.put("type", par3.getType()); + map3.put("content", par3.getContent()); + map3.put("key", par3.getThreeId()); + listmap3333.add(map3); + map.put("list", listmap3333); +// listmap2.get(j) = map; +// 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()); @@ -449,6 +690,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl zyJxdgTeacherCenterList;