From c0de7562a91ad4ff8162d3d57b3e0bb4b88a1ef9 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 17 Jan 2024 14:06:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=9F=E8=AE=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xml/KcExportConfigTpkwcqkjzglxMapper.xml | 117 ++++++++++++++++-- .../kc/grab/imports/entity/Xxhbtkxx.java | 2 + .../KcEvaluationsStatController.java | 34 ++++- .../entity/KcEvaluationsStat.java | 5 + .../mapper/xml/KcEvaluationsStatMapper.xml | 14 +++ .../controller/KcKetangbiaoController.java | 85 +++++++++++++ .../modules/kc/ktgl/entity/KcKetangbiao.java | 3 + .../kc/ktgl/entity/KcKetangbiaoNum.java | 53 ++++++++ .../kc/ktgl/mapper/KcKetangbiaoMapper.java | 5 + .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 8 ++ .../kc/ktgl/service/IKcKetangbiaoService.java | 5 + .../service/impl/KcKetangbiaoServiceImpl.java | 11 ++ 12 files changed, 329 insertions(+), 13 deletions(-) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiaoNum.java diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml index 512e7ab7..5363e5ea 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml @@ -88,16 +88,113 @@ diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkxx.java index fc72b2d1..4c0d7065 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkxx.java @@ -126,7 +126,9 @@ public class Xxhbtkxx implements Serializable { @ApiModelProperty(value = "lcbh") private java.lang.String lcbh; /**1-调整时间，2-调整地点，3-更换教师，4-其他*/ + @Excel(name = "调课类型", width = 15,dicCode = "tiaokeleixing") @ApiModelProperty(value = "1-调整时间，2-调整地点，3-更换教师，4-其他") + @Dict(dicCode = "tiaokeleixing") private java.lang.String tklx; @TableField(exist = false) private Integer mysqlnum; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java index 42164d53..5ba08306 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java @@ -11,8 +11,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat; import org.jeecg.modules.kc.kcEvaluationsStat.service.IKcEvaluationsStatService; @@ -29,6 +31,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -52,7 +55,9 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class KcEvaluationsStatController extends JeecgController { @Autowired private IKcEvaluationsStatService kcEvaluationsStatService; - + + @Value("${jeecg.path.upload}") + private String upLoadPath; /** * 分页列表查询 * @@ -73,7 +78,8 @@ public class KcEvaluationsStatController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcEvaluationsStat, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluationsStat, req.getParameterMap()); + queryWrapper.eq(StringUtils.isNotBlank(kcEvaluationsStat.getSzkc()),"c.szkc",kcEvaluationsStat.getSzkc()); Page page = new Page(pageNo, pageSize); IPage pageList = kcEvaluationsStatService.page(page, queryWrapper); return Result.OK(pageList); @@ -167,9 +173,31 @@ public class KcEvaluationsStatController extends JeecgController clazz, String title) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",object, request.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + queryWrapper.eq(StringUtils.isNotBlank(object.getSzkc()),"c.szkc",object.getSzkc()); + // Step.2 获取导出数据 + List exportList = service.list(queryWrapper); + + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, title); + mv.addObject(NormalExcelConstants.CLASS, clazz); + //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- + ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); + exportParams.setImageBasePath(upLoadPath); + //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + return mv; + } + /** * 通过excel导入数据 * diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java index 3db76221..ef54da36 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java @@ -261,4 +261,9 @@ public class KcEvaluationsStat implements Serializable { @TableField(exist = false) private java.lang.String xqxn; + @TableField(exist = false) + @Dict(dicCode = "yn") + private java.lang.String szkc; + + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml index 5fa4a7c4..72a69670 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml @@ -2,6 +2,20 @@ + + + + + select xnxq,kkdw,count('*') as num from kc_ketangbiao + ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java index 0410d84a..de6c4efc 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.kc.ktgl.entity.KcKetangbiaoNum; import java.util.List; import java.util.Map; @@ -64,4 +65,8 @@ public interface IKcKetangbiaoService extends IService { void updateJsbh(); void updateSkxs(KcKetangbiao kcKetangbiaoup); + + IPage> getKtcountList(Page> page, QueryWrapper qw); + + List getKtcountExportList(QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java index 26bda435..c678b85e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; +import org.jeecg.modules.kc.ktgl.entity.KcKetangbiaoNum; import org.jeecg.modules.kc.ktgl.mapper.KcKetangbiaoMapper; import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService; import org.springframework.stereotype.Service; @@ -131,4 +132,14 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl> getKtcountList(Page> page, QueryWrapper qw) { + return baseMapper.getKtcountList(page,qw); + } + + @Override + public List getKtcountExportList(QueryWrapper queryWrapper) { + return baseMapper.getKtcountExportList(queryWrapper); + } }