修改bug
This commit is contained in:
parent
e485fcbca9
commit
c38b280ded
|
@ -223,6 +223,9 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
||||||
zyInfoQueryWrapper.eq("xnxq",zyInfo.getXnxq());
|
zyInfoQueryWrapper.eq("xnxq",zyInfo.getXnxq());
|
||||||
zyInfoQueryWrapper.eq("create_by",zyInfo.getTeano());
|
zyInfoQueryWrapper.eq("create_by",zyInfo.getTeano());
|
||||||
zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh());
|
zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh());
|
||||||
|
if(StringUtils.isNotBlank(zyInfo.getZyLeixing())){
|
||||||
|
zyInfoQueryWrapper.eq("zy_leixing",zyInfo.getZyLeixing());
|
||||||
|
}
|
||||||
List<ZyInfo> list = zyInfoService.list(zyInfoQueryWrapper);
|
List<ZyInfo> list = zyInfoService.list(zyInfoQueryWrapper);
|
||||||
|
|
||||||
zyInfo.setSort(list.size()+1);
|
zyInfo.setSort(list.size()+1);
|
||||||
|
@ -417,6 +420,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
||||||
zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh());
|
zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh());
|
||||||
zyInfoQueryWrapper.eq("create_by",zyInfo.getCreateBy());
|
zyInfoQueryWrapper.eq("create_by",zyInfo.getCreateBy());
|
||||||
zyInfoQueryWrapper.eq("xnxq",zyInfo.getXnxq());
|
zyInfoQueryWrapper.eq("xnxq",zyInfo.getXnxq());
|
||||||
|
zyInfoQueryWrapper.eq("zy_leixing","0");
|
||||||
zyInfoQueryWrapper.orderByAsc("sort-0");
|
zyInfoQueryWrapper.orderByAsc("sort-0");
|
||||||
List<ZyInfo> list = zyInfoService.list(zyInfoQueryWrapper);
|
List<ZyInfo> list = zyInfoService.list(zyInfoQueryWrapper);
|
||||||
for(int i=0;i<list.size();i++){
|
for(int i=0;i<list.size();i++){
|
||||||
|
|
|
@ -84,6 +84,8 @@ public class ZyJxdgMain implements Serializable {
|
||||||
private java.lang.String rwbh;
|
private java.lang.String rwbh;
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private java.lang.String teacherNo;
|
private java.lang.String teacherNo;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private java.lang.String key;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty(value = "教学大纲配置信息")
|
@ApiModelProperty(value = "教学大纲配置信息")
|
||||||
|
@ -91,4 +93,7 @@ public class ZyJxdgMain implements Serializable {
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty(value = "教学大纲配置信息")
|
@ApiModelProperty(value = "教学大纲配置信息")
|
||||||
private List<Map<String,Object>> list;
|
private List<Map<String,Object>> list;
|
||||||
|
@TableField(exist = false)
|
||||||
|
@ApiModelProperty(value = "教学大纲配置信息")
|
||||||
|
private List<List<Map<String,Object>>> list2Map;
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,7 @@ public class ZyJxdgBanbenServiceImpl extends ServiceImpl<ZyJxdgBanbenMapper, ZyJ
|
||||||
entity.setMainId(zyJxdgBanben.getId());
|
entity.setMainId(zyJxdgBanben.getId());
|
||||||
zyJxdgMainMapper.insert(entity);
|
zyJxdgMainMapper.insert(entity);
|
||||||
|
|
||||||
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()))) {
|
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()) {
|
for(ZyJxdgPzxx zyJxdgPzxx:entity.getZyJxdgPzxxList()) {
|
||||||
zyJxdgPzxx.setMainId(zyJxdgBanben.getId());
|
zyJxdgPzxx.setMainId(zyJxdgBanben.getId());
|
||||||
zyJxdgPzxx.setTwoMainId(entity.getId());
|
zyJxdgPzxx.setTwoMainId(entity.getId());
|
||||||
|
@ -70,7 +70,7 @@ public class ZyJxdgBanbenServiceImpl extends ServiceImpl<ZyJxdgBanbenMapper, ZyJ
|
||||||
entity.setMainId(zyJxdgBanben.getId());
|
entity.setMainId(zyJxdgBanben.getId());
|
||||||
zyJxdgMainMapper.insert(entity);
|
zyJxdgMainMapper.insert(entity);
|
||||||
|
|
||||||
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()))) {
|
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()) {
|
for(ZyJxdgPzxx zyJxdgPzxx:entity.getZyJxdgPzxxList()) {
|
||||||
zyJxdgPzxx.setMainId(zyJxdgBanben.getId());
|
zyJxdgPzxx.setMainId(zyJxdgBanben.getId());
|
||||||
zyJxdgPzxx.setTwoMainId(entity.getId());
|
zyJxdgPzxx.setTwoMainId(entity.getId());
|
||||||
|
|
|
@ -89,4 +89,12 @@ public class ZyJxdgTeacherMain implements Serializable {
|
||||||
@Excel(name = "学期学年", width = 15)
|
@Excel(name = "学期学年", width = 15)
|
||||||
@ApiModelProperty(value = "学期学年")
|
@ApiModelProperty(value = "学期学年")
|
||||||
private java.lang.String xqxn;
|
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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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.ZyJxdgBanben;
|
||||||
import org.jeecg.modules.kc.zyJxdgBanben.entity.ZyJxdgMain;
|
import org.jeecg.modules.kc.zyJxdgBanben.entity.ZyJxdgMain;
|
||||||
import org.jeecg.modules.kc.zyJxdgBanben.entity.ZyJxdgPzxx;
|
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.ZyJxdgMainMapper;
|
||||||
import org.jeecg.modules.kc.zyJxdgBanben.mapper.ZyJxdgPzxxMapper;
|
import org.jeecg.modules.kc.zyJxdgBanben.mapper.ZyJxdgPzxxMapper;
|
||||||
import org.jeecg.modules.kc.zyJxdgTeacherMain.entity.ZyJxdgTeacherMain;
|
import org.jeecg.modules.kc.zyJxdgTeacherMain.entity.ZyJxdgTeacherMain;
|
||||||
|
@ -47,6 +48,8 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
private IKcSysConfigService kcSysConfigService;
|
private IKcSysConfigService kcSysConfigService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IKcKechengbiaoService kcKechengbiaoService;
|
private IKcKechengbiaoService kcKechengbiaoService;
|
||||||
|
@Autowired
|
||||||
|
private ZyJxdgBanbenMapper zyJxdgBanbenMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
|
@ -111,6 +114,9 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
kcKechengbiaoQueryWrapper.last("limit 1");
|
kcKechengbiaoQueryWrapper.last("limit 1");
|
||||||
KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper);
|
KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper);
|
||||||
|
|
||||||
|
ZyJxdgBanben zyJxdgBanben = zyJxdgBanbenMapper.selectById(banbenId);
|
||||||
|
|
||||||
|
|
||||||
String sffb = map.get("sffb")+"";
|
String sffb = map.get("sffb")+"";
|
||||||
String teacherName = kcKechengbiao.getSkjs();
|
String teacherName = kcKechengbiao.getSkjs();
|
||||||
String kcmc = kcKechengbiao.getKcmc();
|
String kcmc = kcKechengbiao.getKcmc();
|
||||||
|
@ -119,6 +125,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
String xkrs = kcKechengbiao.getXkrs();
|
String xkrs = kcKechengbiao.getXkrs();
|
||||||
String xqxn = kcKechengbiao.getXqxn();
|
String xqxn = kcKechengbiao.getXqxn();
|
||||||
teacherNo = kcKechengbiao.getJgh();
|
teacherNo = kcKechengbiao.getJgh();
|
||||||
|
String banbenName = zyJxdgBanben.getTitle();
|
||||||
|
|
||||||
List<ZyJxdgTeacherCenter> zyJxdgTeacherCenterList = new ArrayList<>();
|
List<ZyJxdgTeacherCenter> zyJxdgTeacherCenterList = new ArrayList<>();
|
||||||
List<Map<String,Object>> list = (List<Map<String, Object>>) map.get("list");
|
List<Map<String,Object>> list = (List<Map<String, Object>>) map.get("list");
|
||||||
|
@ -154,7 +161,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
zyJxdgTeacherCenterList.add(ZyJxdgTeacherCenter);
|
zyJxdgTeacherCenterList.add(ZyJxdgTeacherCenter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}else if(StringUtils.equals(par.get("type")+"","5") || StringUtils.equals(par.get("type")+"","9") || StringUtils.equals(par.get("type")+"","10")){
|
}else if(StringUtils.equals(par.get("type")+"","5") || StringUtils.equals(par.get("type")+"","9") || StringUtils.equals(par.get("type")+"","10")|| StringUtils.equals(par.get("type")+"","11")|| StringUtils.equals(par.get("type")+"","13")|| StringUtils.equals(par.get("type")+"","14")|| StringUtils.equals(par.get("type")+"","15")){
|
||||||
List<Map<String,Object>> list2 = (List<Map<String, Object>>) par.get("zyJxdgPzxxList");
|
List<Map<String,Object>> list2 = (List<Map<String, Object>>) par.get("zyJxdgPzxxList");
|
||||||
List<Map<String,Object>> list3 = (List<Map<String, Object>>) par.get("list");
|
List<Map<String,Object>> list3 = (List<Map<String, Object>>) par.get("list");
|
||||||
if(list2!=null && list3!=null){
|
if(list2!=null && list3!=null){
|
||||||
|
@ -193,6 +200,56 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if(StringUtils.equals(par.get("type")+"","12")){
|
||||||
|
List<List<Map<String,Object>>> list2 = (List<List<Map<String, Object>>>) par.get("list2Map");
|
||||||
|
for(List<Map<String,Object>> par2 : list2){
|
||||||
|
for(Map<String,Object> 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<Map<String,Object>> list2 = (List<Map<String, Object>>) par.get("zyJxdgPzxxList");
|
||||||
|
List<Map<String,Object>> list3 = (List<Map<String, Object>>) par.get("list");
|
||||||
|
for(Map<String,Object> par2 : list2){
|
||||||
|
for(Map<String,Object> par3 : list3){
|
||||||
|
List<Map<String,Object>> map4 = (List<Map<String, Object>>) par3.get("list");
|
||||||
|
for(Map<String,Object> 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<ZyJxdgTeacherMainM
|
||||||
zyJxdgTeacherMain.setKkdwid(kkdwid);
|
zyJxdgTeacherMain.setKkdwid(kkdwid);
|
||||||
zyJxdgTeacherMain.setXkrs(xkrs);
|
zyJxdgTeacherMain.setXkrs(xkrs);
|
||||||
zyJxdgTeacherMain.setSffb("0");
|
zyJxdgTeacherMain.setSffb("0");
|
||||||
|
zyJxdgTeacherMain.setBanbenName(banbenName);
|
||||||
zyJxdgTeacherMain.setXqxn(xqxn);
|
zyJxdgTeacherMain.setXqxn(xqxn);
|
||||||
|
|
||||||
|
|
||||||
|
@ -229,11 +287,11 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
ZyJxdgTeacherMain zyJxdgTeacherMain= zyJxdgTeacherMainMapper.selectOne(queryWrapper);
|
ZyJxdgTeacherMain zyJxdgTeacherMain= zyJxdgTeacherMainMapper.selectOne(queryWrapper);
|
||||||
List<ZyJxdgTeacherCenter> conlist = zyJxdgTeacherCenterMapper.selectByMainId(zyJxdgTeacherMain.getId());
|
List<ZyJxdgTeacherCenter> conlist = zyJxdgTeacherCenterMapper.selectByMainId(zyJxdgTeacherMain.getId());
|
||||||
|
|
||||||
|
|
||||||
List<ZyJxdgMain> list = zyJxdgMainMapper.selectByMainId(zyJxdgTeacherMain.getBanbenId());
|
List<ZyJxdgMain> list = zyJxdgMainMapper.selectByMainId(zyJxdgTeacherMain.getBanbenId());
|
||||||
for(ZyJxdgMain par : list){
|
for(ZyJxdgMain par : list){
|
||||||
List<ZyJxdgPzxx> list2 = zyJxdgPzxxMapper.selectByTwoMainId(par.getId());
|
List<ZyJxdgPzxx> list2 = zyJxdgPzxxMapper.selectByTwoMainId(par.getId());
|
||||||
List<Map<String,Object>> listMap = new ArrayList<>();
|
List<Map<String,Object>> listMap = new ArrayList<>();
|
||||||
|
List<List<Map<String,Object>>> list2Map = new ArrayList<>();
|
||||||
if(StringUtils.equals(par.getType(),"4")){
|
if(StringUtils.equals(par.getType(),"4")){
|
||||||
for(ZyJxdgPzxx par2 : list2){
|
for(ZyJxdgPzxx par2 : list2){
|
||||||
for(ZyJxdgTeacherCenter par3 : conlist){
|
for(ZyJxdgTeacherCenter par3 : conlist){
|
||||||
|
@ -250,7 +308,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
listMap.add(map);
|
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")){
|
}else if(StringUtils.equals(par.getType(),"5") || StringUtils.equals(par.getType(),"9")|| StringUtils.equals(par.getType(),"10")|| StringUtils.equals(par.getType(),"11")|| StringUtils.equals("14",par.getType())|| StringUtils.equals("15",par.getType())) {
|
||||||
|
|
||||||
List<Map<String,Object>> listmap2 = new ArrayList<>();
|
List<Map<String,Object>> listmap2 = new ArrayList<>();
|
||||||
for(int i=0;i< list2.size();i++){
|
for(int i=0;i< list2.size();i++){
|
||||||
|
@ -267,10 +325,81 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
}
|
}
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
listMap = listmap2;
|
listMap = listmap2;
|
||||||
}else{
|
}else if(StringUtils.equals("12",par.getType())){
|
||||||
|
List<List<Map<String,Object>>> 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<Map<String,Object>> map3 = new ArrayList<>();
|
||||||
|
Map<String, Object> 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<Map<String,Object>> 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<String,Object> map = new HashMap<>();
|
||||||
|
List<Map<String,Object>> listmap3333 = new ArrayList<>();
|
||||||
|
Map<String,Object> 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<String,Object> map = new HashMap<>();
|
||||||
|
List<Map<String,Object>> listmap3333 = (List<Map<String, Object>>) listmap2.get(j).get("list");
|
||||||
|
Map<String,Object> 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){
|
for(ZyJxdgTeacherCenter par3 : conlist){
|
||||||
if(StringUtils.equals(par.getId(),par3.getTwoId())&&StringUtils.isEmpty(par3.getThreeId())){
|
if(StringUtils.equals(par.getId(),par3.getTwoId())&&StringUtils.isEmpty(par3.getThreeId())){
|
||||||
par.setContent(par3.getContent());
|
par.setContent(par3.getContent());
|
||||||
|
@ -278,11 +407,11 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
par.setList(listMap);
|
par.setList(listMap);
|
||||||
|
par.setList2Map(list2Map);
|
||||||
par.setZyJxdgPzxxList(list2);
|
par.setZyJxdgPzxxList(list2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -291,10 +420,6 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
String id = map.get("id")+"";
|
String id = map.get("id")+"";
|
||||||
String banbenId = map.get("banbenId")+"";
|
String banbenId = map.get("banbenId")+"";
|
||||||
String sffb = map.get("sffb")+"";
|
String sffb = map.get("sffb")+"";
|
||||||
String kcmc = "";
|
|
||||||
String kkdw = "";
|
|
||||||
String kkdwid = "";
|
|
||||||
String xkrs = "";
|
|
||||||
|
|
||||||
List<ZyJxdgTeacherCenter> zyJxdgTeacherCenterList = new ArrayList<>();
|
List<ZyJxdgTeacherCenter> zyJxdgTeacherCenterList = new ArrayList<>();
|
||||||
List<Map<String,Object>> list = (List<Map<String, Object>>) map.get("list");
|
List<Map<String,Object>> list = (List<Map<String, Object>>) map.get("list");
|
||||||
|
@ -328,7 +453,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
ZyJxdgTeacherCenter.setType(par.get("type")+"");
|
ZyJxdgTeacherCenter.setType(par.get("type")+"");
|
||||||
zyJxdgTeacherCenterList.add(ZyJxdgTeacherCenter);
|
zyJxdgTeacherCenterList.add(ZyJxdgTeacherCenter);
|
||||||
}
|
}
|
||||||
}else if(StringUtils.equals(par.get("type")+"","5") || StringUtils.equals(par.get("type")+"","9") || StringUtils.equals(par.get("type")+"","10")|| StringUtils.equals(par.get("type")+"","11")){
|
}else if(StringUtils.equals(par.get("type")+"","5") || StringUtils.equals(par.get("type")+"","9") || StringUtils.equals(par.get("type")+"","10")|| StringUtils.equals(par.get("type")+"","11")|| StringUtils.equals(par.get("type")+"","14")|| StringUtils.equals(par.get("type")+"","15")){
|
||||||
List<Map<String,Object>> list2 = (List<Map<String, Object>>) par.get("zyJxdgPzxxList");
|
List<Map<String,Object>> list2 = (List<Map<String, Object>>) par.get("zyJxdgPzxxList");
|
||||||
List<Map<String,Object>> list3 = (List<Map<String, Object>>) par.get("list");
|
List<Map<String,Object>> list3 = (List<Map<String, Object>>) par.get("list");
|
||||||
for(Map<String,Object> par2 : list2){
|
for(Map<String,Object> par2 : list2){
|
||||||
|
@ -364,17 +489,61 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
zyJxdgTeacherCenterList.add(ZyJxdgTeacherCenter);
|
zyJxdgTeacherCenterList.add(ZyJxdgTeacherCenter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if(StringUtils.equals(par.get("type")+"","12")){
|
||||||
|
List<List<Map<String,Object>>> list2 = (List<List<Map<String, Object>>>) par.get("list2Map");
|
||||||
|
for(List<Map<String,Object>> par2 : list2){
|
||||||
|
for(Map<String,Object> 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<Map<String,Object>> list2 = (List<Map<String, Object>>) par.get("zyJxdgPzxxList");
|
||||||
|
List<Map<String,Object>> list3 = (List<Map<String, Object>>) par.get("list");
|
||||||
|
for(Map<String,Object> par2 : list2){
|
||||||
|
for(Map<String,Object> par3 : list3){
|
||||||
|
List<Map<String,Object>> map4 = (List<Map<String, Object>>) par3.get("list");
|
||||||
|
for(Map<String,Object> 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 zyJxdgTeacherMain = new ZyJxdgTeacherMain();
|
||||||
zyJxdgTeacherMain.setBanbenId(banbenId);
|
zyJxdgTeacherMain.setBanbenId(banbenId);
|
||||||
zyJxdgTeacherMain.setKcmc(kcmc);
|
|
||||||
zyJxdgTeacherMain.setKkdw(kkdw);
|
|
||||||
zyJxdgTeacherMain.setKkdwid(kkdwid);
|
|
||||||
zyJxdgTeacherMain.setXkrs(xkrs);
|
|
||||||
zyJxdgTeacherMain.setSffb(sffb);
|
|
||||||
zyJxdgTeacherMain.setId(id);
|
zyJxdgTeacherMain.setId(id);
|
||||||
zyJxdgTeacherMainMapper.updateById(zyJxdgTeacherMain);
|
zyJxdgTeacherMainMapper.updateById(zyJxdgTeacherMain);
|
||||||
zyJxdgTeacherCenterMapper.deleteByMainId(id);
|
zyJxdgTeacherCenterMapper.deleteByMainId(id);
|
||||||
|
@ -405,6 +574,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
for(ZyJxdgMain par : list){
|
for(ZyJxdgMain par : list){
|
||||||
List<ZyJxdgPzxx> list2 = zyJxdgPzxxMapper.selectByTwoMainId(par.getId());
|
List<ZyJxdgPzxx> list2 = zyJxdgPzxxMapper.selectByTwoMainId(par.getId());
|
||||||
List<Map<String,Object>> listMap = new ArrayList<>();
|
List<Map<String,Object>> listMap = new ArrayList<>();
|
||||||
|
List<List<Map<String,Object>>> list2Map = new ArrayList<>();
|
||||||
if(StringUtils.equals(par.getType(),"4")){
|
if(StringUtils.equals(par.getType(),"4")){
|
||||||
for(ZyJxdgPzxx par2 : list2){
|
for(ZyJxdgPzxx par2 : list2){
|
||||||
for(ZyJxdgTeacherCenter par3 : conlist){
|
for(ZyJxdgTeacherCenter par3 : conlist){
|
||||||
|
@ -421,7 +591,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
listMap.add(map);
|
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")){
|
}else if(StringUtils.equals(par.getType(),"5") || StringUtils.equals(par.getType(),"9")|| StringUtils.equals(par.getType(),"10")|| StringUtils.equals(par.getType(),"11")|| StringUtils.equals("14",par.getType())|| StringUtils.equals("15",par.getType())) {
|
||||||
|
|
||||||
List<Map<String,Object>> listmap2 = new ArrayList<>();
|
List<Map<String,Object>> listmap2 = new ArrayList<>();
|
||||||
for(int i=0;i< list2.size();i++){
|
for(int i=0;i< list2.size();i++){
|
||||||
|
@ -441,7 +611,78 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
listMap = listmap2;
|
listMap = listmap2;
|
||||||
}else{
|
}else if(StringUtils.equals("12",par.getType())){
|
||||||
|
List<List<Map<String,Object>>> 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<Map<String,Object>> map3 = new ArrayList<>();
|
||||||
|
Map<String, Object> 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<Map<String,Object>> 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<String,Object> map = new HashMap<>();
|
||||||
|
List<Map<String,Object>> listmap3333 = new ArrayList<>();
|
||||||
|
Map<String,Object> 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<String,Object> map = new HashMap<>();
|
||||||
|
List<Map<String,Object>> listmap3333 = (List<Map<String, Object>>) listmap2.get(j).get("list");
|
||||||
|
Map<String,Object> 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){
|
for(ZyJxdgTeacherCenter par3 : conlist){
|
||||||
if(StringUtils.equals(par.getId(),par3.getTwoId())&&StringUtils.isEmpty(par3.getThreeId())){
|
if(StringUtils.equals(par.getId(),par3.getTwoId())&&StringUtils.isEmpty(par3.getThreeId())){
|
||||||
par.setContent(par3.getContent());
|
par.setContent(par3.getContent());
|
||||||
|
@ -449,6 +690,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
par.setList(listMap);
|
par.setList(listMap);
|
||||||
|
par.setList2Map(list2Map);
|
||||||
par.setZyJxdgPzxxList(list2);
|
par.setZyJxdgPzxxList(list2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -82,6 +82,19 @@ public class ZyJxdgTeacherMainPage {
|
||||||
@ApiModelProperty(value = "选课人数")
|
@ApiModelProperty(value = "选课人数")
|
||||||
private java.lang.String xkrs;
|
private java.lang.String xkrs;
|
||||||
|
|
||||||
|
/**学期学年*/
|
||||||
|
@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;
|
||||||
|
|
||||||
@ExcelCollection(name="教师填写教学大纲内容")
|
@ExcelCollection(name="教师填写教学大纲内容")
|
||||||
@ApiModelProperty(value = "教师填写教学大纲内容")
|
@ApiModelProperty(value = "教师填写教学大纲内容")
|
||||||
private List<ZyJxdgTeacherCenter> zyJxdgTeacherCenterList;
|
private List<ZyJxdgTeacherCenter> zyJxdgTeacherCenterList;
|
||||||
|
|
Loading…
Reference in New Issue