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

2023年6月13日 修复定时任务日志，修改导出

This commit is contained in:
bai 2023-06-13 00:11:49 +08:00
parent 1cbc1e997e
commit d2178c89b6
26 changed files with 126 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTBks.java
View File

@ -59,7 +59,7 @@ public class SyncTBks extends BaseSync {
errorMessage = e.getMessage();
}
Xxhbbks xxhbbks = xxhbbksService.getSumnum();
int mysqlnum=xxhbbks.getMysqlnum();
int mysqlnum = xxhbbks.getMysqlnum();
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
xxhbsynclog.setOratabname("T_BKS");//oracle表名

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTDw.java
View File

@ -4,10 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.Lists;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.grab.exports.entity.TBks;
import org.jeecg.modules.kc.grab.exports.entity.TDw;
import org.jeecg.modules.kc.grab.exports.service.ITDwService;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbdw;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
import org.jeecg.modules.kc.grab.imports.service.IXxhbdwService;
@ -61,7 +59,7 @@ public class SyncTDw extends BaseSync {
errorMessage = e.getMessage();
}
Xxhbdw xxhbdw = impService.getSumnum();
int mysqlnum=xxhbdw.getMysqlnum();
int mysqlnum = xxhbdw.getMysqlnum();
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
xxhbsynclog.setOratabname("T_DW");//oracle表名

11
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java
View File

@ -380,7 +380,18 @@ public class SyncTFwdtBkjxtkpj extends BaseSync {
}
Xxhbbkjxtkpj xxhbshryxx = xxhbbkjxtkpjService.getSumnum();
int mysqlnum = xxhbshryxx.getMysqlnum();
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setTablename("附加定时任务，清洗服务大厅数据");
xxhbsynclog.setOratabname("T_ZZB_LDXX");//oracle表名
xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量
xxhbsynclog.setTablenum(mysqlnum);//mysql表数量
xxhbsynclog.setSyncnum(outDataList.size());//本次同步数据量
xxhbsynclog.setSynctype("1");//同步类型 0全量 1增量
// xxhbsynclog.setErrormessage("");
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
saveLog(xxhbsynclog,Xxhbbkjxtkpj.class);
}

26
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java
View File

