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

2023年8月28日 修复定时任务的错误，修改更改听课身份时不同年份的一起被改了（暂不更改）

This commit is contained in:
bai 2023-08-28 16:11:31 +08:00
parent df83a1d155
commit 0f3260f602
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java
View File

@ -7,12 +7,15 @@ import org.apache.commons.lang.StringUtils;
import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx;
import org.jeecg.modules.kc.config.mapper.KcExportConfigTpkwcqkjzglxMapper;
import org.jeecg.modules.kc.config.service.IKcExportConfigTpkwcqkjzglxService;
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
import org.jeecg.modules.kc.tksf.kctksfyq.entity.KcTksfyq;
import org.jeecg.modules.kc.tksf.kctksfyq.service.IKcTksfyqService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
@ -27,8 +30,27 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl<KcExportC
@Autowired
private IKcTksfyqService kcTksfyqService;
@Autowired
private ChangeTingKeTongJi changeTingKeTongJi;
@Override
public void editAll(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx) {
//按学期筛选
KcXqxnHistory common = changeTingKeTongJi.getXqConfig();
String xqxn;
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);
xqxn = common.getTitle();
} else {
xqxn = null;
}
//结构名称
if(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getTklx())){
List<String> zwmcs = Arrays.asList(kcExportConfigTpkwcqkjzglx.getTklx().split(","));
@ -41,6 +63,7 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl<KcExportC
UpdateWrapper uw = new UpdateWrapper();
uw.set("ytkcs",kcExportConfigTpkwcqkjzglx.getYtkcs());
uw.eq("tklx",x);
//uw.eq("xqxn",xqxn); //TODO 不对劲，得当前选择数据的年份为条件
update(uw);
});
}

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

@ -51,7 +51,7 @@ public class SyncTJwTkkcb extends BaseSync {
inDataList.forEach(x -> {
Xxhbtkkcb outData = BeanUtil.toBean(x, Xxhbtkkcb.class);
outData.setTimestamps(DateUtil.format(x.getTimestamps(), DatePattern.NORM_DATETIME_PATTERN));
outDataList.add(BeanUtil.toBean(x, Xxhbtkkcb.class));
outDataList.add(outData);
});
//保存到胃

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

@ -1,6 +1,8 @@
package org.jeecg.modules.kc.grab.SynchronizationService;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.Lists;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
@ -46,7 +48,11 @@ public class SyncTJwTkxx extends BaseSync {
List<Xxhbtkxx> outDataList = Lists.newArrayList();
//清洗数据
inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbtkxx.class)));
inDataList.forEach(x -> {
Xxhbtkxx outData = BeanUtil.toBean(x, Xxhbtkxx.class);
outData.setTimestamps(DateUtil.format(x.getTimestamps(), DatePattern.NORM_DATETIME_PATTERN));
outDataList.add(outData);
});
//保存到胃
int syncnum=0;

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

@ -131,8 +131,8 @@ public class SyncTJzgXskc extends BaseSync {
//清洗数据核心
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 startSj = DateUtil.format(startSjDate,DatePattern.NORM_DATETIME_FORMAT);
// String endSj = DateUtil.format(endSjDate,DatePattern.NORM_DATETIME_FORMAT);
xqxn = common.getTitle();
ectQw.eq("xqxn",xqxn);
} else {