From 7cb03da20e027e342a7e49f30733b93245e13fc1 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 15 Jan 2024 16:20:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xml/KcExportConfigTpkwcqkjzglxMapper.xml | 4 +- .../entity/KcEvaluationsStat.java | 1 + .../mapper/xml/KcEvaluationsStatMapper.xml | 66 ++++++++++++------- .../kc/qa/mapper/xml/KcEvaluationMapper.xml | 48 ++++++++++---- 4 files changed, 85 insertions(+), 34 deletions(-) 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 f4053e4e..512e7ab7 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 @@ -89,13 +89,15 @@ 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 bd339464..3db76221 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 @@ -257,6 +257,7 @@ public class KcEvaluationsStat implements Serializable { private java.lang.String col57; private java.lang.String col58; private java.lang.String col59; + private java.lang.String col60; @TableField(exist = false) private java.lang.String xqxn; 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 c0cbff0e..5fa4a7c4 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 @@ -94,7 +94,8 @@ YBTK.COL56, YBTK.COL57, YBTK.COL58, - YBTK.COL59 + YBTK.COL59, + YBTK.COL60 FROM (SELECT EVS.EVALUATIONID AS COL00, XQXN.TITLE AS COL01, -- 一般听课表(3) KT.KCMC AS COL02, @@ -183,14 +184,16 @@ rjzy.rjzy as col56, ev.rjzy as col57, KT.ID AS COL58, - CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59 + CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59, + EVS.UP_DATE AS COL60 FROM (SELECT UPUSER, UPUSERID, KETANGBIAOID, QUEID, ANSID, EVALUATIONID, - DETANSWER + DETANSWER, + EVSTMP.UP_DATE FROM (SELECT EVS.UPUSER, EVS.UPUSERID, EV.MINKCID AS KETANGBIAOID, @@ -222,7 +225,8 @@ 'K' ELSE '' - END) AS DETANSWER + END) AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -254,7 +258,8 @@ 'E' ELSE 'F' - END AS DETANSWER + END AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -273,7 +278,8 @@ EVS.QUEID, EVS.EVALUATIONID, EVS.ANSID, - EVS.TEXTANSCONTENT AS DETANSWER + EVS.TEXTANSCONTENT AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONQUE QUE @@ -370,7 +376,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x XSTK.COL56, XSTK.COL57, XSTK.COL58, - XSTK.COL59 + XSTK.COL59, + XSTK.COL60 FROM (SELECT EVS.evaluationid AS COL00, XQXN.TITLE AS COL01, -- 线上听课表(2) KT.KCMC AS COL02, @@ -459,7 +466,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x rjzy.rjzy as col56, ev.rjzy as col57, KT.ID AS COL58, - CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59 + CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59, + EVS.UP_DATE AS COL60 FROM (SELECT EVS.UPUSER, EVS.UPUSERID, EV.MINKCID AS KETANGBIAOID, @@ -479,7 +487,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x 'E' ELSE 'F' - END AS DETANSWER + END AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -525,7 +534,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x 'K' ELSE '' - END) AS DETANSWER + END) AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -557,7 +567,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x 'E' ELSE 'F' - END AS DETANSWER + END AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -578,7 +589,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x EVS.QUEID, EVS.EVALUATIONID, EVS.ANSID, - EVS.TEXTANSCONTENT AS DETANSWER + EVS.TEXTANSCONTENT AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONQUE QUE @@ -674,7 +686,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x THPJ.COL56, THPJ.COL57, THPJ.COL58, - THPJ.COL59 + THPJ.COL59, + THPJ.COL60 FROM (SELECT EVS.EVALUATIONID AS COL00, XQXN.TITLE AS COL01, -- 同行评价表(4) KT.KCMC AS COL02, @@ -763,14 +776,16 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x rjzy.rjzy as col56, ev.rjzy as col57, KT.ID AS COL58, - CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59 + CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59, + EVS.UP_DATE AS COL60 FROM (SELECT UPUSER, UPUSERID, KETANGBIAOID, QUEID, ANSID, EVALUATIONID, - DETANSWER + DETANSWER, + EVSTMP.UP_DATE FROM (SELECT EVS.UPUSER, EVS.UPUSERID, EV.MINKCID AS KETANGBIAOID, @@ -802,7 +817,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x 'K' ELSE '' - END) AS DETANSWER + END) AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -834,7 +850,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x 'E' ELSE 'F' - END AS DETANSWER + END AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -853,7 +870,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x EVS.QUEID, EVS.EVALUATIONID, EVS.ANSID, - EVS.TEXTANSCONTENT AS DETANSWER + EVS.TEXTANSCONTENT AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONQUE QUE @@ -950,7 +968,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x LBPJ.COL56, LBPJ.COL57, LBPJ.COL58, - LBPJ.COL59 + LBPJ.COL59, + LBPJ.COL60 FROM (SELECT EVS.EVALUATIONID AS COL00, XQXN.TITLE AS COL01, -- 老版评价表(1) KT.KCMC AS COL02, @@ -1039,14 +1058,16 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x rjzy.rjzy as col56, ev.rjzy as col57, KT.ID AS COL58, - CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59 + CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59, + EVS.UP_DATE AS COL60 FROM (SELECT UPUSER, UPUSERID, KETANGBIAOID, QUEID, ANSID, EVALUATIONID, - DETANSWER + DETANSWER, + EVSTMP.UP_DATE FROM ( SELECT EVS.UPUSER, EVS.UPUSERID, @@ -1067,7 +1088,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x 'E' ELSE 'F' - END AS DETANSWER + END AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml index 188bd27d..783c17ef 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml @@ -80,7 +80,16 @@ select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as assess1 ,round(max(ytkcs-0),0) as tkyq from kc_export_config_tpkwcqkjzglx a LEFT JOIN sys_dict_item b on a.tklx = b.item_value and dict_id = '1682386362753224705' - and a.xqxn = (select flag1 from kc_sys_config where id = 1) + + + and a.xqxn = #{kcEvaluation.xnxq} + + + and a.xqxn = (select flag1 from kc_sys_config where id = 1) + + + + @@ -351,27 +360,44 @@ - select a.dwjc as dwmc, round(sjtkcs / ytkcs,2) as ytkcs from ( - select d.dwjc,d.dwbh,sum(a.ytkcs) as ytkcs,count(c.upuserid) as sjtkcs from kc_export_config_tpkwcqkjzglx a - LEFT JOIN kc_xqxn_history b on a.xqxn = b.title - LEFT JOIN kc_evaluation c on a.gh = c.upuserid and c.up_date BETWEEN b.start_time and b.end_time - LEFT JOIN kc_kkdw d on a.dwmc = d.kkdw - where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) and tklx in (${code}) and dwjc is not null - GROUP BY d.dwjc - ) a - left join kc_kkdw21_view b on a.dwbh = b.dwbh - order by b.id asc + + + + + + + + + + + + SELECT + kc.dwjc as dwmc, + total.total_sum, + ready.ready_sum, + round(ready.ready_sum / total.total_sum,2) as ytkcs + FROM + ( + SELECT + a.dwmc, + count( 'x' ) AS total_sum + FROM + ( + SELECT + a.xqxn, + a.gh, + a.xm, + a.dwmc, + a.ytkcs, + a.zt + FROM + kc_export_config_tpkwcqkjzglx a + WHERE + a.xqxn = #{xqxn} + AND a.tklx in (${code}) -- 学院教务委员会(code) + AND ( + a.zt = '在职' + OR ( a.zt = '退休' AND a.ytkcs - 0 > 0 ))) a + LEFT JOIN kc_xqxn_history b ON a.xqxn = b.title + LEFT JOIN kc_kkdw21_view d ON a.dwmc = d.kkdw + GROUP BY + a.dwmc + ORDER BY + d.id + ) total + LEFT JOIN ( + SELECT + tb2.dwmc, + count( 'x' ) AS ready_sum + FROM + ( + SELECT + tb.dwmc AS dwmc, + tb.upuser AS upuser, + tb.upuserid AS upuserid, + tb.ytkcs AS ytkcs, + tb.pj_sum AS pj_sum + FROM + ( + SELECT + c.dwmc AS dwmc, + a.upuser AS upuser, + a.upuserid AS upuserid, + c.ytkcs AS ytkcs, + count( 'x' ) AS pj_sum + FROM + kc_evaluation a, + ( SELECT start_time, end_time FROM kc_xqxn_history WHERE title = '2023秋' ) b, + ( + SELECT + xqxn, + gh, + xm, + dwmc, + ytkcs, + zt + FROM + kc_export_config_tpkwcqkjzglx + WHERE + xqxn = #{xqxn} + AND tklx in (${code}) -- 学院教务委员会(code) + + AND ( + zt = '在职' + OR ( zt = '退休' AND ytkcs - 0 > 0 ))) c + WHERE + a.upuserid = c.gh + AND a.up_date BETWEEN b.start_time + AND b.end_time + GROUP BY + c.dwmc, + a.upuser, + a.upuserid, + c.ytkcs + ) tb + WHERE + tb.pj_sum >= tb.ytkcs + ) tb2 + GROUP BY + tb2.dwmc + ) ready ON total.dwmc = ready.dwmc + JOIN kc_kkdw21_view kc ON total.dwmc = kc.kkdw + ORDER BY + kc.id + + + 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); + } }