yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023年6月3日 添加统计数据钻取

This commit is contained in:
bai 2023-06-03 22:40:06 +08:00
parent d672d9b237
commit 5d7c78bba0
10 changed files with 275 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java
View File

@ -106,6 +106,7 @@ public class ChangeTingKeTongJi {
evaQw.eq(StringUtils.isNotBlank(userId),"upuserid",userId);
evaQw.apply("up_date >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') ");
evaQw.apply("up_date <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') ");
evaQw.isNotNull("minkcid");
evaQw.groupBy("upuserid");
evaQw.orderByAsc("up_date");
List<KcEvaluation> countTjList = kcEvaluationService.list(evaQw);

9
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java
View File

@ -16,6 +16,7 @@ import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
import org.jeecg.modules.kc.kcZzThpjb.entity.KcZzThpjb;
import org.jeecg.modules.kc.kcZzThpjb.service.IKcZzThpjbService;
@ -71,7 +72,9 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
private IKcEvaluationsService kcEvaluationsService;
@Autowired
private IKcEvaluationansService kcEvaluationansService;
@Autowired
private ChangeTingKeTongJi changeTingKeTongJi;
/**
* 分页列表查询
*
@ -680,6 +683,8 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
if(StringUtils.isNotBlank(errorRest)){
errorRest = "<br/>共错误："+errNum+"行；错误数据如下：<br/>"+errorRest;
}
//刷新统计
changeTingKeTongJi.changeTingKeTongji();
return Result.ok(rest+errorRest);
} catch (Exception e) {
//update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
@ -699,6 +704,8 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
}
}
}
return Result.error("文件导入失败！");
}

25
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java
View File

@ -16,6 +16,7 @@ import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
import org.jeecg.modules.kc.kcZzXstkb.entity.KcZzXstkb;
import org.jeecg.modules.kc.kcZzXstkb.service.IKcZzXstkbService;
@ -63,15 +64,17 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbService> {
@Autowired
private IKcZzXstkbService kcZzXstkbService;
@Autowired
private IKcKetangbiaoService kcKetangbiaoService;
@Autowired
private IKcEvaluationService kcEvaluationService;
@Autowired
private IKcEvaluationsService kcEvaluationsService;
@Autowired
private IKcEvaluationansService kcEvaluationansService;
@Autowired
private IKcKetangbiaoService kcKetangbiaoService;
@Autowired
private IKcEvaluationService kcEvaluationService;
@Autowired
private IKcEvaluationsService kcEvaluationsService;
@Autowired
private IKcEvaluationansService kcEvaluationansService;
@Autowired
private ChangeTingKeTongJi changeTingKeTongJi;
/**
* 分页列表查询
*
@ -460,6 +463,9 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
if(StringUtils.isNotBlank(errorRest)){
errorRest = "<br/>共错误："+errNum+"行；错误数据如下：<br/>"+errorRest;
}
//刷新统计
changeTingKeTongJi.changeTingKeTongji();
return Result.ok(rest+errorRest);
} catch (Exception e) {
//update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
@ -479,6 +485,7 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
}
}
}
return Result.error("文件导入失败！");
}

6
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java
View File

@ -16,6 +16,7 @@ import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
import org.jeecg.modules.kc.kcZzYbtkb.entity.KcZzYbtkb;
import org.jeecg.modules.kc.kcZzYbtkb.service.IKcZzYbtkbService;
@ -70,6 +71,9 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
private IKcEvaluationsService kcEvaluationsService;
@Autowired
private IKcEvaluationansService kcEvaluationansService;
@Autowired
private ChangeTingKeTongJi changeTingKeTongJi;
/**
* 分页列表查询
*
@ -444,6 +448,8 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
if(StringUtils.isNotBlank(errorRest)){
errorRest = "<br/>共错误："+errNum+"行；错误数据如下：<br/>"+errorRest;
}
//刷新统计
changeTingKeTongJi.changeTingKeTongji();
return Result.ok(rest+errorRest);
} catch (Exception e) {
//update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示

50
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java
View File

@ -5,10 +5,13 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.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.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig;
import org.jeecg.modules.kc.qa.entity.KcEvaluation;
import org.jeecg.modules.kc.qa.entity.KcEvaluationPkmx;
import org.jeecg.modules.kc.qa.entity.KcEvaluations;
@ -51,6 +54,9 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
@Autowired
private IKcEvaluationsService kcEvaluationsService;
@Autowired
private ChangeTingKeTongJi changeTingKeTongJi;
@Value("${jeecg.path.upload}")
private String upLoadPath;
/**
@ -70,11 +76,55 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper(kcEvaluation, req.getParameterMap());
if(StringUtils.isNotBlank(kcEvaluation.getXnxq())){
KcSysConfig common = changeTingKeTongJi.getXqConfig();
String startSj = common.getBxqkssj();
String endSj = common.getBxqjssj();
String xqxn = common.getFlag1();
if(StringUtils.equals(xqxn,kcEvaluation.getXnxq())){
queryWrapper.apply("up_date >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') ");
queryWrapper.apply("up_date <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') ");
}
}
Page<KcEvaluation> page = new Page<KcEvaluation>(pageNo, pageSize);
IPage<KcEvaluation> pageList = kcEvaluationService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param kcEvaluation
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "调查问卷-回答主表-分页列表查询")
@ApiOperation(value="调查问卷-回答主表-分页列表查询", notes="调查问卷-回答主表-分页列表查询")
@GetMapping(value = "/keTangList")
public Result<IPage<KcEvaluation>> keTangList(KcEvaluation kcEvaluation,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluation, req.getParameterMap());
if(StringUtils.isNotBlank(kcEvaluation.getXnxq())){
KcSysConfig common = changeTingKeTongJi.getXqConfig();
String startSj = common.getBxqkssj();
String endSj = common.getBxqjssj();
String xqxn = common.getFlag1();
if(StringUtils.equals(xqxn,kcEvaluation.getXnxq())){
queryWrapper.apply("a.up_date >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') ");
queryWrapper.apply("a.up_date <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') ");
}
}
queryWrapper.isNotNull("a.minkcid");
Page<KcEvaluation> page = new Page<KcEvaluation>(pageNo, pageSize);
IPage<KcEvaluation> pageList = kcEvaluationService.keTangList(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*

127
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java
View File

@ -123,6 +123,10 @@ public class KcEvaluation implements Serializable {
@TableField(exist = false)
private String bz;
@TableField(exist = false)
private String xnxq;//学期学年
@ -191,4 +195,127 @@ public class KcEvaluation implements Serializable {
@TableField(exist = false)
private Integer pkNum;
//批量补充课堂信息
/**课程编号*/
@TableField(exist = false)
private java.lang.String kcbh;
/**学分*/
@TableField(exist = false)
private java.lang.String xf;
/**教职工类别*/
@TableField(exist = false)
private java.lang.String jzglb;
/**选课人数*/
@TableField(exist = false)
private java.lang.String xkrs;
/**评课人数*/
@TableField(exist = false)
private java.lang.String pkrs;
/**任务编号*/
@TableField(exist = false)
private java.lang.String rwbh;
/**教室编号*/
@TableField(exist = false)
private String jsbh;
/**上课地点*/
@TableField(exist = false)
private java.lang.String skdd;
/**上课时间*/
@TableField(exist = false)
private java.lang.String sksj;
/**未知*/
@TableField(exist = false)
private java.lang.String jkzc;
/**节次*/
@TableField(exist = false)
@Dict(dicCode = "skjc")
private java.lang.String hh;
/**周几*/
@TableField(exist = false)
@Dict(dicCode = "week")
private java.lang.String week;
/**开始时间*/
@TableField(exist = false)
private java.lang.String hhks;
/**结束时间*/
@TableField(exist = false)
private java.lang.String hhjs;
/**未知*/
@TableField(exist = false)
private java.lang.String dsz;
/**课堂开始日期*/
@TableField(exist = false)
private java.lang.String wwks;
/**课堂结束日期*/
@TableField(exist = false)
private java.lang.String wwjs;
/**直播方式*/
@TableField(exist = false)
private java.lang.String zbfs;
/**会议id*/
@TableField(exist = false)
private java.lang.String hyid;
/**会议号*/
@TableField(exist = false)
private java.lang.String hyh;
/**会议密码*/
@TableField(exist = false)
private java.lang.String hymm;
/**课程链接*/
@TableField(exist = false)
private java.lang.String kclj;
/**备注*/
@TableField(exist = false)
private java.lang.String beizhu;
/**直播平台*/
@TableField(exist = false)
private java.lang.String zbpx;
/**开课单位id*/
@TableField(exist = false)
private java.lang.Integer kkdwid;
/**课程表id*/
@TableField(exist = false)
private java.lang.Integer kechengbiaoid;
/**听课次数*/
@TableField(exist = false)
private java.lang.Integer tingkecishu;
/**开课周次*/
@TableField(exist = false)
private java.lang.String kkzc;
/**第几周*/
@TableField(exist = false)
private java.lang.Integer dijizhou;
/**未知*/
@TableField(exist = false)
private java.lang.String jkzc1;
/**是否停课*/
@TableField(exist = false)
private java.lang.Integer sftk;
/**停课原因*/
@TableField(exist = false)
private java.lang.String tkyy;
/**补课计划*/
@TableField(exist = false)
private java.lang.String bkjh;
/**是否出镜，0-出镜，1-不出镜*/
@TableField(exist = false)
private java.lang.Integer sfcj;
/**上课形式，0-线上，1-线下，2-线上线下混合*/
@TableField(exist = false)
private java.lang.Integer skxs;
/**未知*/
@TableField(exist = false)
private java.lang.Integer kechengbiao1;
/**是否新生课 0 = 是*/
@TableField(exist = false)
private java.lang.String sfxsk;
/**教工号*/
@TableField(exist = false)
private java.lang.String jgh;
/**状态*/
@TableField(exist = false)
private java.lang.String zt;
}

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java
View File

