修改bug

This commit is contained in:
yangjun 2024-09-29 09:26:47 +08:00
parent 5f8fc96150
commit 1f3afb4b19
5 changed files with 69 additions and 12 deletions

View File

@ -355,11 +355,11 @@ public class KcZzSzkcController extends JeecgController<KcZzSzkc, IKcZzSzkcServi
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper14 = new QueryWrapper<>();
kcEvaluationansQueryWrapper14.eq("queid","75");
kcEvaluationansQueryWrapper14.eq("ordernum",ans14);
List<KcEvaluationans> kcEvaluationansList15 = kcEvaluationansService.list(kcEvaluationansQueryWrapper14);
if(kcEvaluationansList15!=null && kcEvaluationansList15.size()>0){
List<KcEvaluationans> kcEvaluationansList14 = kcEvaluationansService.list(kcEvaluationansQueryWrapper14);
if(kcEvaluationansList14!=null && kcEvaluationansList14.size()>0){
kcEvaluations.setId(null);
kcEvaluations.setQueid(kcEvaluationansList15.get(0).getQueid());
kcEvaluations.setAnsid(kcEvaluationansList15.get(0).getId());
kcEvaluations.setQueid(kcEvaluationansList14.get(0).getQueid());
kcEvaluations.setAnsid(kcEvaluationansList14.get(0).getId());
kcEvaluationsService.save(kcEvaluations);
}

View File

@ -144,9 +144,9 @@ public class KcZzSzkc implements Serializable {
private java.lang.String ans13;
@Dict(dicCode = "five_dict")
@Excel(name = "总体评价", width = 15,dicCode = "five_dict")
private java.lang.String ans15;
@Excel(name = "课堂诊断", width = 15)
private java.lang.String ans14;
@Excel(name = "课堂诊断", width = 15)
private java.lang.String ans15;
@Excel(name = "指导建议", width = 15)
private java.lang.String ans16;

View File

@ -18,6 +18,7 @@ import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks;
import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxx;
import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxxDj;
import org.jeecg.modules.kc.wjxDjxx.service.IWjxDjxxService;
import org.jeecg.modules.kc.wjxWjxxTmlb.vo.WjxWjxxTmlbAddPage;
import org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent;
import org.jeecg.modules.kc.zyInfoStudent.service.IZyInfoStudentService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
@ -145,6 +146,32 @@ public class WjxWjxxTmlbController extends JeecgController<WjxWjxxTmlb, IWjxWjxx
}
return Result.OK("添加成功!");
}
@AutoLog(value = "题目信息-添加")
@ApiOperation(value="题目信息-添加", notes="题目信息-添加")
@PostMapping(value = "/addNew")
public Result<String> addNew(@RequestBody WjxWjxxTmlbAddPage wjxWjxxTmlbAddPage) {
List<WjxWjxxTmlbPage> list = wjxWjxxTmlbAddPage.getAddList();
if(list.size()>0){
String mainId = list.get(0).getMainId();
if(StringUtils.isNotBlank(mainId)){
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<WjxWjxxTmlb>();
wjxWjxxTmlbQueryWrapper.eq("main_id",mainId);
List<WjxWjxxTmlb> list2 = wjxWjxxTmlbService.list(wjxWjxxTmlbQueryWrapper);
for(WjxWjxxTmlb WjxWjxxTmlb:list2){
wjxWjxxTmlbService.removeByMainId(WjxWjxxTmlb.getId());
}
}
for(WjxWjxxTmlbPage wjxWjxxTmlbPage:list){
WjxWjxxTmlb wjxWjxxTmlb = new WjxWjxxTmlb();
BeanUtils.copyProperties(wjxWjxxTmlbPage, wjxWjxxTmlb);
wjxWjxxTmlbService.saveMain(wjxWjxxTmlb, wjxWjxxTmlbPage.getWjxWjxxTmxxList());
}
}
return Result.OK("添加成功!");
}
/**
* 编辑

View File

@ -53,14 +53,17 @@ public class WjxWjxxTmlbServiceImpl extends ServiceImpl<WjxWjxxTmlbMapper, WjxWj
//外键设置
entity.setMainId(wjxWjxxTmlb.getId());
entity.setWjIndex(wjxWjxxTmlb.getWjIndex());
String itemSelected[] = wjxWjxxTmlb.getItemSelected().split(",");
String sfxz = wjxWjxxTmlb.getItemSelected();
for(String par:itemSelected){
if(StringUtils.equals(par, entity.getItemIndex().toString())){
sfxz = "true";
if(StringUtils.isNotBlank(wjxWjxxTmlb.getItemSelected())){
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);
}
entity.setItemSelected(sfxz);
wjxWjxxTmxxMapper.insert(entity);
}
}

View File

@ -0,0 +1,27 @@
package org.jeecg.modules.kc.wjxWjxxTmlb.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmxx;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecgframework.poi.excel.annotation.ExcelCollection;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
/**
* @Description: 题目信息
* @Author: jeecg-boot
* @Date: 2024-04-26
* @Version: V1.0
*/
@Data
public class WjxWjxxTmlbAddPage {
private List<WjxWjxxTmlbPage> addList;
}