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

2023年8月25日 修复导出

This commit is contained in:
bai 2023-08-25 11:10:03 +08:00
parent 389c129dcf
commit 97016f72fa
3 changed files with 48 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java
View File

@ -41,6 +41,8 @@ import javax.servlet.http.HttpServletResponse;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
/** /**
* @Description: kc_export_config_tpkwcqkjzglx * @Description: kc_export_config_tpkwcqkjzglx
@ -100,6 +102,8 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
} }
Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize); Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize);
IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper); IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper);
Set<String> xqxnSet = pageList.getRecords().stream().filter(x -> StringUtils.isNotBlank(x.getXqxn())).map(KcExportConfigTpkwcqkjzglx::getXqxn).collect(Collectors.toSet());
//根据当前学期学年，硬合并出来一个数据 //根据当前学期学年，硬合并出来一个数据
QueryWrapper<KcTkcstj> tjQw = new QueryWrapper<>(); QueryWrapper<KcTkcstj> tjQw = new QueryWrapper<>();
// KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(kcExportConfigTpkwcqkjzglx.getXqxn()); // KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(kcExportConfigTpkwcqkjzglx.getXqxn());
@ -107,18 +111,23 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
// return Result.OK(new Page<>()); // return Result.OK(new Page<>());
// } // }
// tjQw.eq("xnxq",kcXqxnHistory.getTitle()); // tjQw.eq("xnxq",kcXqxnHistory.getTitle());
tjQw.eq("xnxq",kcExportConfigTpkwcqkjzglx.getXqxn()); // tjQw.eq("xnxq",kcExportConfigTpkwcqkjzglx.getXqxn());
if(xqxnSet.isEmpty()){
tjQw.eq("xnxq",-1);
}else{
tjQw.in("xnxq",xqxnSet);
}
List<KcTkcstj> tjList = kcTkcstjService.list(tjQw); List<KcTkcstj> tjList = kcTkcstjService.list(tjQw);
Map<String,KcTkcstj> tjMap = Maps.newHashMap(); Map<String,KcTkcstj> tjMap = Maps.newHashMap();
tjList.forEach(x -> { tjList.forEach(x -> {
tjMap.put(x.getJgh(),x); tjMap.put(x.getXnxq() + "-" + x.getJgh(),x);
}); });
pageList.getRecords().forEach(x -> { pageList.getRecords().forEach(x -> {
x.setTkxttj("0"); x.setTkxttj("0");
x.setYskcs("0"); x.setYskcs("0");
if(tjMap.containsKey(x.getGh())){ if(tjMap.containsKey(x.getXqxn() + "-" + x.getGh())){
KcTkcstj tkcstj = tjMap.get(x.getGh()); KcTkcstj tkcstj = tjMap.get(x.getXqxn() + "-" + x.getGh());
x.setTkxttj(StringUtils.defaultString(tkcstj.getTkxttj(),"0")); x.setTkxttj(StringUtils.defaultString(tkcstj.getTkxttj(),"0"));
x.setYskcs(StringUtils.defaultString(tkcstj.getYskcs(),"0")); x.setYskcs(StringUtils.defaultString(tkcstj.getYskcs(),"0"));
//x.setXqxn(kcXqxnHistory.getTitle()); //x.setXqxn(kcXqxnHistory.getTitle());
@ -257,14 +266,21 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
// Step.2 获取导出数据 // Step.2 获取导出数据
List<KcExportConfigTpkwcqkjzglx> exportList = service.list(queryWrapper); List<KcExportConfigTpkwcqkjzglx> exportList = service.list(queryWrapper);
Set<String> xqxnSet = exportList.stream().filter(x -> StringUtils.isNotBlank(x.getXqxn())).map(KcExportConfigTpkwcqkjzglx::getXqxn).collect(Collectors.toSet());
//根据当前学期学年，硬合并出来一个数据 //根据当前学期学年，硬合并出来一个数据
QueryWrapper<KcTkcstj> tjQw = new QueryWrapper<>(); QueryWrapper<KcTkcstj> tjQw = new QueryWrapper<>();
KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(object.getXqxn()); // KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(object.getXqxn());
// if(kcXqxnHistory == null){ // if(kcXqxnHistory == null){
// exportList = Lists.newArrayList(); // exportList = Lists.newArrayList();
// } // }
// tjQw.eq("xnxq",kcXqxnHistory.getTitle()); // tjQw.eq("xnxq",kcXqxnHistory.getTitle());
tjQw.eq("xnxq",object.getXqxn()); // tjQw.eq("xnxq",object.getXqxn());
if(xqxnSet.isEmpty()){
tjQw.eq("xnxq",-1);
}else{
tjQw.in("xnxq",xqxnSet);
}
List<KcTkcstj> tjList = kcTkcstjService.list(tjQw); List<KcTkcstj> tjList = kcTkcstjService.list(tjQw);
Map<String,KcTkcstj> tjMap = Maps.newHashMap(); Map<String,KcTkcstj> tjMap = Maps.newHashMap();
tjList.forEach(x -> { tjList.forEach(x -> {
@ -274,8 +290,8 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
exportList.forEach(x -> { exportList.forEach(x -> {
x.setTkxttj("0"); x.setTkxttj("0");
x.setYskcs("0"); x.setYskcs("0");
if(tjMap.containsKey(x.getGh())){ if(tjMap.containsKey(x.getXqxn() + "-" + x.getGh())){
KcTkcstj tkcstj = tjMap.get(x.getGh()); KcTkcstj tkcstj = tjMap.get(x.getXqxn() + "-" + x.getGh());
x.setTkxttj(StringUtils.defaultString(tkcstj.getTkxttj(),"0")); x.setTkxttj(StringUtils.defaultString(tkcstj.getTkxttj(),"0"));
x.setYskcs(StringUtils.defaultString(tkcstj.getYskcs(),"0")); x.setYskcs(StringUtils.defaultString(tkcstj.getYskcs(),"0"));
} }

34
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/entity/KcExportConfigTpkwcqkjzglx.java
View File

@ -54,27 +54,33 @@ public class KcExportConfigTpkwcqkjzglx implements Serializable {
/**所属部门*/ /**所属部门*/
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private String sysOrgCode; private String sysOrgCode;
/**学期学年*/
@Excel(name = "学年学期", width = 15)
@ApiModelProperty(value = "学年学期")
private String xqxn;
/**学院*/ /**学院*/
@Excel(name = "学院", width = 15) @Excel(name = "学院", width = 15)
@ApiModelProperty(value = "学院") @ApiModelProperty(value = "学院")
private String dwmc; private String dwmc;
/**工号*/ /**工号*/
@Excel(name = "工号", width = 15) @Excel(name = "教师工号", width = 15)
// @Dict(dictTable = "xxhbuser", dicText = "xm", dicCode = "gh") // @Dict(dictTable = "xxhbuser", dicText = "xm", dicCode = "gh")
@ApiModelProperty(value = "工号") @ApiModelProperty(value = "工号")
private String gh; private String gh;
/**听课类型（字典：tpkwcqkjzglx ）*/ /**姓名*/
@Excel(name = "听课类型", width = 15, dicCode = "tpkwcqkjzglx") @Excel(name = "教师姓名", width = 15)
@ApiModelProperty(value = "姓名")
private String xm;
/**听课类型（字典：tpkwcqkjzglx）*/
@Excel(name = "听课身份", width = 15, dicCode = "tpkwcqkjzglx")
@Dict(dicCode = "tpkwcqkjzglx") @Dict(dicCode = "tpkwcqkjzglx")
@ApiModelProperty(value = "听课类型（字典：tpkwcqkjzglx ）") @ApiModelProperty(value = "听课类型（字典：tpkwcqkjzglx）")
private String tklx; private String tklx;
/**姓名*/
@Excel(name = "姓名", width = 15)
@ApiModelProperty(value = "姓名")
private String xm;
/**身份*/ /**身份*/
@Excel(name = "身份", width = 15) @Excel(name = "听课类型", width = 15)
@ApiModelProperty(value = "身份") @ApiModelProperty(value = "身份")
private String sf; private String sf;
/**状态*/ /**状态*/
@ -83,16 +89,10 @@ public class KcExportConfigTpkwcqkjzglx implements Serializable {
private String zt; private String zt;
/**每学期应听课次数*/ /**每学期应听课次数*/
// @Excel(name = "每学期应听课次数", width = 20) // @Excel(name = "每学期应听课次数", width = 20)
@Excel(name = "本学期应听课次数", width = 15) @Excel(name = "本学期应听课次数", width = 30)
@ApiModelProperty(value = "每学期应听课次数") @ApiModelProperty(value = "每学期应听课次数")
private String ytkcs; private String ytkcs;
/**学期学年*/
// @Excel(name = "每学期应听课次数", width = 20)
@Excel(name = "本学期应听课次数", width = 15)
@ApiModelProperty(value = "每学期应听课次数")
private String xqxn;
@TableField(exist = false) @TableField(exist = false)
private String zwmc; private String zwmc;
@ -100,7 +100,7 @@ public class KcExportConfigTpkwcqkjzglx implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String yskcs; private String yskcs;
/**本学期已听课次数*/ /**本学期已听课次数*/
@Excel(name = "本学期已听课次数", width = 15) @Excel(name = "本学期已听课次数", width = 30)
@TableField(exist = false) @TableField(exist = false)
private String tkxttj; private String tkxttj;

9
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java
View File

@ -125,6 +125,7 @@ public class SyncTJzgXskc extends BaseSync {
QueryWrapper<KcExportConfigTpkwcqkjzglx> ectQw = new QueryWrapper<>(); QueryWrapper<KcExportConfigTpkwcqkjzglx> ectQw = new QueryWrapper<>();
//按学期筛选 //按学期筛选
KcXqxnHistory common = changeTingKeTongJi.getXqConfig(); KcXqxnHistory common = changeTingKeTongJi.getXqConfig();
String xqxn;
if(common != null) { if(common != null) {
//Map<String, KcTkcstj> tongJiMap = Maps.newHashMap(); //Map<String, KcTkcstj> tongJiMap = Maps.newHashMap();
//清洗数据核心 //清洗数据核心
@ -132,8 +133,10 @@ public class SyncTJzgXskc extends BaseSync {
Date endSjDate = common.getEndTime(); Date endSjDate = common.getEndTime();
String startSj = DateUtil.format(startSjDate,DatePattern.NORM_DATETIME_FORMAT); String startSj = DateUtil.format(startSjDate,DatePattern.NORM_DATETIME_FORMAT);
String endSj = DateUtil.format(endSjDate,DatePattern.NORM_DATETIME_FORMAT); String endSj = DateUtil.format(endSjDate,DatePattern.NORM_DATETIME_FORMAT);
String xqxn = common.getTitle(); xqxn = common.getTitle();
ectQw.eq("xqxn",xqxn); ectQw.eq("xqxn",xqxn);
} else {
xqxn = null;
} }
List<KcExportConfigTpkwcqkjzglx> oldExportConfigTpkwcqkjzglxList = exportConfigTpkwcqkjzglxService.list(ectQw); List<KcExportConfigTpkwcqkjzglx> oldExportConfigTpkwcqkjzglxList = exportConfigTpkwcqkjzglxService.list(ectQw);
@ -175,7 +178,9 @@ public class SyncTJzgXskc extends BaseSync {
outUserDataList.forEach(x -> { outUserDataList.forEach(x -> {
if(!saveMap.containsKey(x.getGh())){ if(!saveMap.containsKey(x.getGh())){
saveList.add(BeanUtil.toBean(x, KcExportConfigTpkwcqkjzglx.class)); KcExportConfigTpkwcqkjzglx data = BeanUtil.toBean(x, KcExportConfigTpkwcqkjzglx.class);
data.setXqxn(xqxn);
saveList.add(data);
} }
}); });