2023年6月28日 修复搜索问题,修复定时任务
This commit is contained in:
parent
e43a27b288
commit
da6a7c744c
|
@ -57,19 +57,19 @@ public class SyncTJwXsxkb extends BaseSync {
|
|||
boolean isAll = false;
|
||||
boolean isScope = false;
|
||||
if(param != null){
|
||||
if(param.containsKey("isAll")){
|
||||
if(param.containsKey("isAll")){//同步全部
|
||||
String isAllStr = (String)param.get("isAll");
|
||||
if(StringUtils.isNotBlank(isAllStr)){
|
||||
isAll = Boolean.parseBoolean(isAllStr);
|
||||
}
|
||||
}
|
||||
if(param.containsKey("now")){
|
||||
if(param.containsKey("now")){//按照此时间同步
|
||||
String keyStr = (String)param.get("now");
|
||||
if(StringUtils.isNotBlank(keyStr)){
|
||||
now = DateUtil.parse(keyStr, "yyyy-MM-dd");
|
||||
}
|
||||
}
|
||||
if(param.containsKey("isScope")){//按照范围
|
||||
if(param.containsKey("isScope")){//按照范围同步
|
||||
String isScopeStr = (String)param.get("isScope");
|
||||
if(StringUtils.isNotBlank(isScopeStr)){
|
||||
isScope = Boolean.parseBoolean(isScopeStr);
|
||||
|
|
|
@ -155,6 +155,9 @@ public class KcEvaluationVo implements Serializable {
|
|||
@TableField(exist = false)
|
||||
private String tksf;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String tksfLike;
|
||||
|
||||
@Excel(name = "听课评价结果(5分制)", width = 15)
|
||||
@TableField(exist = false)
|
||||
private String tkpjjg;
|
||||
|
|
|
@ -153,6 +153,9 @@ public class KcEvaluationVo2 implements Serializable{
|
|||
@TableField(exist = false)
|
||||
private String tksf;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String tksfLike;
|
||||
|
||||
// @Excel(name = "听课评价结果(5分制)", width = 15)
|
||||
@TableField(exist = false)
|
||||
private String tkpjjg;
|
||||
|
|
|
@ -119,7 +119,19 @@ public class TingKeStatisticsController {
|
|||
//按听课身份查询
|
||||
if(StringUtils.isNotBlank(evaluation.getTksf())){
|
||||
QueryWrapper<KcTksfrzb> tksfSerachQw = new QueryWrapper<>();
|
||||
tksfSerachQw.in("kc_tksfrzb.ZWMC",evaluation.getTksf());
|
||||
tksfSerachQw.eq("kc_tksfrzb.ZWMC",evaluation.getTksf());
|
||||
List<KcTksfrzb> tksfGhList = kcTksfrzbService.list(tksfSerachQw);
|
||||
if(tksfGhList != null && !tksfGhList.isEmpty()){
|
||||
Set<String> ghSet = tksfGhList.stream().map(x -> x.getGh()).collect(Collectors.toSet());
|
||||
queryWrapper.in("a.upuserid",ghSet);
|
||||
}else{
|
||||
queryWrapper.eq("a.upuserid","-1");
|
||||
}
|
||||
}
|
||||
//按听课身份模糊查询
|
||||
if(StringUtils.isNotBlank(evaluation.getTksfLike())){
|
||||
QueryWrapper<KcTksfrzb> tksfSerachQw = new QueryWrapper<>();
|
||||
tksfSerachQw.like("kc_tksfrzb.ZWMC",evaluation.getTksfLike());
|
||||
List<KcTksfrzb> tksfGhList = kcTksfrzbService.list(tksfSerachQw);
|
||||
if(tksfGhList != null && !tksfGhList.isEmpty()){
|
||||
Set<String> ghSet = tksfGhList.stream().map(x -> x.getGh()).collect(Collectors.toSet());
|
||||
|
@ -252,7 +264,19 @@ public class TingKeStatisticsController {
|
|||
//按听课身份查询
|
||||
if(StringUtils.isNotBlank(evaluation.getTksf())){
|
||||
QueryWrapper<KcTksfrzb> tksfSerachQw = new QueryWrapper<>();
|
||||
tksfSerachQw.in("kc_tksfrzb.ZWMC",evaluation.getTksf());
|
||||
tksfSerachQw.eq("kc_tksfrzb.ZWMC",evaluation.getTksf());
|
||||
List<KcTksfrzb> tksfGhList = kcTksfrzbService.list(tksfSerachQw);
|
||||
if(tksfGhList != null && !tksfGhList.isEmpty()){
|
||||
Set<String> ghSet = tksfGhList.stream().map(x -> x.getGh()).collect(Collectors.toSet());
|
||||
queryWrapper.in("a.upuserid",ghSet);
|
||||
}else{
|
||||
queryWrapper.eq("a.upuserid","-1");
|
||||
}
|
||||
}
|
||||
//按听课身份模糊查询
|
||||
if(StringUtils.isNotBlank(evaluation.getTksfLike())){
|
||||
QueryWrapper<KcTksfrzb> tksfSerachQw = new QueryWrapper<>();
|
||||
tksfSerachQw.like("kc_tksfrzb.ZWMC",evaluation.getTksfLike());
|
||||
List<KcTksfrzb> tksfGhList = kcTksfrzbService.list(tksfSerachQw);
|
||||
if(tksfGhList != null && !tksfGhList.isEmpty()){
|
||||
Set<String> ghSet = tksfGhList.stream().map(x -> x.getGh()).collect(Collectors.toSet());
|
||||
|
|
Loading…
Reference in New Issue