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

2023年4月12日 修复问题，定时任务添加参数，添加搜索条件,修复参数问题

This commit is contained in:
bai 2023-04-12 23:22:59 +08:00
parent 02a74423e8
commit bb88a644fc
32 changed files with 288 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,13 +31,7 @@ public class SyncTBks extends BaseSync {
@Override
public void execute(JobExecutionContext jobExecutionContext) {
start();
if(getParamMap() != null){
//有参
run(getParamMap());
}else{
//无参
run();
}
run(getParamMap());
end();
}
@ -47,13 +41,6 @@ public class SyncTBks extends BaseSync {
* @param param
*/
public void run(Map<String, Object> param){
run();
}
/**
* 无参定时任务实现
*/
public void run(){
//查询数据
List<TBks> inDataList = tBksService.list();
List<Xxhbbks> outDataList = Lists.newArrayList();
@ -67,7 +54,13 @@ public class SyncTBks extends BaseSync {
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
saveLog(xxhbsynclog,Xxhbbks.class);
}
/**
* 无参定时任务实现
*/
public void run(){
run(null);
}
}

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

@ -33,13 +33,7 @@ public class SyncTDw extends BaseSync {
@Override
public void execute(JobExecutionContext jobExecutionContext) {
start();
if(getParamMap() != null){
//有参
run(getParamMap());
}else{
//无参
run();
}
run(getParamMap());
end();
}
@ -49,13 +43,6 @@ public class SyncTDw extends BaseSync {
* @param param
*/
public void run(Map<String, Object> param){
run();
}
/**
* 无参定时任务实现
*/
public void run(){
//查询数据
List<TDw> inDataList = expService.list();
List<Xxhbdw> outDataList = Lists.newArrayList();
@ -69,7 +56,13 @@ public class SyncTDw extends BaseSync {
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
saveLog(xxhbsynclog,Xxhbdw.class);
}
/**
* 无参定时任务实现
*/
public void run(){
run(null);
}
}

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

@ -31,13 +31,7 @@ public class SyncTJwKcapzb extends BaseSync {
@Override
public void execute(JobExecutionContext jobExecutionContext) {
start();
if(getParamMap() != null){
//有参
run(getParamMap());
}else{
//无参
run();
}
run(getParamMap());
end();
}
@ -47,13 +41,6 @@ public class SyncTJwKcapzb extends BaseSync {
* @param param
*/
public void run(Map<String, Object> param){
run();
}
/**
* 无参定时任务实现
*/
public void run(){
//查询数据
List<TJwKcapzb> inDataList = expService.list();
List<Xxhbkcapzb> outDataList = Lists.newArrayList();
@ -67,7 +54,13 @@ public class SyncTJwKcapzb extends BaseSync {
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
saveLog(xxhbsynclog,Xxhbkcapzb.class);
}
/**
* 无参定时任务实现
*/
public void run(){
run(null);
}
}

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

@ -31,13 +31,7 @@ public class SyncTJwKckb extends BaseSync {
@Override
public void execute(JobExecutionContext jobExecutionContext) {
start();
if(getParamMap() != null){
//有参
run(getParamMap());
}else{
//无参
run();
}
run(getParamMap());
end();
}
@ -47,13 +41,6 @@ public class SyncTJwKckb extends BaseSync {
* @param param
*/
public void run(Map<String, Object> param){
run();
}
/**
* 无参定时任务实现
*/
public void run(){
//查询数据
List<TJwKckb> inDataList = expService.list();
List<Xxhbkckb> outDataList = Lists.newArrayList();
@ -67,7 +54,13 @@ public class SyncTJwKckb extends BaseSync {
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
saveLog(xxhbsynclog, Xxhbkckb.class);
}
/**
* 无参定时任务实现
*/
public void run(){
run(null);
}
}

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

@ -31,13 +31,7 @@ public class SyncTJwKcxxb extends BaseSync {
@Override
public void execute(JobExecutionContext jobExecutionContext) {
start();
if(getParamMap() != null){
//有参
run(getParamMap());
}else{
//无参
run();
}
run(getParamMap());
end();
}
@ -47,13 +41,6 @@ public class SyncTJwKcxxb extends BaseSync {
* @param param
*/
public void run(Map<String, Object> param){
run();
}
/**
* 无参定时任务实现
*/
public void run(){
//查询数据
List<TJwKcxxb> inDataList = expService.list();
List<Xxhbkcxxb> outDataList = Lists.newArrayList();
@ -67,7 +54,13 @@ public class SyncTJwKcxxb extends BaseSync {
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
saveLog(xxhbsynclog, Xxhbkcxxb.class);
}
/**
* 无参定时任务实现
*/
public void run(){
run(null);
}
}

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

@ -31,13 +31,7 @@ public class SyncTJwTkkcb extends BaseSync {
@Override
public void execute(JobExecutionContext jobExecutionContext) {
start();
if(getParamMap() != null){
//有参
run(getParamMap());
}else{
//无参
run();
}
run(getParamMap());
end();
}
@ -47,13 +41,6 @@ public class SyncTJwTkkcb extends BaseSync {
* @param param
*/
public void run(Map<String, Object> param){
run();
}
/**
* 无参定时任务实现
*/
public void run(){
//查询数据
List<TJwTkkcb> inDataList = expService.list();
List<Xxhbtkkcb> outDataList = Lists.newArrayList();
@ -67,7 +54,13 @@ public class SyncTJwTkkcb extends BaseSync {
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
saveLog(xxhbsynclog,Xxhbtkkcb.class);
}
/**
* 无参定时任务实现
*/
public void run(){
run(null);
}
}

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

@ -31,13 +31,7 @@ public class SyncTJwTkxx extends BaseSync {
@Override
public void execute(JobExecutionContext jobExecutionContext) {
start();
if(getParamMap() != null){
//有参
run(getParamMap());
}else{
//无参
run();
}
run(getParamMap());
end();
}
@ -47,13 +41,6 @@ public class SyncTJwTkxx extends BaseSync {
* @param param
*/
public void run(Map<String, Object> param){
run();
}
/**
* 无参定时任务实现
*/
public void run(){
//查询数据
List<TJwTkxx> inDataList = expService.list();
List<Xxhbtkxx> outDataList = Lists.newArrayList();
@ -67,7 +54,13 @@ public class SyncTJwTkxx extends BaseSync {
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
saveLog(xxhbsynclog, Xxhbtkxx.class);
}
/**
* 无参定时任务实现
*/
public void run(){
run(null);
}
}

48
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.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.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.Lists;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
@ -31,13 +33,7 @@ public class SyncTJwXsxkb extends BaseSync {
@Override
public void execute(JobExecutionContext jobExecutionContext) {
start();
if(getParamMap() != null){
//有参
run(getParamMap());
}else{
//无参
run();
}
run(getParamMap());
end();
}
@ -47,26 +43,46 @@ public class SyncTJwXsxkb extends BaseSync {
* @param param
*/
public void run(Map<String, Object> param){
run();
}
/**
* 无参定时任务实现
*/
public void run(){
QueryWrapper eqw = new QueryWrapper();
boolean isDelete = true;
if(param != null){
if(Boolean.parseBoolean((String)param.get("isToday"))){
//如果是今天模式，
String nowStr = DateTime.now().toDateStr();
eqw.apply("TIMESTAMPS >= to_date('"+nowStr+"', 'yyyy-MM-dd')");
eqw.apply("TIMESTAMPS < to_date('"+nowStr+"','yyyy-MM-dd')");
isDelete = false;
} else if (Boolean.parseBoolean((String)param.get("isScope"))) {
//按照范围查询
String startDate = (String)param.get("startDate");
String endDate = (String)param.get("endDate");
eqw.apply("TIMESTAMPS >= to_date('"+startDate+"', 'yyyy-MM-dd')");
eqw.apply("TIMESTAMPS < to_date('"+endDate+"','yyyy-MM-dd')");
isDelete = false;
} else if (Boolean.parseBoolean((String)param.get("isAll"))) {
//全部。。。
}
}
//查询数据
List<TJwXsxkb> inDataList = expService.list();
List<TJwXsxkb> inDataList = expService.list(eqw);
List<Xxhbxsxkb> outDataList = Lists.newArrayList();
//清洗数据
inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbxsxkb.class)));
//保存到胃
impService.syncList(outDataList);
impService.syncList(outDataList,isDelete);
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
saveLog(xxhbsynclog, Xxhbxsxkb.class);
}
/**
* 无参定时任务实现
*/
public void run(){
run(null);
}

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

@ -39,13 +39,7 @@ public class SyncTZzbLdxx extends BaseSync {
@Override
public void execute(JobExecutionContext jobExecutionContext) {
start();
if(getParamMap() != null){
//有参
run(getParamMap());
}else{
//无参
run();
}
run(getParamMap());
end();
}
@ -55,13 +49,6 @@ public class SyncTZzbLdxx extends BaseSync {
* @param param
*/
public void run(Map<String, Object> param){
run();
}
/**
* 无参定时任务实现
*/
public void run(){
//查询数据
List<TZzbLdxx> inDataList = expService.list();
List<Xxhbldxx> outDataList = Lists.newArrayList();
@ -75,6 +62,13 @@ public class SyncTZzbLdxx extends BaseSync {
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));
saveLog(xxhbsynclog,Xxhbldxx.class);
}
/**
* 无参定时任务实现
*/
public void run(){
run(null);
}

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

@ -68,7 +68,7 @@ public abstract class BaseSync implements Job {
public void saveLog(Xxhbsynclog xxhbsynclog, Class clazz) {
DateTime now = DateTime.now();
xxhbsynclog.setSyncdate(now.toDateStr());//日期
xxhbsynclog.setSyncdate(now.toTimeStr());//时间
xxhbsynclog.setSynctime(now.toTimeStr());//时间
xxhbsynclog.setTablename(SqlHelper.table(clazz).getTableName());
xxhbsynclogService.save(xxhbsynclog);
}

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

@ -20,4 +20,12 @@ public interface IXxhbbksService extends IService<Xxhbbks> {
*/
boolean syncList(Collection<Xxhbbks> entityList);
/**
*
* @param entityList
* @param isDelete
* @return
*/
boolean syncList(Collection<Xxhbbks> entityList, boolean isDelete);
}

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

@ -20,4 +20,12 @@ public interface IXxhbdwService extends IService<Xxhbdw> {
*/
boolean syncList(Collection<Xxhbdw> entityList);
/**
*
* @param entityList
* @param isDelete
* @return
*/
boolean syncList(Collection<Xxhbdw> entityList, boolean isDelete);
}

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

@ -20,4 +20,12 @@ public interface IXxhbkcapzbService extends IService<Xxhbkcapzb> {
*/
boolean syncList(Collection<Xxhbkcapzb> entityList);
/**
*
* @param entityList
* @param isDelete
* @return
*/
boolean syncList(Collection<Xxhbkcapzb> entityList, boolean isDelete);
}

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

@ -20,4 +20,12 @@ public interface IXxhbkckbService extends IService<Xxhbkckb> {
*/
boolean syncList(Collection<Xxhbkckb> entityList);
/**
*
* @param entityList
* @param isDelete
* @return
*/
boolean syncList(Collection<Xxhbkckb> entityList, boolean isDelete);
}

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

@ -20,4 +20,12 @@ public interface IXxhbkcxxbService extends IService<Xxhbkcxxb> {
*/
boolean syncList(Collection<Xxhbkcxxb> entityList);
/**
*
* @param entityList
* @param isDelete
* @return
*/
boolean syncList(Collection<Xxhbkcxxb> entityList, boolean isDelete);
}

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

@ -20,4 +20,12 @@ public interface IXxhbldxxService extends IService<Xxhbldxx> {
*/
boolean syncList(Collection<Xxhbldxx> entityList);
/**
*
* @param entityList
* @param isDelete
* @return
*/
boolean syncList(Collection<Xxhbldxx> entityList, boolean isDelete);
}

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

@ -20,4 +20,12 @@ public interface IXxhbtkkcbService extends IService<Xxhbtkkcb> {
*/
boolean syncList(Collection<Xxhbtkkcb> entityList);
/**
*
* @param entityList
* @param isDelete
* @return
*/
boolean syncList(Collection<Xxhbtkkcb> entityList, boolean isDelete);
}

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

@ -20,4 +20,12 @@ public interface IXxhbtkxxService extends IService<Xxhbtkxx> {
*/
boolean syncList(Collection<Xxhbtkxx> entityList);
/**
*
* @param entityList
* @param isDelete
* @return
*/
boolean syncList(Collection<Xxhbtkxx> entityList, boolean isDelete);
}

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

@ -20,4 +20,11 @@ public interface IXxhbxsxkbService extends IService<Xxhbxsxkb> {
*/
boolean syncList(Collection<Xxhbxsxkb> entityList);
/**
*
* @param entityList
* @param isDelete
* @return
*/
boolean syncList(Collection<Xxhbxsxkb> entityList, boolean isDelete);
}

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

@ -1,12 +1,11 @@
package org.jeecg.modules.kc.grab.imports.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks;
import org.jeecg.modules.kc.grab.imports.mapper.XxhbbksMapper;
import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
@ -20,11 +19,19 @@ import java.util.Collection;
@Service
public class XxhbbksServiceImpl extends ServiceImpl<XxhbbksMapper, Xxhbbks> implements IXxhbbksService {
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbbks> entityList) {
QueryWrapper dqw = new QueryWrapper();
baseMapper.delete(dqw);
return this.saveBatch(entityList, 1000);
return syncList(entityList, true);
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbbks> entityList, boolean isDelete) {
QueryWrapper dqw = new QueryWrapper();
if(isDelete){
baseMapper.delete(dqw);
}
return this.saveBatch(entityList, 1000);
}
}

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

@ -1,12 +1,11 @@
package org.jeecg.modules.kc.grab.imports.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbdw;
import org.jeecg.modules.kc.grab.imports.mapper.XxhbdwMapper;
import org.jeecg.modules.kc.grab.imports.service.IXxhbdwService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
@ -23,8 +22,16 @@ public class XxhbdwServiceImpl extends ServiceImpl<XxhbdwMapper, Xxhbdw> impleme
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbdw> entityList) {
return syncList(entityList, true);
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbdw> entityList, boolean isDelete) {
QueryWrapper dqw = new QueryWrapper();
baseMapper.delete(dqw);
if(isDelete){
baseMapper.delete(dqw);
}
return this.saveBatch(entityList, 1000);
}
}

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

@ -1,12 +1,11 @@
package org.jeecg.modules.kc.grab.imports.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbkcapzb;
import org.jeecg.modules.kc.grab.imports.mapper.XxhbkcapzbMapper;
import org.jeecg.modules.kc.grab.imports.service.IXxhbkcapzbService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
@ -23,8 +22,16 @@ public class XxhbkcapzbServiceImpl extends ServiceImpl<XxhbkcapzbMapper, Xxhbkca
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbkcapzb> entityList) {
return syncList(entityList, true);
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbkcapzb> entityList, boolean isDelete) {
QueryWrapper dqw = new QueryWrapper();
baseMapper.delete(dqw);
if(isDelete){
baseMapper.delete(dqw);
}
return this.saveBatch(entityList, 1000);
}
}

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

@ -1,12 +1,11 @@
package org.jeecg.modules.kc.grab.imports.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbkckb;
import org.jeecg.modules.kc.grab.imports.mapper.XxhbkckbMapper;
import org.jeecg.modules.kc.grab.imports.service.IXxhbkckbService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
@ -23,8 +22,16 @@ public class XxhbkckbServiceImpl extends ServiceImpl<XxhbkckbMapper, Xxhbkckb> i
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbkckb> entityList) {
return syncList(entityList, true);
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbkckb> entityList, boolean isDelete) {
QueryWrapper dqw = new QueryWrapper();
baseMapper.delete(dqw);
if(isDelete){
baseMapper.delete(dqw);
}
return this.saveBatch(entityList, 1000);
}
}

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

@ -1,12 +1,11 @@
package org.jeecg.modules.kc.grab.imports.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbkcxxb;
import org.jeecg.modules.kc.grab.imports.mapper.XxhbkcxxbMapper;
import org.jeecg.modules.kc.grab.imports.service.IXxhbkcxxbService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
@ -23,8 +22,16 @@ public class XxhbkcxxbServiceImpl extends ServiceImpl<XxhbkcxxbMapper, Xxhbkcxxb
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbkcxxb> entityList) {
return syncList(entityList, true);
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbkcxxb> entityList, boolean isDelete) {
QueryWrapper dqw = new QueryWrapper();
baseMapper.delete(dqw);
if(isDelete){
baseMapper.delete(dqw);
}
return this.saveBatch(entityList, 1000);
}
}

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

@ -2,6 +2,7 @@ package org.jeecg.modules.kc.grab.imports.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbldxx;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbxsxkb;
import org.jeecg.modules.kc.grab.imports.mapper.XxhbldxxMapper;
import org.jeecg.modules.kc.grab.imports.service.IXxhbldxxService;
import org.springframework.stereotype.Service;
@ -23,8 +24,16 @@ public class XxhbldxxServiceImpl extends ServiceImpl<XxhbldxxMapper, Xxhbldxx> i
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbldxx> entityList) {
return syncList(entityList, true);
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbldxx> entityList, boolean isDelete) {
QueryWrapper dqw = new QueryWrapper();
baseMapper.delete(dqw);
if(isDelete){
baseMapper.delete(dqw);
}
return this.saveBatch(entityList, 1000);
}
}

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

@ -2,6 +2,7 @@ package org.jeecg.modules.kc.grab.imports.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbtkkcb;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbxsxkb;
import org.jeecg.modules.kc.grab.imports.mapper.XxhbtkkcbMapper;
import org.jeecg.modules.kc.grab.imports.service.IXxhbtkkcbService;
import org.springframework.stereotype.Service;
@ -23,8 +24,16 @@ public class XxhbtkkcbServiceImpl extends ServiceImpl<XxhbtkkcbMapper, Xxhbtkkcb
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbtkkcb> entityList) {
return syncList(entityList, true);
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbtkkcb> entityList, boolean isDelete) {
QueryWrapper dqw = new QueryWrapper();
baseMapper.delete(dqw);
if(isDelete){
baseMapper.delete(dqw);
}
return this.saveBatch(entityList, 1000);
}
}

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

@ -2,6 +2,7 @@ package org.jeecg.modules.kc.grab.imports.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbxsxkb;
import org.jeecg.modules.kc.grab.imports.mapper.XxhbtkxxMapper;
import org.jeecg.modules.kc.grab.imports.service.IXxhbtkxxService;
import org.springframework.stereotype.Service;
@ -23,8 +24,16 @@ public class XxhbtkxxServiceImpl extends ServiceImpl<XxhbtkxxMapper, Xxhbtkxx> i
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbtkxx> entityList) {
return syncList(entityList, true);
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbtkxx> entityList, boolean isDelete) {
QueryWrapper dqw = new QueryWrapper();
baseMapper.delete(dqw);
if(isDelete){
baseMapper.delete(dqw);
}
return this.saveBatch(entityList, 1000);
}
}

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

