From 1f3afb4b198cd938533bb0d19eefbf6837e8d525 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sun, 29 Sep 2024 09:26:47 +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 --- .../controller/KcZzSzkcController.java | 8 +++--- .../modules/kc/kcZzSzkc/entity/KcZzSzkc.java | 4 +-- .../controller/WjxWjxxTmlbController.java | 27 +++++++++++++++++++ .../service/impl/WjxWjxxTmlbServiceImpl.java | 15 ++++++----- .../kc/wjxWjxxTmlb/vo/WjxWjxxTmlbAddPage.java | 27 +++++++++++++++++++ 5 files changed, 69 insertions(+), 12 deletions(-) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbAddPage.java diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/controller/KcZzSzkcController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/controller/KcZzSzkcController.java index f2c2e46f..5115d075 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/controller/KcZzSzkcController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/controller/KcZzSzkcController.java @@ -355,11 +355,11 @@ public class KcZzSzkcController extends JeecgController kcEvaluationansQueryWrapper14 = new QueryWrapper<>(); kcEvaluationansQueryWrapper14.eq("queid","75"); kcEvaluationansQueryWrapper14.eq("ordernum",ans14); - List kcEvaluationansList15 = kcEvaluationansService.list(kcEvaluationansQueryWrapper14); - if(kcEvaluationansList15!=null && kcEvaluationansList15.size()>0){ + List 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); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/entity/KcZzSzkc.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/entity/KcZzSzkc.java index 9a4d7571..1006030c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/entity/KcZzSzkc.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/entity/KcZzSzkc.java @@ -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; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java index d5f8ed00..3dfa832e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java @@ -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 addNew(@RequestBody WjxWjxxTmlbAddPage wjxWjxxTmlbAddPage) { + List list = wjxWjxxTmlbAddPage.getAddList(); + if(list.size()>0){ + String mainId = list.get(0).getMainId(); + if(StringUtils.isNotBlank(mainId)){ + QueryWrapper wjxWjxxTmlbQueryWrapper = new QueryWrapper(); + wjxWjxxTmlbQueryWrapper.eq("main_id",mainId); + List 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("添加成功！"); + } /** * 编辑 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java index 48fedbf1..734dd2e9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java @@ -53,14 +53,17 @@ public class WjxWjxxTmlbServiceImpl extends ServiceImpl addList; + +}