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 00:40:55 +08:00
parent a5ce8eb982
commit 69ee67947b
4 changed files with 113 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx;
import org.jeecg.modules.kc.config.export.Export;
import org.jeecg.modules.kc.config.service.IKcExportConfigTpkwcqkjzglxService;
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbuser;
import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService;
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
import org.jeecg.modules.kc.tksf.kctkcstj.entity.KcTkcstj;
@ -86,15 +87,27 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
HttpServletRequest req) {
QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap());
// queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc());
if(kcExportConfigTpkwcqkjzglx.isFindByDwmc()){
QueryWrapper<Xxhbuser> uqw = new QueryWrapper<>();
//LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
uqw.eq("gh",kcExportConfigTpkwcqkjzglx.getFindGh());
uqw.last("limit 1");
Xxhbuser xxhbUser = xxhbuserService.getOne(uqw);
if(xxhbUser == null) {
return Result.OK(new Page<>());
}
queryWrapper.eq("dwmc ",xxhbUser.getDwmc());
}
Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize);
IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper);
//根据当前学期学年，硬合并出来一个数据
QueryWrapper<KcTkcstj> tjQw = new QueryWrapper<>();
KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(kcExportConfigTpkwcqkjzglx.getXqxn());
if(kcXqxnHistory == null){
return Result.OK(new Page<>());
}
tjQw.eq("xnxq",kcXqxnHistory.getTitle());
// KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(kcExportConfigTpkwcqkjzglx.getXqxn());
// if(kcXqxnHistory == null){
// return Result.OK(new Page<>());
// }
// tjQw.eq("xnxq",kcXqxnHistory.getTitle());
tjQw.eq("xnxq",kcExportConfigTpkwcqkjzglx.getXqxn());
List<KcTkcstj> tjList = kcTkcstjService.list(tjQw);
Map<String,KcTkcstj> tjMap = Maps.newHashMap();
tjList.forEach(x -> {
@ -108,7 +121,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
KcTkcstj tkcstj = tjMap.get(x.getGh());
x.setTkxttj(StringUtils.defaultString(tkcstj.getTkxttj(),"0"));
x.setYskcs(StringUtils.defaultString(tkcstj.getYskcs(),"0"));
x.setXqxn(kcXqxnHistory.getTitle());
//x.setXqxn(kcXqxnHistory.getTitle());
}
});
@ -224,7 +237,17 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
// Step.1 组装查询条件
QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(object.isFindByDwmc()){
QueryWrapper<Xxhbuser> uqw = new QueryWrapper<>();
//LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
uqw.eq("gh",object.getFindGh());
uqw.last("limit 1");
Xxhbuser xxhbUser = xxhbuserService.getOne(uqw);
if(xxhbUser == null) {
queryWrapper.eq("dwmc ",-1);
}
queryWrapper.eq("dwmc ",xxhbUser.getDwmc());
}
// 过滤选中数据
String selections = request.getParameter("selections");
if (oConvertUtils.isNotEmpty(selections)) {
@ -237,11 +260,11 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
//根据当前学期学年，硬合并出来一个数据
QueryWrapper<KcTkcstj> tjQw = new QueryWrapper<>();
KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(object.getXqxn());
if(kcXqxnHistory == null){
exportList = Lists.newArrayList();
}
tjQw.eq("xnxq",kcXqxnHistory.getTitle());
// if(kcXqxnHistory == null){
// exportList = Lists.newArrayList();
// }
// tjQw.eq("xnxq",kcXqxnHistory.getTitle());
tjQw.eq("xnxq",object.getXqxn());
List<KcTkcstj> tjList = kcTkcstjService.list(tjQw);
Map<String,KcTkcstj> tjMap = Maps.newHashMap();
tjList.forEach(x -> {

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

@ -15,6 +15,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: kc_export_config_tpkwcqkjzglx
@ -33,73 +34,83 @@ public class KcExportConfigTpkwcqkjzglx implements Serializable {
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.String id;
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
private Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
private String sysOrgCode;
/**学院*/
@Excel(name = "学院", width = 15)
@ApiModelProperty(value = "学院")
private java.lang.String dwmc;
private String dwmc;
/**工号*/
@Excel(name = "工号", width = 15)
// @Dict(dictTable = "xxhbuser", dicText = "xm", dicCode = "gh")
@ApiModelProperty(value = "工号")
private java.lang.String gh;
private String gh;
/**听课类型（字典：tpkwcqkjzglx ）*/
@Excel(name = "听课类型", width = 15, dicCode = "tpkwcqkjzglx")
@Dict(dicCode = "tpkwcqkjzglx")
@ApiModelProperty(value = "听课类型（字典：tpkwcqkjzglx ）")
private java.lang.String tklx;
private String tklx;
/**姓名*/
@Excel(name = "姓名", width = 15)
@ApiModelProperty(value = "姓名")
private java.lang.String xm;
private String xm;
/**身份*/
@Excel(name = "身份", width = 15)
@ApiModelProperty(value = "身份")
private java.lang.String sf;
private String sf;
/**状态*/
@Excel(name = "状态", width = 15)
@ApiModelProperty(value = "状态")
private java.lang.String zt;
private String zt;
/**每学期应听课次数*/
// @Excel(name = "每学期应听课次数", width = 20)
@Excel(name = "本学期应听课次数", width = 15)
@ApiModelProperty(value = "每学期应听课次数")
private java.lang.String ytkcs;
private String ytkcs;
/**学期学年*/
// @Excel(name = "每学期应听课次数", width = 20)
@Excel(name = "本学期应听课次数", width = 15)
@ApiModelProperty(value = "每学期应听课次数")
private String xqxn;
@TableField(exist = false)
private String zwmc;
/**学期学年*/
@TableField(exist = false)
private String xqxn;
/**本学期应听课次数*/
@TableField(exist = false)
private java.lang.String yskcs;
private String yskcs;
/**本学期已听课次数*/
@Excel(name = "本学期已听课次数", width = 15)
@TableField(exist = false)
private java.lang.String tkxttj;
private String tkxttj;
/**
* 按当前用户的部门查询评课
*/
@TableField(exist = false)
private boolean findByDwmc;
@TableField(exist = false)
private String findGh;
}

39
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java
View File

@ -11,6 +11,7 @@ import org.jeecg.common.util.SpringContextHolder;
import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx;
import org.jeecg.modules.kc.config.service.IKcExportConfigTpkwcqkjzglxService;
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbuser;
import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService;
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
import org.jeecg.modules.kc.tksf.kctkcstj.entity.KcTkcstj;
@ -84,13 +85,13 @@ public class Export extends BaseExport {
private void initGroupConfigMap(){
groupConfigMap = Maps.newLinkedHashMap();
GroupConfig config;
config = genConfig("oneList","学院（部）教务委员会委员","340");putGroupConfigMap(config.getKey(),config);
config = genConfig("twoList","行政负责人、教学副院（部）长及系（专业）负责人","220");putGroupConfigMap(config.getKey(),config);
config = genConfig("threeListSize","其他党政领导及辅导员","110");putGroupConfigMap(config.getKey(),config);
config = genConfig("threeListSize","其他党政领导及辅导员","210");putGroupConfigMap(config.getKey(),config);
config = genConfig("threeListSize","其他党政领导及辅导员","270");putGroupConfigMap(config.getKey(),config);
config = genConfig("threeListSize","其他党政领导及辅导员","280");putGroupConfigMap(config.getKey(),config);
config = genConfig("fourListSize","其他专任教师","1");putGroupConfigMap(config.getKey(),config);
config = genConfig("oneList","学院（部）教务委员会委员","340"); putGroupConfigMap(config.getKey(),config);
config = genConfig("twoList","行政负责人、教学副院（部）长及系（专业）负责人","220"); putGroupConfigMap(config.getKey(),config);
config = genConfig("threeListSize","其他党政领导及辅导员","110"); putGroupConfigMap(config.getKey(),config);
config = genConfig("threeListSize","其他党政领导及辅导员","210"); putGroupConfigMap(config.getKey(),config);
config = genConfig("threeListSize","其他党政领导及辅导员","270"); putGroupConfigMap(config.getKey(),config);
config = genConfig("threeListSize","其他党政领导及辅导员","280"); putGroupConfigMap(config.getKey(),config);
config = genConfig("fourListSize","其他专任教师","1"); putGroupConfigMap(config.getKey(),config);
}
// /**
// *
@ -135,9 +136,23 @@ public class Export extends BaseExport {
//取配置表中的用户
QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx,null);
// queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc());
if(kcExportConfigTpkwcqkjzglx.isFindByDwmc()){
QueryWrapper<Xxhbuser> uqw = new QueryWrapper<>();
//LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
uqw.eq("gh",kcExportConfigTpkwcqkjzglx.getFindGh());
uqw.last("limit 1");
Xxhbuser xxhbUser = xxhbuserService.getOne(uqw);
if(xxhbUser == null) {
queryWrapper.eq("dwmc ",-1);
}
queryWrapper.eq("dwmc ",xxhbUser.getDwmc());
}
List<KcExportConfigTpkwcqkjzglx> KcExportConfigTpkwcqkjzglxList = kcExportConfigTpkwcqkjzglxService.list(queryWrapper);
Map<String, List<KcExportConfigTpkwcqkjzglx>> ghMap = KcExportConfigTpkwcqkjzglxList.stream().collect(Collectors.groupingBy(KcExportConfigTpkwcqkjzglx::getGh));
Map<String, List<KcExportConfigTpkwcqkjzglx>> typeMap = KcExportConfigTpkwcqkjzglxList.stream().collect(Collectors.groupingBy(KcExportConfigTpkwcqkjzglx::getTklx));
Map<String, List<KcExportConfigTpkwcqkjzglx>> ghMap = KcExportConfigTpkwcqkjzglxList.stream().filter(x -> StringUtils.isNotBlank(x.getGh())).collect(Collectors.groupingBy(KcExportConfigTpkwcqkjzglx::getGh));
Map<String, List<KcExportConfigTpkwcqkjzglx>> typeMap = KcExportConfigTpkwcqkjzglxList.stream().filter(x -> StringUtils.isNotBlank(x.getTklx())).collect(Collectors.groupingBy(KcExportConfigTpkwcqkjzglx::getTklx));
KcXqxnHistory common = changeTingKeTongJi.getXqConfig(xqxnParam);
@ -154,7 +169,11 @@ public class Export extends BaseExport {
QueryWrapper<KcTkcstj> tjQueryWrapper = new QueryWrapper<>();
tjQueryWrapper.in("jgh",ghMap.keySet());
if(ghMap.keySet().isEmpty()){
tjQueryWrapper.eq("jgh",-1);
}else{
tjQueryWrapper.in("jgh",ghMap.keySet());
}
// queryWrapper.apply("up_date >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') ");
// queryWrapper.apply("up_date <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') ");
tjQueryWrapper.eq("xnxq",xqxnParam);

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

@ -10,6 +10,7 @@ import org.apache.commons.compress.utils.Lists;
import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx;
import org.jeecg.modules.kc.config.service.IKcExportConfigTpkwcqkjzglxService;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
import org.jeecg.modules.kc.grab.exports.entity.TJzgXskc;
import org.jeecg.modules.kc.grab.exports.service.ITJzgXskcService;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
@ -17,9 +18,11 @@ import org.jeecg.modules.kc.grab.imports.entity.Xxhbuser;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbxskc;
import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService;
import org.jeecg.modules.kc.grab.imports.service.IXxhbxskcService;
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
import org.quartz.JobExecutionContext;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -38,6 +41,9 @@ public class SyncTJzgXskc extends BaseSync {
@Autowired
private IXxhbuserService xxhbuserService;
@Autowired
private ChangeTingKeTongJi changeTingKeTongJi;
@Autowired
private IKcExportConfigTpkwcqkjzglxService exportConfigTpkwcqkjzglxService;
@ -117,6 +123,19 @@ public class SyncTJzgXskc extends BaseSync {
//再同步清洗到kc_export_config_tpkwcqkjzglx表
//筛选
QueryWrapper<KcExportConfigTpkwcqkjzglx> ectQw = new QueryWrapper<>();
//按学期筛选
KcXqxnHistory common = changeTingKeTongJi.getXqConfig();
if(common != null) {
//Map<String, KcTkcstj> tongJiMap = Maps.newHashMap();
//清洗数据核心
Date startSjDate = common.getStartTime();
Date endSjDate = common.getEndTime();
String startSj = DateUtil.format(startSjDate,DatePattern.NORM_DATETIME_FORMAT);
String endSj = DateUtil.format(endSjDate,DatePattern.NORM_DATETIME_FORMAT);
String xqxn = common.getTitle();
ectQw.eq("xqxn",xqxn);
}
List<KcExportConfigTpkwcqkjzglx> oldExportConfigTpkwcqkjzglxList = exportConfigTpkwcqkjzglxService.list(ectQw);
List<KcExportConfigTpkwcqkjzglx> saveList = Lists.newArrayList();