@ -23,8 +23,16 @@ public class XxhbxsxkbServiceImpl extends ServiceImpl<XxhbxsxkbMapper, Xxhbxsxkb
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbxsxkb> entityList) {
return syncList(entityList, true);
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbxsxkb> entityList, boolean isDelete) {
QueryWrapper dqw = new QueryWrapper();
baseMapper.delete(dqw);
if(isDelete){
baseMapper.delete(dqw);
}
return this.saveBatch(entityList, 1000);
}
}

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java
View File

@ -82,7 +82,8 @@ public class KcKechengbiao implements Serializable {
@ApiModelProperty(value = "任务编号")
private java.lang.String rwbh;
/**开课单位*/
@Excel(name = "开课单位", width = 15)
@Excel(name = "开课单位", width = 15, dicCode = "tkrszdw_view,college,college")
@Dict(dicCode = "tkrszdw_view,college,college")
@ApiModelProperty(value = "开课单位")
private java.lang.String kkdw;
/**课程性质*/

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java
View File

@ -90,7 +90,8 @@ public class KcKetangbiao implements Serializable {
@ApiModelProperty(value = "任务编号")
private java.lang.String rwbh;
/**开课单位*/
@Excel(name = "开课单位", width = 15)
@Excel(name = "开课单位", width = 15, dicCode = "tkrszdw_view,college,college")
@Dict(dicCode = "tkrszdw_view,college,college")
@ApiModelProperty(value = "开课单位")
private java.lang.String kkdw;
/**课程性质*/

14
jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java
View File

@ -180,5 +180,19 @@ public class KcTingke implements Serializable {
@TableField(exist = false)
private java.lang.String type;
/**
* 课程名和教程明
*/
@TableField(exist = false)
private java.lang.String searchInput;
/**
* 是否评价，0否，1是，空全部
*/
@TableField(exist = false)
private java.lang.String pj;
// private java.lang.String tingketime;
}

20
jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
View File

@ -360,7 +360,7 @@
<if test="tingketime != null and tingketime != ''">
AND tk.tingketime > #{tingketime,jdbcType=VARCHAR}
</if>
<if test="tingketime != null and tingketime != ''">
<if test="userid != null and userid != ''">
AND tk.userid = #{userid}
</if>
ORDER BY tk.tingketime DESC
@ -381,10 +381,26 @@
AND evs.queid = eq.id
AND ea.queid = eq.id
AND eq.genre = 0
<if test="tingketime != null and tingketime != ''">
<if test="userid != null and userid != ''">
AND evs.upuserid = #{userid}
</if>
) ev ON tk.ketangbiaoid = ev.ketangbiaoid
<where>
<if test="searchInput != null and searchInput != ''">
(kcmc like CONCAT('%',searchInput,'%') or skjs like CONCAT('%',searchInput,'%'))
</if>
<if test="pj != null and pj != ''">
<if test="pj == '0'">
score is null
</if>
<if test="pj == '1'">
score is not null
</if>
</if>
</where>
</select>