yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2024-08-23 22:21:34 +08:00
parent f7dd32a5d0
commit e485fcbca9
6 changed files with 122 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgBanben/entity/ZyJxdgMain.java
View File

@ -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<ZyJxdgPzxx> zyJxdgPzxxList;

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgBanben/service/impl/ZyJxdgBanbenServiceImpl.java
View File

@ -42,10 +42,10 @@ public class ZyJxdgBanbenServiceImpl extends ServiceImpl<ZyJxdgBanbenMapper, ZyJ
entity.setMainId(zyJxdgBanben.getId());
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()))) {
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 ServiceImpl<ZyJxdgBanbenMapper, ZyJ
entity.setMainId(zyJxdgBanben.getId());
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()))) {
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());

23
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/controller/ZyJxdgTeacherMainController.java
View File

@ -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<String> 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<ZyJxdgTeacherMain> queryByRwbh(ZyJxdgTeacherMain zyJxdgTeacherMain) {
QueryWrapper<ZyJxdgTeacherMain> 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<List<ZyJxdgMain>> queryZyJxdgMainListByMainId3(ZyJxdgMain zyJxdgMain) {
List<ZyJxdgMain> list = zyJxdgTeacherMainService.queryZyJxdgMainListByMainId3(zyJxdgMain);
if(list==null) {
return Result.error("未找到对应数据");
}

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/entity/ZyJxdgTeacherMain.java
View File

@ -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;
}

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/service/IZyJxdgTeacherMainService.java
View File

@ -53,4 +53,6 @@ public interface IZyJxdgTeacherMainService extends IService<ZyJxdgTeacherMain> {
List<ZyJxdgMain> queryByRwbhList(String id, String teacherNo);
void editMap(Map<String, Object> map);
List<ZyJxdgMain> queryZyJxdgMainListByMainId3(ZyJxdgMain zyJxdgMain);
}

97
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdgTeacherMain/service/impl/ZyJxdgTeacherMainServiceImpl.java
View File

@ -105,7 +105,9 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
QueryWrapper<KcKechengbiao> 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<ZyJxdgTeacherMainM
String kkdw = kcKechengbiao.getKkdw();
String kkdwid = kcKechengbiao.getKkdwid();
String xkrs = kcKechengbiao.getXkrs();
String xqxn = kcKechengbiao.getXqxn();
teacherNo = kcKechengbiao.getJgh();
List<ZyJxdgTeacherCenter> zyJxdgTeacherCenterList = new ArrayList<>();
List<Map<String,Object>> list = (List<Map<String, Object>>) map.get("list");
@ -158,6 +162,9 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
for(Map<String,Object> 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<ZyJxdgTeacherMainM
if(list2!=null){
for(Map<String,Object> 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<ZyJxdgTeacherMainM
zyJxdgTeacherMain.setKkdw(kkdw);
zyJxdgTeacherMain.setKkdwid(kkdwid);
zyJxdgTeacherMain.setXkrs(xkrs);
zyJxdgTeacherMain.setSffb(sffb);
zyJxdgTeacherMain.setSffb("0");
zyJxdgTeacherMain.setXqxn(xqxn);
zyJxdgTeacherMainMapper.insert(zyJxdgTeacherMain);
@ -213,7 +224,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
QueryWrapper<ZyJxdgTeacherMain> 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<ZyJxdgTeacherCenter> conlist = zyJxdgTeacherCenterMapper.selectByMainId(zyJxdgTeacherMain.getId());
@ -239,7 +250,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
listMap.add(map);
}
}
}else if(StringUtils.equals(par.getType(),"5") || StringUtils.equals(par.getType(),"9")|| StringUtils.equals(par.getType(),"10")){
}else if(StringUtils.equals(par.getType(),"5") || StringUtils.equals(par.getType(),"9")|| StringUtils.equals(par.getType(),"10")|| StringUtils.equals(par.getType(),"11")){
List<Map<String,Object>> listmap2 = new ArrayList<>();
for(int i=0;i< list2.size();i++){
@ -317,7 +328,7 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
ZyJxdgTeacherCenter.setType(par.get("type")+"");
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")){
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){
@ -325,6 +336,9 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
// if(StringUtils.equals(par2.get("id")+"",par3.get(par2.get("id")+"")+"")){
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);
@ -339,6 +353,9 @@ public class ZyJxdgTeacherMainServiceImpl extends ServiceImpl<ZyJxdgTeacherMainM
List<Map<String,Object>> list2 = (List<Map<String, Object>>) par.get("list");
for(Map<String,Object> 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<ZyJxdgTeacherMainM
}
}
@Override
public List<ZyJxdgMain> queryZyJxdgMainListByMainId3(ZyJxdgMain zyJxdgMain) {
QueryWrapper<ZyJxdgTeacherMain> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("rwbh",zyJxdgMain.getRwbh());
queryWrapper.eq("teacher_no",zyJxdgMain.getTeacherNo());
queryWrapper.last("limit 1");
ZyJxdgTeacherMain zyJxdgTeacherMain= zyJxdgTeacherMainMapper.selectOne(queryWrapper);
List<ZyJxdgTeacherCenter> conlist = new ArrayList<>();
if(zyJxdgTeacherMain!=null){
conlist = zyJxdgTeacherCenterMapper.selectByMainId(zyJxdgTeacherMain.getId());
}
List<ZyJxdgMain> list = zyJxdgMainMapper.selectByMainId(zyJxdgMain.getMainId());
for(ZyJxdgMain par : list){
List<ZyJxdgPzxx> list2 = zyJxdgPzxxMapper.selectByTwoMainId(par.getId());
List<Map<String,Object>> 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<String,Object> 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<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())) {
Map<String, Object> 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;
}
}