diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java index cad32970..4c5263cc 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java @@ -234,7 +234,7 @@ public class SyncZwdtEvaluation extends BaseSync { inQw.in("xspg2","A", "B", "C", "D", "E"); inQw.in("xspg3","A", "B", "C", "D", "E"); inQw.in("ztpj", "A", "B", "C", "D", "E"); - + inQw.last("limit 100"); List inDataList = xxhbbkjxtkpjService.list(inQw); List saveMainList = Lists.newArrayList(); @@ -314,6 +314,7 @@ public class SyncZwdtEvaluation extends BaseSync { log.error("错误的课题"); //存新表里面 XxhbbkjxtkpjBadLog bedLog = BeanUtil.toBean(x, XxhbbkjxtkpjBadLog.class); + bedLog.setSkrq(DateUtil.format(main.getUpDate(), DatePattern.PURE_DATE_FORMAT)); //bedLog.setTimestamps(DateUtil.format(x.getTimestamps(), DatePattern.NORM_DATETIME_PATTERN)); //outDataList.add(BeanUtil.toBean(x, XxhbbkjxtkpjBadLog.class)); saveXxhbbkjxtkpjBadLogList.add(bedLog); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbbkjxtkpjBadLogController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbbkjxtkpjBadLogController.java index 66ed6574..d40d3896 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbbkjxtkpjBadLogController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbbkjxtkpjBadLogController.java @@ -3,6 +3,8 @@ package org.jeecg.modules.kc.grab.imports.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.kc.grab.imports.entity.XxhbbkjxtkpjBadLog; @@ -52,7 +54,8 @@ public class XxhbbkjxtkpjBadLogController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(xxhbbkjxtkpjBadLog, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",xxhbbkjxtkpjBadLog, req.getParameterMap()); + queryWrapper.eq(StringUtils.isNotBlank(xxhbbkjxtkpjBadLog.getXqxn()),"b.title",xxhbbkjxtkpjBadLog.getXqxn()); Page page = new Page(pageNo, pageSize); IPage pageList = xxhbbkjxtkpjBadLogService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/XxhbbkjxtkpjBadLog.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/XxhbbkjxtkpjBadLog.java index 60da18f0..cbe5c962 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/XxhbbkjxtkpjBadLog.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/XxhbbkjxtkpjBadLog.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -161,4 +159,10 @@ public class XxhbbkjxtkpjBadLog implements Serializable { @Excel(name = "课表编号", width = 15) @ApiModelProperty(value = "课表编号") private java.lang.String kbbh; + + private String skrq; + + @TableField(exist = false) + private String xqxn; + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbkjxtkpjBadLogMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbkjxtkpjBadLogMapper.xml index 24b398ed..123677e1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbkjxtkpjBadLogMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbkjxtkpjBadLogMapper.xml @@ -2,4 +2,10 @@ + \ No newline at end of file