@ -81,17 +81,6 @@ public class SyncTFwdtShryxx extends BaseSync {
e.printStackTrace();
errorMessage = e.getMessage();
}
Xxhbshryxx xxhbshryxx = impService.getSumnum();
int mysqlnum=xxhbshryxx.getMysqlnum();
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
xxhbsynclog.setOratabname("t_fwdt_shryxx");//oracle表名
xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量
xxhbsynclog.setTablenum(mysqlnum);//mysql表数量
xxhbsynclog.setSyncnum(syncnum);//本次同步数据量
xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量
xxhbsynclog.setErrormessage(errorMessage);
saveLog(xxhbsynclog,Xxhbshryxx.class);
@ -106,9 +95,18 @@ public class SyncTFwdtShryxx extends BaseSync {
kcTksfrzbService.saveBatch(saveList);
// Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
// xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
// saveLog(xxhbsynclog, Xxhbshryxx.class);
Xxhbshryxx xxhbshryxx = impService.getSumnum();
int mysqlnum=xxhbshryxx.getMysqlnum();
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
xxhbsynclog.setOratabname("t_fwdt_shryxx");//oracle表名
xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量
xxhbsynclog.setTablenum(mysqlnum);//mysql表数量
xxhbsynclog.setSyncnum(syncnum);//本次同步数据量
xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量
xxhbsynclog.setErrormessage(errorMessage);
saveLog(xxhbsynclog,Xxhbshryxx.class);
}
/**

7
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJsjbxxb.java
View File

@ -5,15 +5,10 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.Lists;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.grab.exports.entity.TJwJsjbxx;
import org.jeecg.modules.kc.grab.exports.entity.TJwKckb;
import org.jeecg.modules.kc.grab.exports.service.ITJwJsjbxxService;
import org.jeecg.modules.kc.grab.exports.service.ITJwKckbService;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbkckb;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
import org.jeecg.modules.kc.grab.imports.service.IXxhbjsjbxxService;
import org.jeecg.modules.kc.grab.imports.service.IXxhbkckbService;
import org.quartz.JobExecutionContext;
import org.springframework.beans.factory.annotation.Autowired;
@ -74,7 +69,7 @@ public class SyncTJwJsjbxxb extends BaseSync {
xxhbsynclog.setSyncnum(syncnum);//本次同步数据量
xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量
xxhbsynclog.setErrormessage(errorMessage);
saveLog(xxhbsynclog,Xxhbbks.class);
saveLog(xxhbsynclog,Xxhbjsjbxx.class);
}
/**

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJxljbxxb.java
View File

@ -6,7 +6,8 @@ import org.apache.commons.compress.utils.Lists;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.grab.exports.entity.TJwJxljbxx;
import org.jeecg.modules.kc.grab.exports.service.ITJwJxljbxxService;
import org.jeecg.modules.kc.grab.imports.entity.*;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbjxljbxx;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
import org.jeecg.modules.kc.grab.imports.service.IXxhbjxljbxxService;
import org.quartz.JobExecutionContext;
import org.springframework.beans.factory.annotation.Autowired;

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcapzb.java
View File

@ -6,8 +6,6 @@ import org.apache.commons.compress.utils.Lists;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.grab.exports.entity.TJwKcapzb;
import org.jeecg.modules.kc.grab.exports.service.ITJwKcapzbService;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbkcapzb;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
import org.jeecg.modules.kc.grab.imports.service.IXxhbkcapzbService;
@ -70,7 +68,7 @@ public class SyncTJwKcapzb extends BaseSync {
xxhbsynclog.setSyncnum(syncnum);//本次同步数据量
xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量
xxhbsynclog.setErrormessage(errorMessage);
saveLog(xxhbsynclog, Xxhbbks.class);
saveLog(xxhbsynclog, Xxhbkcapzb.class);
}
/**

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckb.java
View File

@ -6,8 +6,6 @@ import org.apache.commons.compress.utils.Lists;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.grab.exports.entity.TJwKckb;
import org.jeecg.modules.kc.grab.exports.service.ITJwKckbService;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbkckb;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
import org.jeecg.modules.kc.grab.imports.service.IXxhbkckbService;

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcxxb.java
View File

@ -6,8 +6,6 @@ import org.apache.commons.compress.utils.Lists;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.grab.exports.entity.TJwKcxxb;
import org.jeecg.modules.kc.grab.exports.service.ITJwKcxxbService;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbkcxxb;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
import org.jeecg.modules.kc.grab.imports.service.IXxhbkcxxbService;

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkkcb.java
View File

@ -6,8 +6,6 @@ import org.apache.commons.compress.utils.Lists;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.grab.exports.entity.TJwTkkcb;
import org.jeecg.modules.kc.grab.exports.service.ITJwTkkcbService;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbtkkcb;
import org.jeecg.modules.kc.grab.imports.service.IXxhbtkkcbService;

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

@ -6,7 +6,6 @@ import org.apache.commons.compress.utils.Lists;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.grab.exports.entity.TJwTkxx;
import org.jeecg.modules.kc.grab.exports.service.ITJwTkxxService;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbdw;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx;
import org.jeecg.modules.kc.grab.imports.service.IXxhbtkxxService;

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

@ -8,7 +8,6 @@ import org.apache.commons.compress.utils.Lists;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.grab.exports.entity.TJwXsxkb;
import org.jeecg.modules.kc.grab.exports.service.ITJwXsxkbService;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbdw;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbxsxkb;
import org.jeecg.modules.kc.grab.imports.service.IXxhbxsxkbService;

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTZzbLdxx.java
View File

@ -4,18 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.Lists;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.grab.exports.entity.TBks;
import org.jeecg.modules.kc.grab.exports.entity.TDw;
import org.jeecg.modules.kc.grab.exports.entity.TZzbLdxx;
import org.jeecg.modules.kc.grab.exports.service.ITBksService;
import org.jeecg.modules.kc.grab.exports.service.ITDwService;
import org.jeecg.modules.kc.grab.exports.service.ITZzbLdxxService;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbdw;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbldxx;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService;
import org.jeecg.modules.kc.grab.imports.service.IXxhbdwService;
import org.jeecg.modules.kc.grab.imports.service.IXxhbldxxService;
import org.quartz.JobExecutionContext;
import org.springframework.beans.factory.annotation.Autowired;

17
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java
View File

@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbldxx;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
import org.jeecg.modules.kc.grab.imports.service.IXxhbbkjxtkpjService;
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
@ -92,13 +93,8 @@ public class SyncZwdtEvaluation extends BaseSync {
public void run(Map<String, Object> param){
initOptionMap();
//旧版本
washOldData(param);
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum("1");
saveLog(xxhbsynclog, KcOldEvaluationque.class);
}
/**
@ -386,6 +382,17 @@ public class SyncZwdtEvaluation extends BaseSync {
//有ID了，清洗数据
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setTablename("附加定时任务，清洗服务大厅数据");
xxhbsynclog.setOratabname("T_ZZB_LDXX");//oracle表名
xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量
// xxhbsynclog.setTablenum(mysqlnum);//mysql表数量
xxhbsynclog.setSyncnum(saveMainList.size());//本次同步数据量
xxhbsynclog.setSynctype(isAll?"0":"1");//同步类型 0全量 1增量
// xxhbsynclog.setErrormessage("");
saveLog(xxhbsynclog);
}
public static void main(String[] args) {

21
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/base/BaseSync.java
View File

@ -65,12 +65,23 @@ public abstract class BaseSync implements Job {
public abstract void run();
public void saveLog(Xxhbsynclog xxhbsynclog) {
saveLog(xxhbsynclog,null);
}
public void saveLog(Xxhbsynclog xxhbsynclog, Class clazz) {
DateTime now = DateTime.now();
xxhbsynclog.setSyncdate(now.toDateStr());//日期
xxhbsynclog.setSynctime(now.toTimeStr());//时间
xxhbsynclog.setTablename(SqlHelper.table(clazz).getTableName());
xxhbsynclogService.save(xxhbsynclog);
try {
DateTime now = DateTime.now();
xxhbsynclog.setSyncdate(now.toDateStr());//日期
xxhbsynclog.setSynctime(now.toTimeStr());//时间
if(clazz != null){
xxhbsynclog.setTablename(SqlHelper.table(clazz).getTableName());
}
xxhbsynclogService.save(xxhbsynclog);
}catch (Exception e){
log.error("同步数据出现未知错误!!!");
log.error(e.getMessage(),e);
}
}

9
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java
View File

@ -4,10 +4,8 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@ -136,4 +134,7 @@ public class Xxhbbkjxtkpj implements Serializable {
private java.util.Date timestamps;
private String kbbh;
@TableField(exist = false)
private Integer mysqlnum;
}

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbsynclog.java
View File

@ -58,10 +58,18 @@ public class Xxhbsynclog implements Serializable {
@ApiModelProperty(value = "同步行数量")
private java.lang.String errormessage;
/**oracle表名*/
private java.lang.String oratabname;
/**mysql表数量*/
private Integer tablenum;
/**oracle表数量*/
private Integer oratabnum;
/**本次同步数据量*/
private Integer syncnum;
/**同步类型 0全量 1增量*/
private java.lang.String synctype;