@ -2,7 +2,9 @@ package org.jeecg.modules.kc.qa.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.kc.qa.entity.KcEvaluation;
@ -28,4 +30,5 @@ public interface KcEvaluationMapper extends BaseMapper<KcEvaluation> {
List<KcEvaluation> selectKkdwExportList(KcEvaluation kcEvaluation);
List<KcEvaluationPkmx> selectPkmxExportList(KcEvaluationPkmx kcEvaluationPkmx);
List<KcEvaluation> keTangList(Page<KcEvaluation> page, @Param(Constants.WRAPPER) QueryWrapper<KcEvaluation> queryWrapper);
}

55
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml
View File

@ -336,5 +336,60 @@
up_date DESC,
up_time DESC
</select>
<select id="keTangList" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
SELECT
a.*,
kb.kcbh,
kb.kcmc,
kb.xf,
kb.skjs,
kb.zc,
kb.jzglb,
kb.xkrs,
kb.pkrs,
kb.rwbh,
kb.kkdw,
kb.kcxz,
kb.skdd,
kb.sksj,
kb.jkzc,
kb.hh,
kb.WEEK,
kb.hhks,
kb.hhjs,
kb.dsz,
kb.wwks,
kb.wwjs,
kb.zbfs,
kb.hyid,
kb.hyh,
kb.hymm,
kb.kclj,
kb.beizhu,
kb.zbpx,
kb.kkdwid,
kb.skrq,
kb.kechengbiaoid,
kb.tingkecishu,
kb.kkzc,
kb.dijizhou,
kb.jkzc1,
kb.sftk,
kb.tkyy,
kb.bkjh,
kb.sfcj,
kb.skxs,
kb.kechengbiao1,
kb.sfxsk,
kb.jgh,
kb.bz,
kb.jsbh,
kb.zt
FROM
kc_evaluation a
LEFT JOIN kc_ketangbiao kb ON kb.id = a.minkcid
${ew.customSqlSegment}
</select>
</mapper>

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java
View File

@ -1,5 +1,6 @@
package org.jeecg.modules.kc.qa.service;
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.qa.entity.KcEvaluation;
@ -29,4 +30,6 @@ public interface IKcEvaluationService extends IService<KcEvaluation> {
List<KcEvaluation> selectKkdwExportList(KcEvaluation kcEvaluation);
List<KcEvaluationPkmx> selectPkmxExportList(KcEvaluationPkmx kcEvaluationPkmx);
IPage<KcEvaluation> keTangList(Page<KcEvaluation> page, QueryWrapper<KcEvaluation> queryWrapper);
}

6
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java
View File

@ -2,6 +2,7 @@ package org.jeecg.modules.kc.qa.service.impl;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
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.common.exception.JeecgBootException;
@ -99,4 +100,9 @@ public class KcEvaluationServiceImpl extends ServiceImpl<KcEvaluationMapper, KcE
return baseMapper.selectPkmxExportList(kcEvaluationPkmx);
}
@Override
public IPage<KcEvaluation> keTangList(Page<KcEvaluation> page, QueryWrapper<KcEvaluation> queryWrapper) {
return page.setRecords(baseMapper.keTangList(page,queryWrapper));
}
}