From 6884e0ea26244469a4d5b3a702bb30f914e768da Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Mon, 25 Nov 2024 09:51:56 +0800 Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B411=E6=9C=8825=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=94=99=E8=AF=AF=EF=BC=8C=E5=85=BC=E5=AE=B9=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E7=A9=BA=E8=A1=8C?= =?UTF-8?q?=E7=9A=84=E6=8A=A5=E8=A1=A8=EF=BC=8C=E4=B8=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BlStuAnswerController.java | 16 ++++++++++++---- .../controller/BlTeacherAnswerController.java | 12 +++++++++--- .../mapper/xml/BlTeacherAnswerMapper.xml | 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/controller/BlStuAnswerController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/controller/BlStuAnswerController.java index d11c216..60f2de0 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/controller/BlStuAnswerController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/controller/BlStuAnswerController.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.compress.utils.Lists; +import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; @@ -183,21 +185,27 @@ public class BlStuAnswerController extends JeecgController list = ExcelImportUtil.importExcel(file.getInputStream(), BlStuAnswer.class, params); - list.forEach(x-> x.setMainId(id)); + List saveList = Lists.newArrayList(); + list.forEach(x-> { + if(StringUtils.isNotBlank(x.getNianji())) { + x.setMainId(id); + saveList.add(x); + } + }); //update-begin-author:taoyan date:20190528 for:批量插入数据 long start = System.currentTimeMillis(); - service.saveBatch(list); + service.saveBatch(saveList); //400条 saveBatch消耗时间1592毫秒 循环插入消耗时间1947毫秒 //1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒 log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒"); //update-end-author:taoyan date:20190528 for:批量插入数据 - return Result.ok("文件导入成功！数据行数：" + list.size()); + return Result.ok("文件导入成功！数据行数：" + saveList.size()); } catch (Exception e) { //update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示 String msg = e.getMessage(); log.error(msg, e); - if(msg!=null && msg.indexOf("Duplicate entry")>=0){ + if(msg!=null && msg.contains("Duplicate entry")){ return Result.error("文件导入失败:有重复数据！"); }else{ return Result.error("文件导入失败:" + e.getMessage()); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/controller/BlTeacherAnswerController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/controller/BlTeacherAnswerController.java index 9c6560d..e119168 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/controller/BlTeacherAnswerController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/controller/BlTeacherAnswerController.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.compress.utils.Lists; +import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; @@ -181,17 +183,21 @@ public class BlTeacherAnswerController extends JeecgController list = ExcelImportUtil.importExcel(file.getInputStream(), BlTeacherAnswer.class, params); + List saveList = Lists.newArrayList(); list.forEach(x->{ - x.setMainId(id); + if(StringUtils.isNotBlank(x.getYear())) { + x.setMainId(id); + saveList.add(x); + } }); //update-begin-author:taoyan date:20190528 for:批量插入数据 long start = System.currentTimeMillis(); - service.saveBatch(list); + service.saveBatch(saveList); //400条 saveBatch消耗时间1592毫秒 循环插入消耗时间1947毫秒 //1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒 log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒"); //update-end-author:taoyan date:20190528 for:批量插入数据 - return Result.ok("文件导入成功！数据行数：" + list.size()); + return Result.ok("文件导入成功！数据行数：" + saveList.size()); } catch (Exception e) { //update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示 String msg = e.getMessage(); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/mapper/xml/BlTeacherAnswerMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/mapper/xml/BlTeacherAnswerMapper.xml index 21198c6..c6fb8fc 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/mapper/xml/BlTeacherAnswerMapper.xml +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/mapper/xml/BlTeacherAnswerMapper.xml @@ -1051,7 +1051,7 @@ union all select '关注学生的心理健康状况' as lsname,format(round(sum(EXCHANGE_XLJK)/count('x'),2)*100,0) as tj1 from bl_teacher_answer where main_id = #{id} union all - select '我将“学生中心”理念全面落实在自己的各个教育教学工作中' as lsname,format(round(sum(EXCHANGE_ZDLW)/count('x'),2)*100,0) as tj1 from bl_teacher_answer where main_id = #{id} + select '指导学期、学年和毕业论文' as lsname,format(round(sum(EXCHANGE_ZDLW)/count('x'),2)*100,0) as tj1 from bl_teacher_answer where main_id = #{id} union all select '指导学生从事研究项目和竞赛活动' as lsname,format(round(sum(EXCHANGE_ZDXM)/count('x'),2)*100,0) as tj1 from bl_teacher_answer where main_id = #{id} union all