1
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbkjxtkpjMapper.java
View File

@ -14,4 +14,5 @@ import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj;
*/
public interface XxhbbkjxtkpjMapper extends BaseMapper<Xxhbbkjxtkpj> {
Xxhbbkjxtkpj getSumnum();
}

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbkjxtkpjMapper.xml
View File

@ -2,4 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.kc.grab.imports.mapper.XxhbbkjxtkpjMapper">
<select id="getSumnum">
select count(*) as mysqlnum from xxhbbkjxtkpj
</select>
</mapper>

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbkjxtkpjService.java
View File

@ -6,6 +6,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* @Description: xxhbbkjxtkpj
@ -19,4 +20,6 @@ public interface IXxhbbkjxtkpjService extends IService<Xxhbbkjxtkpj> {
@Transactional(rollbackFor = {Exception.class})
boolean syncList(Collection<Xxhbbkjxtkpj> entityList, boolean isDelete);
Xxhbbkjxtkpj getSumnum();
}

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbkjxtkpjServiceImpl.java
View File

@ -35,4 +35,9 @@ public class XxhbbkjxtkpjServiceImpl extends ServiceImpl<XxhbbkjxtkpjMapper, Xxh
// }
return this.saveBatch(entityList, 1000);
}
@Override
public Xxhbbkjxtkpj getSumnum() {
return baseMapper.getSumnum();
}
}

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

@ -2,9 +2,11 @@ package org.jeecg.modules.kc.qa.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.google.common.collect.Maps;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
@ -240,13 +242,23 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, KcEvaluation kcEvaluation) {
String title = "评课统计";
//TODO 统计4
// Step.1 组装查询条件
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 过滤选中数据
// Step.2 获取导出数据
List<KcEvaluation> exportList = kcEvaluationService.selectKkdwExportList(kcEvaluation);
Map<Integer,String> sourceDictMap = Maps.newHashMap();
//0：门户添加，1：老系统，2：政务大厅，3后台导入
sourceDictMap.put(0,"门户添加");
sourceDictMap.put(1,"老系统");
sourceDictMap.put(2,"政务大厅");
sourceDictMap.put(3,"后台导入");
//更改字典项
exportList.forEach(x -> {
x.setSourceName(sourceDictMap.get(x.getSource()));
});
// Step.3 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
@ -331,7 +343,7 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
@RequestMapping(value = "/exportPkmxbXls")
public ModelAndView exportPkmxbXls(HttpServletRequest request, KcEvaluationPkmx kcEvaluationPkmx) {
String title = "评课明细";
//TODO 导出3
// Step.1 组装查询条件
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@ -339,6 +351,17 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
// Step.2 获取导出数据
List<KcEvaluationPkmx> exportList = kcEvaluationService.selectPkmxExportList(kcEvaluationPkmx);
Map<Integer,String> sourceDictMap = Maps.newHashMap();
//0：门户添加，1：老系统，2：政务大厅，3后台导入
sourceDictMap.put(0,"门户添加");
sourceDictMap.put(1,"老系统");
sourceDictMap.put(2,"政务大厅");
sourceDictMap.put(3,"后台导入");
//更改字典项
exportList.forEach(x -> {
x.setSourceName(sourceDictMap.get(x.getSource()));
});
// Step.3 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
//此处设置的filename无效 ,前端会重更新设置一下

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

@ -98,6 +98,10 @@ public class KcEvaluation implements Serializable {
@ApiModelProperty(value = "数据来源（0：课程中心，1：老系统，2：政务大厅，3：纸质评价）")
private java.lang.Integer source;
@Excel(name = "评价来源", width = 15)
@TableField(exist = false)
private String sourceName;
@Excel(name = "职工号", width = 15)
@TableField(exist = false)
private java.lang.String userid;

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationPkmx.java
View File

@ -55,7 +55,7 @@ public class KcEvaluationPkmx implements Serializable {
private String upDate;
@Excel(name = "评课时间", width = 15)
private String upTime;
@Excel(name = "评课标准", width = 15)
// @Excel(name = "评课标准", width = 15)
private String bz;
@ -63,4 +63,10 @@ public class KcEvaluationPkmx implements Serializable {
private String startTime;
private String endTime;
/**数据来源（0：门户添加，1：老系统，2：政务大厅，3后台导入）*/
private java.lang.Integer source;
@Excel(name = "评价来源", width = 15)
private String sourceName;
}

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

@ -48,7 +48,8 @@
(
SELECT
k.id,c.USER as userid, c.cn as username, c.college, k.kkdw, k.kcmc, k.kcxz, k.skjs, k.week as zc, k.hh as jc, p.up_date, p.up_time, p.id AS evaId, p.evaluationver,
k.bz
k.bz,
p.source
FROM kc_ketangbiao k, kc_evaluation p, kc_casusers c
WHERE
k.id = p.minkcid
@ -264,7 +265,7 @@
<select id="selectKkdwExportList" parameterType="org.jeecg.modules.kc.qa.entity.KcEvaluation" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
SELECT
tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw
tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw, ev.source
FROM (
SELECT ev.upuserid, ev.upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, college AS tkdw
FROM
@ -305,7 +306,8 @@
(
SELECT
k.id,c.USER as userid, c.cn as username, c.college, k.kkdw, k.kcmc, k.kcxz, k.skjs, k.week as zc, k.hh as jc, p.up_date, p.up_time, p.id AS evaId, p.evaluationver,
k.bz
k.bz,
p.source
FROM kc_ketangbiao k, kc_evaluation p, kc_casusers c
WHERE
k.id = p.minkcid

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java
View File

@ -190,7 +190,7 @@ public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeServi
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls( KcTingke kcTingke,HttpServletRequest request) {
String title = "听课人员统计";
//TODO 统计
System.out.println(request.getParameter("startTime"));
BeanUtils.copyProperties(kcTingke, request.getParameterMap());
// Step.1 组装查询条件
@ -381,7 +381,7 @@ public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeServi
@RequestMapping(value = "/exportTkmxXls")
public ModelAndView exportTkmxXls(KcTkmx kcTkmx, HttpServletRequest request) {
String title = "听课明细";
//TODO 统计2
// Step.1 组装查询条件
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();